[64358] trunk/base
jmr at macports.org
jmr at macports.org
Wed Mar 3 14:10:45 PST 2010
Revision: 64358
http://trac.macports.org/changeset/64358
Author: jmr at macports.org
Date: 2010-03-03 14:10:44 -0800 (Wed, 03 Mar 2010)
Log Message:
-----------
remove bundled copy of sqlite3, make sqlite3 location configurable
Modified Paths:
--------------
trunk/base/Mk/macports.autoconf.mk.in
trunk/base/aclocal.m4
trunk/base/configure
trunk/base/configure.ac
trunk/base/src/macports1.0/macports_fastload.tcl.in
trunk/base/src/registry2.0/Makefile
Removed Paths:
-------------
trunk/base/src/sqlite-3.1.3.diff
trunk/base/src/sqlite-3.1.3.tar.gz
Modified: trunk/base/Mk/macports.autoconf.mk.in
===================================================================
--- trunk/base/Mk/macports.autoconf.mk.in 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/Mk/macports.autoconf.mk.in 2010-03-03 22:10:44 UTC (rev 64358)
@@ -17,7 +17,7 @@
READLINE_CFLAGS =
MD5_CFLAGS =
-SQLITE3_CFLAGS =
+SQLITE3_CFLAGS = @CFLAGS_SQLITE3@
CURL_CFLAGS = @CFLAGS_LIBCURL@
OBJC_RUNTIME = @OBJC_RUNTIME@
@@ -40,7 +40,7 @@
LIBS = @LIBS@
READLINE_LIBS = @READLINE_LIBS@
MD5_LIBS = @MD5_LIBS@
-SQLITE3_LIBS = @SQLITE3_LIBS@
+SQLITE3_LIBS = @LDFLAGS_SQLITE3@
CURL_LIBS = @LDFLAGS_LIBCURL@
INSTALL = @INSTALL@
MTREE = @MTREE@
Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/aclocal.m4 2010-03-03 22:10:44 UTC (rev 64358)
@@ -774,6 +774,68 @@
AC_SUBST(LDFLAGS_LIBCURL)
])
+# MP_SQLITE3_FLAGS
+# Sets the flags to compile with libsqlite3 and tclsqlite3.
+#
+# Arguments:
+# None.
+#
+# Requires:
+# pkgconfig, libsqlite3 in /usr/lib, or user parameters to define the flags.
+#
+# Results:
+# defines some help strings.
+# sets CFLAGS_SQLITE3 and LDFLAGS_SQLITE3
+#---------------------------------------
+AC_DEFUN([MP_SQLITE3_FLAGS],[
+ # first sqlite3 itself
+ AC_ARG_WITH(sqlite3prefix,
+ [ --with-sqlite3prefix base directory for the sqlite3 install '/usr', '/usr/local',...],
+ [ sqlite3prefix=$withval ])
+
+ if test "x$sqlite3prefix" = "x"; then
+ AC_PATH_PROG([PKG_CONFIG], [pkg-config])
+ if test "x$PKG_CONFIG" = "x" || ! $PKG_CONFIG --exists sqlite3; then
+ # assume it's somewhere like /usr that needs no extra flags
+ AC_CHECK_HEADER(sqlite3.h, [], [AC_MSG_ERROR([cannot find sqlite3 header])])
+ CFLAGS_SQLITE3=""
+ LDFLAGS_SQLITE3="-lsqlite3"
+ else
+ CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
+ LDFLAGS_SQLITE3=$($PKG_CONFIG --libs sqlite3)
+ # for tclsqlite below
+ mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
+ if test "x$mp_sqlite3_dir" = "x"; then
+ mp_sqlite3_dir=${mp_sqlite3_dir}/lib/sqlite3
+ fi
+ fi
+ else
+ CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
+ LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
+ fi
+
+ AC_SUBST(CFLAGS_SQLITE3)
+ AC_SUBST(LDFLAGS_SQLITE3)
+
+ # now the sqlite Tcl bindings
+ AC_ARG_WITH(tcl-sqlite3,
+ AS_HELP_STRING([--with-tcl-sqlite3=DIR],
+ [directory for Tcl sqlite3 (default /usr/lib/sqlite3)]),
+ [mp_sqlite3_dir=$withval])
+
+ if test "x$mp_sqlite3_dir" = "x"; then
+ mp_sqlite3_dir=/usr/lib/sqlite3
+ fi
+
+ 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_TCL_DIR=$mp_cv_sqlite3_dir
+ AC_SUBST(SQLITE3_TCL_DIR)
+])
+
dnl This macro tests if the compiler supports GCC's
dnl __attribute__ syntax for unused variables/parameters
AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/configure 2010-03-03 22:10:44 UTC (rev 64358)
@@ -611,9 +611,11 @@
STLIB_LD
PATHCONF
INCLUDES
-SQLITE3_DIR
-SQLITE3_LIBS
subdirs
+SQLITE3_TCL_DIR
+LDFLAGS_SQLITE3
+CFLAGS_SQLITE3
+PKG_CONFIG
LDFLAGS_LIBCURL
CFLAGS_LIBCURL
CURL_CONFIG
@@ -794,9 +796,9 @@
with_tclinclude
with_tclpackage
with_curlprefix
+with_sqlite3prefix
+with_tcl_sqlite3
with_included_tclthread
-with_included_sqlite3
-with_tcl_sqlite3
with_trace_sdk
enable_shared
'
@@ -825,8 +827,7 @@
OPEN
OBJCPP
CPP'
-ac_subdirs_all='src/thread2.6
-src/sqlite-3.1.3'
+ac_subdirs_all='src/thread2.6'
# Initialize some variables set by options.
ac_init_help=
@@ -1473,10 +1474,10 @@
--with-tclinclude directory containing the public Tcl header files.
--with-tclpackage Tcl package installation directory.
--with-curlprefix base directory for the cURL install '/usr', '/usr/local',...
+ --with-sqlite3prefix base directory for the sqlite3 install '/usr', '/usr/local',...
+ --with-tcl-sqlite3=DIR directory for Tcl sqlite3 (default /usr/lib/sqlite3)
--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)
--with-trace-sdk=SDK SDK for redirection in trace lib (for example
MacOSX10.4u.sdk)
@@ -9082,134 +9083,98 @@
-# Determine if we need to install some bundled packages
-OUR_INCLUDED_PACKAGES=
+## sqlite3
-## Thread package.
+ # first sqlite3 itself
-# Check whether --with-included-tclthread was given.
-if test "${with_included_tclthread+set}" = set; then :
- withval=$with_included_tclthread; with_included_tclthread=$withval
-else
- with_included_tclthread="unspecified"
+# Check whether --with-sqlite3prefix was given.
+if test "${with_sqlite3prefix+set}" = set; then :
+ withval=$with_sqlite3prefix; sqlite3prefix=$withval
fi
-# Check if thread package is already installed.
-if test "x$with_included_tclthread" = "xunspecified" ; then
+ if test "x$sqlite3prefix" = "x"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl Thread package" >&5
-$as_echo_n "checking for Tcl Thread package... " >&6; }
- package_present=`echo 'if {[catch {package require Thread}]} {puts -nonewline 0} else {puts -nonewline 1}' | $TCLSH`
- if test "$package_present" = "1"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; with_included_tclthread=no
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; with_included_tclthread=yes
+$as_echo "no" >&6; }
fi
-fi
-# If thread package isn't installed, configure and install thread package.
-if test "$with_included_tclthread" = "yes"; then
- OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES thread2.6"
+ if test "x$PKG_CONFIG" = "x" || ! $PKG_CONFIG --exists sqlite3; then
+ # assume it's somewhere like /usr that needs no extra flags
+ ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = x""yes; then :
-
-subdirs="$subdirs src/thread2.6"
-
- # Extract thread package
- (cd src/; gzip -d < thread2.6.tar.gz | tar xf -)
- # Patch thread package (so thread2.6 is the vanilla distribution directory)
- patch -p0 < src/thread2.6.diff
+else
+ as_fn_error "cannot find sqlite3 header" "$LINENO" 5
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
+ CFLAGS_SQLITE3=""
+ LDFLAGS_SQLITE3="-lsqlite3"
+ else
+ CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
+ LDFLAGS_SQLITE3=$($PKG_CONFIG --libs sqlite3)
+ # for tclsqlite below
+ mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
+ if test "x$mp_sqlite3_dir" = "x"; then
+ mp_sqlite3_dir=${mp_sqlite3_dir}/lib/sqlite3
+ fi
+ fi
+ else
+ CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
+ LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
+ fi
-# Check if sqlite3 package is already installed.
-if test "x$with_included_sqlite3" = "xunspecified" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsqlite3 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* 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
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sqlite3_sqlite3_open=yes
-else
- ac_cv_lib_sqlite3_sqlite3_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then :
- with_included_sqlite3=no
-else
- with_included_sqlite3=yes
-fi
-fi
+ # now the sqlite Tcl bindings
-
# 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"
- INCLUDES="$INCLUDES -I../sqlite-3.1.3"
- subdirs="$subdirs src/sqlite-3.1.3"
+ if test "x$mp_sqlite3_dir" = "x"; then
+ mp_sqlite3_dir=/usr/lib/sqlite3
+ fi
- # 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"
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl sqlite3 location" >&5
$as_echo_n "checking for Tcl sqlite3 location... " >&6; }
if test "${mp_cv_sqlite3_dir+set}" = set; then :
@@ -9222,14 +9187,54 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mp_cv_sqlite3_dir" >&5
$as_echo "$mp_cv_sqlite3_dir" >&6; }
- SQLITE3_DIR=$mp_cv_sqlite3_dir
+ SQLITE3_TCL_DIR=$mp_cv_sqlite3_dir
+
+
+
+# Determine if we need to install some bundled packages
+OUR_INCLUDED_PACKAGES=
+
+## Thread package.
+
+# Check whether --with-included-tclthread was given.
+if test "${with_included_tclthread+set}" = set; then :
+ withval=$with_included_tclthread; with_included_tclthread=$withval
+else
+ with_included_tclthread="unspecified"
fi
+# Check if thread package is already installed.
+if test "x$with_included_tclthread" = "xunspecified" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl Thread package" >&5
+$as_echo_n "checking for Tcl Thread package... " >&6; }
+ package_present=`echo 'if {[catch {package require Thread}]} {puts -nonewline 0} else {puts -nonewline 1}' | $TCLSH`
+ if test "$package_present" = "1"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; with_included_tclthread=no
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; with_included_tclthread=yes
+fi
+fi
+# If thread package isn't installed, configure and install thread package.
+if test "$with_included_tclthread" = "yes"; then
+ OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES thread2.6"
+
+subdirs="$subdirs src/thread2.6"
+
+ # Extract thread package
+ (cd src/; gzip -d < thread2.6.tar.gz | tar xf -)
+ # Patch thread package (so thread2.6 is the vanilla distribution directory)
+ patch -p0 < src/thread2.6.diff
+fi
+
+
+
# Check whether --with-trace-sdk was given.
if test "${with_trace_sdk+set}" = set; then :
withval=$with_trace_sdk; test -d ${DEVELOPER_DIR}/SDKs/$withval && cat >>confdefs.h <<_ACEOF
Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/configure.ac 2010-03-03 22:10:44 UTC (rev 64358)
@@ -247,6 +247,9 @@
## libcurl
MP_LIBCURL_FLAGS
+## sqlite3
+MP_SQLITE3_FLAGS
+
# Determine if we need to install some bundled packages
OUR_INCLUDED_PACKAGES=
@@ -276,59 +279,6 @@
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"
- INCLUDES="$INCLUDES -I../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)
-
AH_TEMPLATE([TRACE_SDK], [SDK for SDK redirect in tracelib])
AC_ARG_WITH(
trace-sdk,
Modified: trunk/base/src/macports1.0/macports_fastload.tcl.in
===================================================================
--- trunk/base/src/macports1.0/macports_fastload.tcl.in 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/src/macports1.0/macports_fastload.tcl.in 2010-03-03 22:10:44 UTC (rev 64358)
@@ -80,7 +80,7 @@
}
}
-if { "@SQLITE3_DIR@" != "" } {
- set dir "@SQLITE3_DIR@"
+if { "@SQLITE3_TCL_DIR@" != "" } {
+ set dir "@SQLITE3_TCL_DIR@"
catch {source [file join $dir pkgIndex.tcl]}
}
Modified: trunk/base/src/registry2.0/Makefile
===================================================================
--- trunk/base/src/registry2.0/Makefile 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/src/registry2.0/Makefile 2010-03-03 22:10:44 UTC (rev 64358)
@@ -12,6 +12,7 @@
include ../../Mk/macports.autoconf.mk
include ../../Mk/macports.tea.mk
+CFLAGS+= ${SQLITE3_CFLAGS}
LIBS+= ${SQLITE3_LIBS}
.PHONY: test
Deleted: trunk/base/src/sqlite-3.1.3.diff
===================================================================
--- trunk/base/src/sqlite-3.1.3.diff 2010-03-03 20:54:11 UTC (rev 64357)
+++ trunk/base/src/sqlite-3.1.3.diff 2010-03-03 22:10:44 UTC (rev 64358)
@@ -1,53 +0,0 @@
-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,14 +7,14 @@
- 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 $env(DESTDIR)@prefix@/share/macports/Tcl
- set LIBNAME [file tail $LIBFILE]
- set LIB $LIBDIR/sqlite3/$LIBNAME
-
- file delete -force $LIBDIR/sqlite3
- file mkdir $LIBDIR/sqlite3
- set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w]
--puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]"
-+puts $fd "package ifneeded sqlite3 $VERSION \[list load \[file join \$dir libtclsqlite3.dylib\]\]"
- close $fd
-
- # We cannot use [file copy] because that will just make a copy of
Deleted: trunk/base/src/sqlite-3.1.3.tar.gz
===================================================================
(Binary files differ)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100303/982f70c7/attachment-0001.html>
More information about the macports-changes
mailing list