[103632] users/cal/base-sqlite-portindex/aclocal.m4

cal at macports.org cal at macports.org
Sun Mar 3 12:52:27 PST 2013


Revision: 103632
          https://trac.macports.org/changeset/103632
Author:   cal at macports.org
Date:     2013-03-03 12:52:27 -0800 (Sun, 03 Mar 2013)
Log Message:
-----------
aclocal.m4: support finding the platform's tcllib dir

Modified Paths:
--------------
    users/cal/base-sqlite-portindex/aclocal.m4

Modified: users/cal/base-sqlite-portindex/aclocal.m4
===================================================================
--- users/cal/base-sqlite-portindex/aclocal.m4	2013-03-03 20:51:34 UTC (rev 103631)
+++ users/cal/base-sqlite-portindex/aclocal.m4	2013-03-03 20:52:27 UTC (rev 103632)
@@ -806,7 +806,7 @@
 AC_DEFUN([MP_SQLITE3_FLAGS],[
     # first sqlite3 itself
 	AC_ARG_WITH(sqlite3prefix,
-		   [  --with-sqlite3prefix       base directory for the sqlite3 install '/usr', '/usr/local',...],
+		   [  --with-sqlite3prefix    base directory for the sqlite3 install '/usr', '/usr/local',...],
 		   [  sqlite3prefix=$withval ])
 
 	if test "x$sqlite3prefix" = "x"; then
@@ -870,6 +870,46 @@
 	AC_SUBST(SQLITE3_TCL_DIR)
 ])
 
+# MP_TCLLIB_PATH
+#	Finds the installation of tcllib and substitutes it where required
+#
+# Arguments:
+#	None.
+#
+# Requires:
+#   tcllib in /System/Library/Tcl, /usr/lib/, /usr/share/tcltk, or user parameters to define the flags.
+#
+# Results:
+#   substitutes TCLLIB_DIR
+#---------------------------------------
+AC_DEFUN([MP_TCLLIB_PATH],[
+	AC_ARG_WITH(tcllib,
+		[  --with-tcllib           base directory for the tcllib install '/System/Library/Tcl', '/usr/share/tcltk' ...],
+		[  mp_tcllib_dir=$withval ])
+
+	if test "x$mp_tcllib_dir" = "x"; then
+		for dir in "/System/Library/Tcl" "/usr/lib" "/usr/share/tcltk"; do
+			candidate=`ls -d "${dir}/tcllib"* 2>/dev/null | sort -rn | head -n1`
+			if test -d "${candidate}"; then
+				mp_tcllib_dir=$candidate
+				break
+			fi
+		done
+	fi
+
+	AC_CACHE_CHECK([for Tcllib location], [mp_cv_tcllib_dir],
+		[
+		mp_cv_tcllib_dir=
+		test -r "${mp_tcllib_dir}/pkgIndex.tcl" && mp_cv_tcllib_dir=$mp_tcllib_dir
+		])
+
+	TCLLIB_DIR=$mp_cv_tcllib_dir
+	if test "x$TCLLIB_DIR" = "x"; then
+		AC_MSG_ERROR([cannot find tcllib])
+	fi
+	AC_SUBST(TCLLIB_DIR)
+])
+
 dnl This macro tests if the compiler supports GCC's
 dnl __attribute__ syntax for unused variables/parameters
 AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130303/699d179a/attachment.html>


More information about the macports-changes mailing list