diff options
| author | Noah Slater <nslater@apache.org> | 2008-10-23 15:47:00 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2008-10-23 15:47:00 +0000 |
| commit | ffad3299286f02d37840feca590f5f56befcadc6 (patch) | |
| tree | 08634e6da8aba4e91d6e3eaaefbf440a3b83c464 | |
| parent | ee9ae6c604f8ee3f5f4cb80004ae26aa8e12e722 (diff) | |
added NIGHTLY and FLAGS env variables
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@707397 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 48b80ec8..e0e32694 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,11 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([1.6.3 foreign check-news]) +if test x${NIGHTLY} = xyes; then + AM_INIT_AUTOMAKE([1.6.3 foreign]) +else + AM_INIT_AUTOMAKE([1.6.3 foreign check-news]) +fi AC_GNU_SOURCE AC_ENABLE_SHARED @@ -74,6 +78,8 @@ AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [set PATH to the SpiderMonkey library directory])], [JS_LIB_FLAGS="-L$withval"], []) +AC_ARG_VAR([FLAGS], [general flags to prepend to LDFLAGS and CPPFLAGS]) + LIB_FLAGS="-L/usr/local/lib -L/opt/local/lib $JS_LIB_FLAGS" LIBS="$LIB_FLAGS $LIBS" # XP_UNIX required for jsapi.h and has been tested to work on Linux and Darwin. |