diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2013-11-20 14:19:37 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2013-11-20 14:36:19 +0000 |
| commit | a4ca1b01d4376f9b9ca7e06acf4eb7d164a38d2b (patch) | |
| tree | c541edf4bbd62fd4953d1cfd06349c54e99b4e20 /test | |
| parent | 5428a9463ae1080029a84a1b33e4a8a6915c5f28 (diff) | |
Fix testsuite build on Solaris
As of s11, Solaris & derivatives need libsocket and libnsl. Ensure they are searched for
by autoconfig. This seems to be successfully ignored on Linux.
Credit to Dave Edmondson (dme@dme.org) for the fix.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 9 | ||||
| -rw-r--r-- | test/configure.ac | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index fda4d5f64..8c2ee963a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -10,6 +10,7 @@ CLIENT_SSL=@CLIENT_SSL@ CLIENT_GNUTLS=@CLIENT_GNUTLS@ LOADED=@LOADED@ LOADED_OPT=@LOADED_OPT@ +LIBS=@LIBS@ ############################################################################## @@ -44,17 +45,17 @@ bin/cf: src/cf.c Makefile @echo " " bin/client: src/client.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/client src/client.c + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/client src/client.c $(LIBS) @echo ">>> bin/client command built" @echo " " bin/client-gnutls: src/client.c Makefile - $(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/client-gnutls src/client.c -lgnutls -lgcrypt + $(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/client-gnutls src/client.c -lgnutls -lgcrypt $(LIBS) @echo ">>> bin/client-gnutls command built" @echo " " bin/client-ssl: src/client.c Makefile - $(CC) $(CFLAGS) -DHAVE_OPENSSL $(LDFLAGS) -o bin/client-ssl src/client.c -lssl -lcrypto + $(CC) $(CFLAGS) -DHAVE_OPENSSL $(LDFLAGS) -o bin/client-ssl src/client.c -lssl -lcrypto $(LIBS) @echo ">>> bin/client-ssl command built" @echo " " @@ -89,7 +90,7 @@ bin/mtpscript: src/mtpscript.c Makefile @echo " " bin/server: src/server.c Makefile - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/server src/server.c + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/server src/server.c $(LIBS) @echo ">>> bin/server command built" @echo " " diff --git a/test/configure.ac b/test/configure.ac index 83f1aa05d..a38b5b0ae 100644 --- a/test/configure.ac +++ b/test/configure.ac @@ -48,6 +48,11 @@ case $host_os in ;; esac +dnl Solaris requires additional libraries for networking functions. + +AC_SEARCH_LIBS([inet_addr], [nsl]) +AC_SEARCH_LIBS([connect], [socket]) + dnl "Export" these variables AC_SUBST(BIND_8_COMPAT) @@ -55,6 +60,7 @@ AC_SUBST(CLIENT_SSL) AC_SUBST(CLIENT_GNUTLS) AC_SUBST(LOADED) AC_SUBST(LOADED_OPT) +AC_SUBST(LIBS) dnl This must be last; it determines what files are written |