Add --with-tcltk-framework=

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32323 15284696-431f-4ddb-bdfa-cd5b030d7da7

aclocal.m4

@@ -50,6 +50,24 @@ if test -n "$with_$1_libs"; then
 fi
 ])
 
+AC_DEFUN([LOC_CHECK_FRAMEWORK_PATH],[
+AC_MSG_CHECKING(for location of $2 framework)
+case "$with_$1_framework" in
+y | ye | yes | n | no)
+	AC_MSG_ERROR([*** You must supply a directory to --with-$1-framework.])
+	;;
+esac
+AC_MSG_RESULT($with_$1_framework)
+
+if test -n "$with_$1_framework"; then
+    if test -d $with_$1_framework; then
+        $3="$$3 -F$with_$1_framework"
+    else
+        AC_MSG_ERROR([*** $2 framework directory $dir does not exist.])
+    fi
+fi
+])
+
 AC_DEFUN([LOC_CHECK_SHARE_PATH],[
 AC_MSG_CHECKING(for location of $2 data files)
 case "$with_$1_share" in
@@ -225,6 +243,11 @@ AC_ARG_WITH($1-share,
 LOC_PAD([  --with-$1-share=DIR])[$2 data files are in DIR])
 ])
 
+AC_DEFUN([LOC_ARG_WITH_FRAMEWORK],[
+AC_ARG_WITH($1-framework,
+LOC_PAD([  --with-$1-framework=DIR])[$2 framework is in DIR])
+])
+
 AC_DEFUN([LOC_OPTIONAL],[
 AC_MSG_CHECKING(whether to build $1)
 if test -n "$USE_$2" ; then

configure.in

@@ -233,6 +233,7 @@ LOC_ARG_WITH_LIB(png, PNG)
 
 LOC_ARG_WITH_INC(tcltk, Tcl/Tk)
 LOC_ARG_WITH_LIB(tcltk, Tcl/Tk)
+LOC_ARG_WITH_FRAMEWORK(tcltk, Tcl/Tk)
 
 LOC_ARG_WITH_INC(postgres, PostgreSQL)
 LOC_ARG_WITH_LIB(postgres, PostgreSQL)
@@ -798,6 +799,27 @@ TCLTKLIBS=
 
 if test -n "$USE_TCLTK"; then
 
+LOC_CHECK_FRAMEWORK_PATH(tcltk,Tcl/Tk,TCLTKLIBPATH)
+
+if test -n "$TCLTKLIBPATH" ; then
+
+dir="$with_tcltk_framework"
+TCLINCDIR="-I$dir/Tcl.framework/Headers -I$dir/Tk.framework/Headers -I$dir/Tk.framework/PrivateHeaders"
+
+LOC_CHECK_INCLUDES(tcl.h,Tcl,$TCLINCDIR)
+LOC_CHECK_INCLUDES(tk.h,Tk,$TCLINCDIR)
+
+ac_save_ldflags="$LDFLAGS"
+LDFLAGS="$TCLTKLIBPATH -framework Tcl -framework Tk $LIBS"
+AC_CHECK_FUNC(Tk_MainWindow,[
+TCLTKLIBS = -framework Tcl -framework Tk
+],[
+AC_MSG_ERROR([*** Unable to locate Tcl/Tk libraries.])
+])
+LDFLAGS=$ac_save_ldflags
+
+else
+
 # With Tcl/Tk includes directory
 
 LOC_CHECK_INC_PATH(tcltk,Tcl/Tk,TCLINCDIR)
@@ -844,6 +866,9 @@ LOC_CHECK_LIBS(tk$tcltk_ver2,Tk_MainWindow,Tk,$TCLTKLIBPATH,TKLIB,$TCLLIB,$MATHL
 
 
 TCLTKLIBS="$TKLIB $TCLLIB"
+
+fi
+
 AC_DEFINE(HAVE_TCLTK)
 
 fi # $USE_TCLTK