<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[25783] branches/dp2mp-move/base</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/25783">25783</a></dd>
<dt>Author</dt> <dd>sfiera@macports.org</dd>
<dt>Date</dt> <dd>2007-06-01 11:48:14 -0700 (Fri, 01 Jun 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merging in r25770</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesdp2mpmovebaseMkmacportsautoconfmkin">branches/dp2mp-move/base/Mk/macports.autoconf.mk.in</a></li>
<li><a href="#branchesdp2mpmovebaseMkmacportsteamk">branches/dp2mp-move/base/Mk/macports.tea.mk</a></li>
<li><a href="#branchesdp2mpmovebaseaclocalm4">branches/dp2mp-move/base/aclocal.m4</a></li>
<li><a href="#branchesdp2mpmovebaseconfigure">branches/dp2mp-move/base/configure</a></li>
<li><a href="#branchesdp2mpmovebaseconfigureac">branches/dp2mp-move/base/configure.ac</a></li>
<li><a href="#branchesdp2mpmovebasesrcMakefilein">branches/dp2mp-move/base/src/Makefile.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesdp2mpmovebasesrcsqlite313diff">branches/dp2mp-move/base/src/sqlite-3.1.3.diff</a></li>
<li><a href="#branchesdp2mpmovebasesrcsqlite313targz">branches/dp2mp-move/base/src/sqlite-3.1.3.tar.gz</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesdp2mpmovebaseMkmacportsautoconfmkin"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/Mk/macports.autoconf.mk.in (25782 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/Mk/macports.autoconf.mk.in 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/Mk/macports.autoconf.mk.in 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> LIBS = @LIBS@
</span><span class="cx"> MD5_LIBS = @MD5_LIBS@
</span><ins>+SQLITE3_LIBS = @SQLITE3_LIBS@
</ins><span class="cx"> INSTALL = @INSTALL@
</span><span class="cx"> MTREE = @MTREE@
</span><span class="cx"> LN_S = @LN_S@
</span></span></pre></div>
<a id="branchesdp2mpmovebaseMkmacportsteamk"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/Mk/macports.tea.mk (25782 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/Mk/macports.tea.mk 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/Mk/macports.tea.mk 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> ${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
</span><span class="cx">
</span><span class="cx"> $(SHLIB_NAME):: ${OBJS}
</span><del>- ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS}
</del><ins>+ ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS} ${SQLITE3_LIBS}
</ins><span class="cx">
</span><span class="cx"> all:: ${SHLIB_NAME}
</span><span class="cx">
</span></span></pre></div>
<a id="branchesdp2mpmovebaseaclocalm4"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/aclocal.m4 (25782 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/aclocal.m4 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/aclocal.m4 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -727,34 +727,6 @@
</span><span class="cx"> ])
</span><span class="cx">
</span><span class="cx">
</span><del>-# 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)
-])
-
</del><span class="cx"> dnl This macro tests if the compiler supports GCC's
</span><span class="cx"> dnl __attribute__ syntax for unused variables/parameters
</span><span class="cx"> AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
</span></span></pre></div>
<a id="branchesdp2mpmovebaseconfigure"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/configure (25782 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/configure 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/configure 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -699,7 +699,6 @@
</span><span class="cx"> EXTRA_PROGS
</span><span class="cx"> PORTSDIR
</span><span class="cx"> MPCONFIGDIR
</span><del>-SQLITE3_DIR
</del><span class="cx"> DSTUSR
</span><span class="cx"> DSTGRP
</span><span class="cx"> DSTMODE
</span><span class="lines">@@ -729,6 +728,8 @@
</span><span class="cx"> CFLAGS_LIBCURL
</span><span class="cx"> LDFLAGS_LIBCURL
</span><span class="cx"> subdirs
</span><ins>+SQLITE3_LIBS
+SQLITE3_DIR
</ins><span class="cx"> OUR_INCLUDED_PACKAGES
</span><span class="cx"> INCLUDES
</span><span class="cx"> CFLAGS_DEBUG
</span><span class="lines">@@ -765,7 +766,8 @@
</span><span class="cx"> OPEN
</span><span class="cx"> CPP
</span><span class="cx"> XMKMF'
</span><del>-ac_subdirs_all='src/thread2.6'
</del><ins>+ac_subdirs_all='src/thread2.6
+src/sqlite-3.1.3'
</ins><span class="cx">
</span><span class="cx"> # Initialize some variables set by options.
</span><span class="cx"> ac_init_help=
</span><span class="lines">@@ -1350,7 +1352,6 @@
</span><span class="cx"> --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
</span><span class="cx"> --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
</span><span class="cx"> --with-ports-dir=DIR Specify alternate ports directory
</span><del>- --with-sqlite3=DIR directory for sqlite3 (default /usr/lib/sqlite3)
</del><span class="cx"> --with-install-user=USER
</span><span class="cx"> Specify user ownership of installed files
</span><span class="cx"> --with-install-group=GROUP
</span><span class="lines">@@ -1362,7 +1363,10 @@
</span><span class="cx"> --with-tclinclude directory containing the public Tcl header files.
</span><span class="cx"> --with-tclpackage Tcl package installation directory.
</span><span class="cx"> --with-curlprefix base directory for the cURL install '/usr', '/usr/local',...
</span><del>- --with-included-tclthread install included Thread package.
</del><ins>+ --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)
</ins><span class="cx">
</span><span class="cx"> Some influential environment variables:
</span><span class="cx"> CC C compiler command
</span><span class="lines">@@ -4052,32 +4056,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
-# 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
-
-
-
</del><span class="cx"> # Check for install ownership
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -9492,8 +9470,136 @@
</span><span class="cx"> patch -p0 < src/thread2.6.diff
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+## sqlite3 package.
</ins><span class="cx">
</span><ins>+# 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
</ins><span class="cx">
</span><ins>+
+# 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
+
+
+
+
+
+
</ins><span class="cx"> # Allows building of shared libraries
</span><span class="cx">
</span><span class="cx"> { echo "$as_me:$LINENO: checking how to build libraries" >&5
</span><span class="lines">@@ -10285,7 +10391,6 @@
</span><span class="cx"> EXTRA_PROGS!$EXTRA_PROGS$ac_delim
</span><span class="cx"> PORTSDIR!$PORTSDIR$ac_delim
</span><span class="cx"> MPCONFIGDIR!$MPCONFIGDIR$ac_delim
</span><del>-SQLITE3_DIR!$SQLITE3_DIR$ac_delim
</del><span class="cx"> DSTUSR!$DSTUSR$ac_delim
</span><span class="cx"> DSTGRP!$DSTGRP$ac_delim
</span><span class="cx"> DSTMODE!$DSTMODE$ac_delim
</span><span class="lines">@@ -10299,6 +10404,7 @@
</span><span class="cx"> X_PRE_LIBS!$X_PRE_LIBS$ac_delim
</span><span class="cx"> X_LIBS!$X_LIBS$ac_delim
</span><span class="cx"> X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
</span><ins>+TCL_VERSION!$TCL_VERSION$ac_delim
</ins><span class="cx"> _ACEOF
</span><span class="cx">
</span><span class="cx"> if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
</span><span class="lines">@@ -10340,7 +10446,6 @@
</span><span class="cx"> ac_delim='%!_!# '
</span><span class="cx"> for ac_last_try in false false false false false :; do
</span><span class="cx"> cat >conf$$subs.sed <<_ACEOF
</span><del>-TCL_VERSION!$TCL_VERSION$ac_delim
</del><span class="cx"> TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
</span><span class="cx"> TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
</span><span class="cx"> TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
</span><span class="lines">@@ -10356,6 +10461,8 @@
</span><span class="cx"> CFLAGS_LIBCURL!$CFLAGS_LIBCURL$ac_delim
</span><span class="cx"> LDFLAGS_LIBCURL!$LDFLAGS_LIBCURL$ac_delim
</span><span class="cx"> subdirs!$subdirs$ac_delim
</span><ins>+SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
+SQLITE3_DIR!$SQLITE3_DIR$ac_delim
</ins><span class="cx"> OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
</span><span class="cx"> INCLUDES!$INCLUDES$ac_delim
</span><span class="cx"> CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
</span><span class="lines">@@ -10374,7 +10481,7 @@
</span><span class="cx"> LTLIBOBJS!$LTLIBOBJS$ac_delim
</span><span class="cx"> _ACEOF
</span><span class="cx">
</span><del>- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
</del><ins>+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
</ins><span class="cx"> break
</span><span class="cx"> elif $ac_last_try; then
</span><span class="cx"> { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
</span></span></pre></div>
<a id="branchesdp2mpmovebaseconfigureac"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/configure.ac (25782 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/configure.ac 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/configure.ac 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> AC_PREFIX_DEFAULT(/opt/local)
</span><span class="cx"> MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])
</span><span class="cx"> MP_PATH_MPCONFIGDIR
</span><del>-MP_PATH_SQLITE3
</del><span class="cx">
</span><span class="cx"> # Check for install ownership
</span><span class="cx"> MP_CHECK_INSTALLUSER
</span><span class="lines">@@ -135,7 +134,8 @@
</span><span class="cx"> ## Thread package.
</span><span class="cx"> AC_ARG_WITH(
</span><span class="cx"> included-tclthread,
</span><del>- [ --with-included-tclthread install included Thread package.],
</del><ins>+ AS_HELP_STRING([--with-included-tclthread],
+ [install included Thread package.]),
</ins><span class="cx"> [with_included_tclthread=$withval],
</span><span class="cx"> [with_included_tclthread="unspecified"])
</span><span class="cx">
</span><span class="lines">@@ -157,6 +157,58 @@
</span><span class="cx"> patch -p0 < src/thread2.6.diff
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+## 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)
+
</ins><span class="cx"> AC_SUBST(OUR_INCLUDED_PACKAGES)
</span><span class="cx">
</span><span class="cx"> # Allows building of shared libraries
</span></span></pre></div>
<a id="branchesdp2mpmovebasesrcMakefilein"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/src/Makefile.in (25782 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/src/Makefile.in 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/src/Makefile.in 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-TCLPKG= macports1.0 port1.0 package1.0 pextlib1.0 registry1.0 \
- darwintracelib1.0 @OUR_INCLUDED_PACKAGES@
</del><ins>+TCLPKG= @OUR_INCLUDED_PACKAGES@ macports1.0 port1.0 package1.0 \
+ pextlib1.0 registry1.0 darwintracelib1.0
</ins><span class="cx"> SUBDIR= ${TCLPKG} port programs
</span><span class="cx">
</span><span class="cx"> all::
</span></span></pre></div>
<a id="branchesdp2mpmovebasesrcsqlite313diff"></a>
<div class="addfile"><h4>Added: branches/dp2mp-move/base/src/sqlite-3.1.3.diff (0 => 25783)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/src/sqlite-3.1.3.diff (rev 0)
+++ branches/dp2mp-move/base/src/sqlite-3.1.3.diff 2007-06-01 18:48:14 UTC (rev 25783)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+diff -ru src/sqlite-3.1.3/Makefile.in src/sqlite-3.1.3.mine/Makefile.in
+--- src/sqlite-3.1.3/Makefile.in 2005-02-19 19:11:19.000000000 -0500
++++ src/sqlite-3.1.3.mine/Makefile.in 2007-05-31 17:34:02.000000000 -0400
+@@ -605,7 +605,7 @@
+ mkdir -p doc
+ mv $(DOC) doc
+
+-install: sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
++dont_install: sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
+ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
+@@ -615,7 +615,7 @@
+ $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig;
+ $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig;
+
+-tcl_install: libtclsqlite3.la
++install: libtclsqlite3.la
+ tclsh $(TOP)/tclinstaller.tcl $(VERSION)
+
+ clean:
+diff -ru src/sqlite-3.1.3/configure src/sqlite-3.1.3.mine/configure
+--- src/sqlite-3.1.3/configure 2005-02-19 09:30:48.000000000 -0500
++++ src/sqlite-3.1.3.mine/configure 2007-05-31 17:39:49.000000000 -0400
+@@ -20343,7 +20343,7 @@
+ #########
+ # Generate the output files.
+ #
+- ac_config_files="$ac_config_files Makefile sqlite3.pc"
++ ac_config_files="$ac_config_files Makefile sqlite3.pc tclinstaller.tcl"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+diff -ru src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3.mine/tclinstaller.tcl
+--- src/sqlite-3.1.3/tclinstaller.tcl 2005-01-30 17:10:01.000000000 -0500
++++ src/sqlite-3.1.3.mine/tclinstaller.tcl 2007-05-31 17:33:32.000000000 -0400
+@@ -7,7 +7,7 @@
+ set VERSION [lindex $argv 0]
+ set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
+ if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
+-set LIBDIR $env(DESTDIR)[lindex $auto_path 0]
++set LIBDIR @prefix@/share/macports/Tcl
+ set LIBNAME [file tail $LIBFILE]
+ set LIB $LIBDIR/sqlite3/$LIBNAME
+
</ins></span></pre></div>
<a id="branchesdp2mpmovebasesrcsqlite313targz"></a>
<div class="binary"><h4>Added: branches/dp2mp-move/base/src/sqlite-3.1.3.tar.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: branches/dp2mp-move/base/src/sqlite-3.1.3.tar.gz
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span></div>
</body>
</html>