[64363] trunk/base

[jmr at macports.org]

Revision: 64363
          http://trac.macports.org/changeset/64363
Author:   jmr at macports.org
Date:     2010-03-03 16:47:56 -0800 (Wed, 03 Mar 2010)
Log Message:
-----------
non-darwin default locations for tcl-sqlite3 (#12231)

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2010-03-04 00:38:22 UTC (rev 64362)
+++ trunk/base/aclocal.m4	2010-03-04 00:47:56 UTC (rev 64363)
@@ -824,7 +824,17 @@
 		[mp_sqlite3_dir=$withval])
 
     if test "x$mp_sqlite3_dir" = "x"; then
-        mp_sqlite3_dir=/usr/lib/sqlite3
+        case $host_os in
+            darwin*)
+                mp_sqlite3_dir="/usr/lib/sqlite3"
+                ;;
+            freebsd*)
+                mp_sqlite3_dir="/usr/local/lib/sqlite"
+                ;;
+            *)
+                mp_sqlite3_dir="/usr/share/tcl${TCL_VERSION}/sqlite3"
+                ;;
+        esac
     fi
 
 	AC_CACHE_CHECK([for Tcl sqlite3 location], [mp_cv_sqlite3_dir],

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2010-03-04 00:38:22 UTC (rev 64362)
+++ trunk/base/configure	2010-03-04 00:47:56 UTC (rev 64363)
@@ -9172,7 +9172,17 @@
 
 
     if test "x$mp_sqlite3_dir" = "x"; then
-        mp_sqlite3_dir=/usr/lib/sqlite3
+        case $host_os in
+            darwin*)
+                mp_sqlite3_dir="/usr/lib/sqlite3"
+                ;;
+            freebsd*)
+                mp_sqlite3_dir="/usr/local/lib/sqlite"
+                ;;
+            *)
+                mp_sqlite3_dir="/usr/share/tcl${TCL_VERSION}/sqlite3"
+                ;;
+        esac
     fi
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl sqlite3 location" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100303/10f11f20/attachment-0001.html>