Changeset 25783

Timestamp:

06/01/07 11:48:14 (18 months ago)

Author:

sfiera@…

Message:

Merging in r25770

Location:

branches/dp2mp-move/base

Files:

• Mk/macports.autoconf.mk.in (modified) (1 diff)
• Mk/macports.tea.mk (modified) (1 diff)
• aclocal.m4 (modified) (1 diff)
• configure (modified) (12 diffs)
• configure.ac (modified) (3 diffs)
• src/Makefile.in (modified) (1 diff)
• src/sqlite-3.1.3.diff (added)
• src/sqlite-3.1.3.tar.gz (added)

branches/dp2mp-move/base/Mk/macports.autoconf.mk.in

@@ -25 +25 @@
 LIBS                    = @LIBS@
 MD5_LIBS                = @MD5_LIBS@
+SQLITE3_LIBS            = @SQLITE3_LIBS@
 INSTALL                 = @INSTALL@
 MTREE                   = @MTREE@

branches/dp2mp-move/base/Mk/macports.tea.mk

@@ -3 +3 @@
 
 $(SHLIB_NAME):: ${OBJS}
-        ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS}
+        ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS} ${SQLITE3_LIBS}
 
 all:: ${SHLIB_NAME}

branches/dp2mp-move/base/aclocal.m4

