couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rand...@apache.org
Subject svn commit: r1135302 - /couchdb/trunk/configure.ac
Date Mon, 13 Jun 2011 21:46:05 GMT
Author: randall
Date: Mon Jun 13 21:46:05 2011
New Revision: 1135302

URL: http://svn.apache.org/viewvc?rev=1135302&view=rev
Log:
restore default include paths from pre-1033 patch

Modified:
    couchdb/trunk/configure.ac

Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=1135302&r1=1135301&r2=1135302&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Mon Jun 13 21:46:05 2011
@@ -128,8 +128,6 @@ PKG_CHECK_MODULES([JS], [mozilla-js >= 1
     JS_CFLAGS="-I/usr/include"
     JS_CFLAGS="$JS_CFLAGS -I/usr/include/js"
     JS_CFLAGS="$JS_CFLAGS -I/usr/include/mozjs"
-    JS_CFLAGS="$JS_CFLAGS -I/usr/local/include"
-    JS_CFLAGS="$JS_CFLAGS -I/opt/local/include"
     JS_CFLAGS="$JS_CFLAGS -I/usr/local/include/js"
     JS_CFLAGS="$JS_CFLAGS -I/opt/local/include/js"
 ])
@@ -149,6 +147,9 @@ AC_ARG_WITH([js-lib], [AC_HELP_STRING([-
 
 AC_ARG_VAR([ERLC_FLAGS], [general flags to prepend to ERLC_FLAGS])
 AC_ARG_VAR([FLAGS], [general flags to prepend to LDFLAGS and CPPFLAGS])
+CPPFLAGS="-I/usr/include $CPPFLAGS"
+CPPFLAGS="-I/usr/local/include $CPPFLAGS"
+CPPFLAGS="-I/opt/local/include $CPPFLAGS"
 CPPFLAGS="$FLAGS $CPPFLAGS"
 LDFLAGS="$FLAGS $LDFLAGS"
 



Mime
View raw message