summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/Makefile.am3
-rw-r--r--configure.ac6
2 files changed, 8 insertions, 1 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7b226e63..2d685e42 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -15,7 +15,8 @@ noinst_SCRIPTS = couchjs_dev
bin_PROGRAMS = couchpw
couchpw_SOURCES = couchpw.c
-couchpw_LDADD = -lcrypt
+
+couchpw_LDADD = $(LIBS)
if HELP2MAN
dist_man1_MANS = couchdb.1 couchjs.1
diff --git a/configure.ac b/configure.ac
index 020e6c39..2e2a3361 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,12 @@ AC_CHECK_CURL(7.16.0)
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