Changeset: 6a78125ca377 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a78125ca377
Modified Files:
        clients/mapilib/Makefile.ag
        configure.ag
Branch: Aug2011
Log Message:

Only mapilib needs -lcrypt.


diffs (28 lines):

diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -24,7 +24,7 @@ lib_mapi = {
        VERSION = $(MAPI_VERSION)
        SOURCES = mapi.c mapi.rc
        LIBS = $(SOCKET_LIBS) ../../common/stream/libstream \
-               ../../common/options/libmoptions $(openssl_LIBS)
+               ../../common/options/libmoptions $(openssl_LIBS) $(CRYPT_LIBS)
 }
 
 headers_mapi = {
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2545,7 +2545,12 @@ AC_CHECK_FUNCS([\
                                uname \
                                ])
 LIBS="$save_LIBS"
+save_LIBS="$LIBS"
+LIBS=
 AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+CRYPT_LIBS="$LIBS"
+LIBS="$save_LIBS"
+AC_SUBST(CRYPT_LIBS)
 
 dnl check for getopt in standard library
 AC_CHECK_HEADERS([getopt.h])
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to