diff options
| author | Jan Lehnardt <jan@apache.org> | 2008-10-25 16:41:37 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2008-10-25 16:41:37 +0000 |
| commit | 5d222134f9029462d61e2f8b3674a86561641f32 (patch) | |
| tree | 17fa0d15723cf5b862208818a5cf0ff224efccfa | |
| parent | e556a8d9cf98de4f65d6eb0b746077e59c180bcd (diff) | |
Only link against -lcrypt on Linux & BSD systems.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@707861 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | bin/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 6 |
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 |