commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r835428 - /commons/sandbox/runtime/trunk/src/main/native/configure
Date Thu, 12 Nov 2009 16:19:25 GMT
Author: mturk
Date: Thu Nov 12 16:19:25 2009
New Revision: 835428

URL: http://svn.apache.org/viewvc?rev=835428&view=rev
Log:
Unify config params for modules

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=835428&r1=835427&r2=835428&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Thu Nov 12 16:19:25 2009
@@ -103,6 +103,8 @@
 has_sqlite=no
 have_sqlite3=0
 has_openssl=no
+sqlite_inc=""
+sqlite_lib=""
 openssl_inc=""
 openssl_lib=""
 cccinc="stdio"
@@ -195,21 +197,18 @@
             shift
         ;;
         --with-openssl=* )
-            openssl_inc="$a"
+            openssl_inc="$a/include"
+            openssl_lib="$a/lib"
             has_openssl=yes
             shift
         ;;
-        --with-openssl-lib=* )
-            openssl_lib="$a"
-            has_openssl=yes
-            shift
-        ;;
-        --with-sqlite )
-            has_sqlite=yes
-            shift
-        ;;
-        --with-embedded-sqlite )
-            has_embedded_sqlite=yes
+        --with-sqlite=* )
+            if [ ".$a" = .embedded ]; then
+                has_embedded_sqlite=yes
+            else
+                sqlite_inc="$a/include"
+                sqlite_lib="$a/lib"
+            fi
             has_sqlite=yes
             shift
         ;;
@@ -279,12 +278,16 @@
 Optional packages:
   --enable-openssl        Enable compilation of OpenSSL SSL/TLS module
                               [disabled]
-  --with-openssl=DIR      Path to the  OpenSSL toolkit headers
+  --with-openssl=DIR      Path to the  OpenSSL toolkit install location
+                          If not specified default compiler include path
+                          will be used.
+  --enable-sqlite         Enable compilation of SQLite module
+                              [disabled]
+  --with-sqlite=DIR       Path to the  SQLite toolkit install location
                           If not specified default compiler include path
                           will be used.
-  --with-openssl-lib=DIR  Path to the  OpenSSL toolkit libraries
-                          If not specified default compiler library
-                          path will be used.
+                          If DIR equals 'embedded' local sqlite sources will
+                          be used
 
 EOH
         exit 1
@@ -1070,12 +1073,14 @@
         varadds includes "-I$topdir/modules/util/sqlite"
         have_sqlite3=1
     else
+        test ".$sqlite_inc" != . && varadds includes "-I$sqlite_inc"
         have_sqlite3=`have_include 0 sqlite3`
         if [ .$have_sqlite3 = .1 ] ; then
             if [ ".$host" = .windows ]; then
                 test ".$sqlite_lib" != . && varadds sqlflags "/libpath:\"$sqlite_lib\""
                 varadds sqlflags sqlite3.lib
             else
+                test ".$sqlite_lib" != . && varadds sqlflags "-L$sqlite_lib"
                 varadds sqlflags -lsqlite3
             fi
         fi



Mime
View raw message