couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r707861 - in /incubator/couchdb/trunk: bin/Makefile.am configure.ac
Date Sat, 25 Oct 2008 16:41:37 GMT
Author: jan
Date: Sat Oct 25 09:41:37 2008
New Revision: 707861

URL: http://svn.apache.org/viewvc?rev=707861&view=rev
Log:
Only link against -lcrypt on Linux & BSD systems.

Modified:
    incubator/couchdb/trunk/bin/Makefile.am
    incubator/couchdb/trunk/configure.ac

Modified: incubator/couchdb/trunk/bin/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/bin/Makefile.am?rev=707861&r1=707860&r2=707861&view=diff
==============================================================================
--- incubator/couchdb/trunk/bin/Makefile.am (original)
+++ incubator/couchdb/trunk/bin/Makefile.am Sat Oct 25 09:41:37 2008
@@ -15,7 +15,8 @@
 
 bin_PROGRAMS = couchpw
 couchpw_SOURCES = couchpw.c
-couchpw_LDADD = -lcrypt
+
+couchpw_LDADD = $(LIBS)
 
 if HELP2MAN
 dist_man1_MANS = couchdb.1 couchjs.1

Modified: incubator/couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/configure.ac?rev=707861&r1=707860&r2=707861&view=diff
==============================================================================
--- incubator/couchdb/trunk/configure.ac (original)
+++ incubator/couchdb/trunk/configure.ac Sat Oct 25 09:41:37 2008
@@ -108,6 +108,12 @@
 AC_SUBST(CURL_CFLAGS) 
 AC_SUBST(CURL_LIBS) 
 
+case "$(uname -s)" in
+  Linux | *BSD)
+    LIBS="$LIBS -lcrypt"
+  ;;
+esac
+
 AC_PATH_PROG([ERL], [erl])
 
 if test x${ERL} = x; then



Mime
View raw message