Howdy,This patch fixes a couple of problems I had when compiling gnet on windows. It removes two unix only files from examples and allows make check to run. One problem I could not fix is the test for the -pthread & -pthreads options on the compiler. These tests will always suceed since unrecognized options do not prevent the test code from compiling.
Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 27) +++ tests/Makefile.am (revision 28) @@ -3,8 +3,11 @@ @SET_MAKE@ TESTS = base64_test hash_test inetaddr_test ipv6_test pack_test unpack_test uri_test $(NETWORK_TESTS) -EXTRA_PROGRAMS = base64_test hash_test inetaddr_test ipv6_test pack_test unpack_test uri_test -CLEANFILES = $(EXTRA_PROGRAMS) .client*out .server*out .client*diff .server*diff +check_PROGRAMS = base64_test hash_test inetaddr_test ipv6_test pack_test unpack_test uri_test +check_SCRIPTS= $(NETWORK_TESTS) +#EXTRA_PROGRAMS = base64_test hash_test inetaddr_test ipv6_test pack_test unpack_test uri_test +EXTRA_SCRIPTS = client_server_test.pl dns_test.pl +CLEANFILES = $(check_PROGRAMS) .client*out .server*out .client*diff .server*diff INCLUDES = -I$(top_srcdir)/src $(GLIB_CFLAGS) LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS) $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la Index: examples/Makefile.am =================================================================== --- examples/Makefile.am (revision 27) +++ examples/Makefile.am (revision 28) @@ -2,12 +2,20 @@ @SET_MAKE@ +if OS_WIN32 noinst_PROGRAMS = echoclient echoserver \ echoclient-async echoserver-async \ echoclient-gconn echoserver-gserver \ echoclient-udp echoserver-udp \ - echoclient-unix echoserver-unix \ dnslookup hash hfetch hostinfo sdr +else +noinst_PROGRAMS = echoclient echoserver \ + echoclient-async echoserver-async \ + echoclient-gconn echoserver-gserver \ + echoclient-udp echoserver-udp \ + echoclient-unix echoserver-unix \ + dnslookup hash hfetch hostinfo sdr +endif CLEANFILES = $(EXTRA_PROGRAMS) AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
Attachment:
signature.asc
Description: OpenPGP digital signature