@@ -728 +728 @@
 
 
-# MP_PATH_SQLITE3
-#       Specify sqlite3 location
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#   System or user-specified --with-sqlite=dir to specify
-#
-# Results:
-#   Sets SQLITE3_DIR to the directory where sqlite3 tcl pkgIndex.tcl is
-#---------------------------------------
-AC_DEFUN([MP_PATH_SQLITE3],[
-
-        AC_ARG_WITH([sqlite],
-                AS_HELP_STRING([--with-sqlite3=DIR],
-                        [directory for sqlite3 (default /usr/lib/sqlite3)]),            
-                [mp_sqlite3_dir=$withval], [mp_sqlite3_dir=/usr/lib/sqlite3])
-                
-        AC_CACHE_CHECK([for 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
-        AC_SUBST(SQLITE3_DIR)
-])
-
 dnl This macro tests if the compiler supports GCC's
 dnl __attribute__ syntax for unused variables/parameters

branches/dp2mp-move/base/configure

@@ -700 +700 @@
 PORTSDIR
 MPCONFIGDIR
-SQLITE3_DIR
 DSTUSR
 DSTGRP
@@ -730 +729 @@
 LDFLAGS_LIBCURL
 subdirs
+SQLITE3_LIBS
+SQLITE3_DIR
 OUR_INCLUDED_PACKAGES
 INCLUDES
@@ -766 +767 @@
 CPP
 XMKMF'
-ac_subdirs_all='src/thread2.6'
+ac_subdirs_all='src/thread2.6
+src/sqlite-3.1.3'
 
 # Initialize some variables set by options.
@@ -1351 +1353 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-ports-dir=DIR    Specify alternate ports directory
-  --with-sqlite3=DIR      directory for sqlite3 (default /usr/lib/sqlite3)
   --with-install-user=USER
                           Specify user ownership of installed files
@@ -1363 +1364 @@
   --with-tclpackage       Tcl package installation directory.
   --with-curlprefix       base directory for the cURL install '/usr', '/usr/local',...
-  --with-included-tclthread install included Thread package.
+  --with-included-tclthread
+                          install included Thread package.
+  --with-included-sqlite3 build using bundled sqlite3 package
+  --with-tcl-sqlite3=DIR  directory for Tcl sqlite3 (default /usr/lib/sqlite3)
 
 Some influential environment variables:
@@ -4053 +4057 @@
 
 
-
-
-# Check whether --with-sqlite was given.
-if test "${with_sqlite+set}" = set; then
-  withval=$with_sqlite; mp_sqlite3_dir=$withval
-else
-  mp_sqlite3_dir=/usr/lib/sqlite3
-fi
-
-
-        { echo "$as_me:$LINENO: checking for sqlite3 location" >&5
-echo $ECHO_N "checking for sqlite3 location... $ECHO_C" >&6; }
-if test "${mp_cv_sqlite3_dir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  mp_cv_sqlite3_dir=
-                test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
-
-fi
-{ echo "$as_me:$LINENO: result: $mp_cv_sqlite3_dir" >&5
-echo "${ECHO_T}$mp_cv_sqlite3_dir" >&6; }
-
-        SQLITE3_DIR=$mp_cv_sqlite3_dir
-
-
-
 # Check for install ownership
 
@@ -9492 +9470 @@
         patch -p0 < src/thread2.6.diff
 fi
+
+## sqlite3 package.
+
+# Check whether --with-included-sqlite3 was given.
+if test "${with_included_sqlite3+set}" = set; then
+  withval=$with_included_sqlite3; with_included_sqlite3=$withval
+else
+  with_included_sqlite3="unspecified"
+fi
+
+
+# Check if sqlite3 package is already installed.
+if test "x$with_included_sqlite3" = "xunspecified" ; then
+        { echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
+echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_open ();
+int
+main ()
+{
+return sqlite3_open ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_sqlite3_sqlite3_open=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_lib_sqlite3_sqlite3_open=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then
+  with_included_sqlite3=no
+else
+  with_included_sqlite3=yes
+fi
+
+fi
+
+
+# Check whether --with-tcl-sqlite3 was given.
+if test "${with_tcl_sqlite3+set}" = set; then
+  withval=$with_tcl_sqlite3; mp_sqlite3_dir=$withval
+else
+  mp_sqlite3_dir=/usr/lib/sqlite3
+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"
+        subdirs="$subdirs src/sqlite-3.1.3"
+
+        # Extract sqlite3 package
+        (cd src/; gzip -d < sqlite-3.1.3.tar.gz | tar xf -)
+        # patch sqlite3 with desired configure options
+        patch -p0 < src/sqlite-3.1.3.diff
+        # the new tclinstaller.tcl needs to have substitution occur
+        mv src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3/tclinstaller.tcl.in
+        SQLITE3_LIBS=`pwd`"/src/sqlite-3.1.3/.libs/libsqlite3.a"
+        if test "x$prefix" = "xNONE" ; then
+                SQLITE3_DIR=$ac_default_prefix/share/macports/Tcl/sqlite3
+        else
+                SQLITE3_DIR=$prefix/share/macports/Tcl/sqlite3
+        fi
+else
+        SQLITE3_LIBS="-lsqlite3"
+
+        { echo "$as_me:$LINENO: checking for Tcl sqlite3 location" >&5
+echo $ECHO_N "checking for Tcl sqlite3 location... $ECHO_C" >&6; }
+if test "${mp_cv_sqlite3_dir+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  mp_cv_sqlite3_dir=
+                test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
+
+fi
+{ echo "$as_me:$LINENO: result: $mp_cv_sqlite3_dir" >&5
+echo "${ECHO_T}$mp_cv_sqlite3_dir" >&6; }
+
+        SQLITE3_DIR=$mp_cv_sqlite3_dir
+fi
+
+
+
 
 
@@ -10286 +10392 @@
 PORTSDIR!$PORTSDIR$ac_delim
 MPCONFIGDIR!$MPCONFIGDIR$ac_delim
-SQLITE3_DIR!$SQLITE3_DIR$ac_delim
 DSTUSR!$DSTUSR$ac_delim
 DSTGRP!$DSTGRP$ac_delim
@@ -10300 +10405 @@
 X_LIBS!$X_LIBS$ac_delim
 X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+TCL_VERSION!$TCL_VERSION$ac_delim
 _ACEOF
 
@@ -10341 +10447 @@
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-TCL_VERSION!$TCL_VERSION$ac_delim
 TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
 TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
@@ -10357 +10462 @@
 LDFLAGS_LIBCURL!$LDFLAGS_LIBCURL$ac_delim
 subdirs!$subdirs$ac_delim
+SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
+SQLITE3_DIR!$SQLITE3_DIR$ac_delim
 OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
 INCLUDES!$INCLUDES$ac_delim
@@ -10375 +10482 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
     break
   elif $ac_last_try; then

branches/dp2mp-move/base/configure.ac

@@ -59 +59 @@
 MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])
 MP_PATH_MPCONFIGDIR
-MP_PATH_SQLITE3
 
 # Check for install ownership
@@ -136 +135 @@
 AC_ARG_WITH(
                 included-tclthread,
-                [  --with-included-tclthread install included Thread package.],
+                AS_HELP_STRING([--with-included-tclthread],
+                        [install included Thread package.]),
                 [with_included_tclthread=$withval],
                 [with_included_tclthread="unspecified"])
@@ -157 +157 @@
         patch -p0 < src/thread2.6.diff
 fi
+
+## sqlite3 package.
+AC_ARG_WITH(
+                included-sqlite3,
+                AS_HELP_STRING([--with-included-sqlite3],
+                        [build using bundled sqlite3 package]),
+                [with_included_sqlite3=$withval],
+                [with_included_sqlite3="unspecified"])
+
+# Check if sqlite3 package is already installed.
+if test "x$with_included_sqlite3" = "xunspecified" ; then
+        AC_CHECK_LIB([sqlite3],[sqlite3_open],
+                [with_included_sqlite3=no],
+                [with_included_sqlite3=yes])
+fi
+
+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])
+
+# 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"
+        AC_CONFIG_SUBDIRS([src/sqlite-3.1.3])
+        # Extract sqlite3 package
+        (cd src/; gzip -d < sqlite-3.1.3.tar.gz | tar xf -)
+        # patch sqlite3 with desired configure options
+        patch -p0 < src/sqlite-3.1.3.diff
+        # the new tclinstaller.tcl needs to have substitution occur
+        mv src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3/tclinstaller.tcl.in
+        SQLITE3_LIBS=`pwd`"/src/sqlite-3.1.3/.libs/libsqlite3.a"
+        if test "x$prefix" = "xNONE" ; then
+                SQLITE3_DIR=$ac_default_prefix/share/macports/Tcl/sqlite3
+        else
+                SQLITE3_DIR=$prefix/share/macports/Tcl/sqlite3
+        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
+
+AC_SUBST(SQLITE3_LIBS)
+AC_SUBST(SQLITE3_DIR)
 
 AC_SUBST(OUR_INCLUDED_PACKAGES)

branches/dp2mp-move/base/src/Makefile.in

@@ -1 @@
-TCLPKG=         macports1.0 port1.0 package1.0 pextlib1.0 registry1.0 \
-                        darwintracelib1.0 @OUR_INCLUDED_PACKAGES@
+TCLPKG=         @OUR_INCLUDED_PACKAGES@ macports1.0 port1.0 package1.0 \
+                        pextlib1.0 registry1.0 darwintracelib1.0 
 SUBDIR=         ${TCLPKG} port programs