Ticket #12231: macports-tclsqlite3.2.patch

configure.ac

@@ -185 +189 @@
                 [with_included_sqlite3=yes])
 fi
 
+        case $host_os in
+                darwin*)
+                        mp_sqlite3_default_dir="/usr/lib/sqlite3"
+                        ;;
+                freebsd*)
+                        mp_sqlite3_default_dir="/usr/local/lib/sqlite"
+                        ;;
+                linux*)
+                        mp_sqlite3_default_dir="/usr/share/tcl${TCL_VERSION}/sqlite3"
+                        ;;
+                *)
+                        mp_sqlite3_default_dir="unspecified"
+                        ;;
+        esac
+
 AC_ARG_WITH(
                 tcl-sqlite3,
                 AS_HELP_STRING([--with-tcl-sqlite3=DIR],
                         [directory for Tcl sqlite3 (default /usr/lib/sqlite3)]),
                 [mp_sqlite3_dir=$withval],
-                [mp_sqlite3_dir=/usr/lib/sqlite3])
+                [mp_sqlite3_dir=$mp_sqlite3_default_dir])
 
+# Check if mp_sqlite3_dir contains pkgIndex.tcl.
+if test "x$mp_sqlite3_dir" != "xunspecified" ; then
+        AC_CACHE_CHECK([for Tcl sqlite3 location], [mp_cv_sqlite3_dir],
+                [mp_cv_sqlite3_dir=
+                test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
+                ])
+fi
+
+if test "$with_included_sqlite3" = "no" -a "x$mp_cv_sqlite3_dir" = "x" ; then
+        AC_MSG_WARN([Tcl sqlite3 not found, falling back on internal sqlite3])
+        with_included_sqlite3=yes
+fi
+
 # If sqlite3 package isn't installed, configure and install sqlite3 package.
 if test "$with_included_sqlite3" = "yes"; then
         OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES sqlite-3.1.3"
@@ -210 +242 @@
         fi
 else
         SQLITE3_LIBS="-lsqlite3"
-
-        AC_CACHE_CHECK([for Tcl sqlite3 location], [mp_cv_sqlite3_dir],
-                [mp_cv_sqlite3_dir=
-                test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
-                ])
-
         SQLITE3_DIR=$mp_cv_sqlite3_dir
 fi