<!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" />
<title>[133274] trunk/dports/math/gnuplot</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133274">133274</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-02-24 09:02:00 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuplot: reintroduce some patches for AquaTerm detection for case sensitive systems (closes #46942), remove leftovers of lisp support (removed from upstream)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathgnuplotPortfile">trunk/dports/math/gnuplot/Portfile</a></li>
<li><a href="#trunkdportsmathgnuplotfilespatchconfigureaquatermdiff">trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/math/gnuplot/files/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathgnuplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/gnuplot/Portfile (133273 => 133274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/gnuplot/Portfile 2015-02-24 16:46:21 UTC (rev 133273)
+++ trunk/dports/math/gnuplot/Portfile 2015-02-24 17:02:00 UTC (rev 133274)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup elisp 1.0
</del><span class="cx"> PortGroup texlive 1.0
</span><span class="cx"> PortGroup xcodeversion 1.0
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="lines">@@ -48,6 +47,8 @@
</span><span class="cx"> port:readline \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+patchfiles patch-configure-aquaterm.diff
+
</ins><span class="cx"> minimum_xcodeversions \
</span><span class="cx"> {9 3.1}
</span><span class="cx">
</span><span class="lines">@@ -58,7 +59,6 @@
</span><span class="cx"> --without-x \
</span><span class="cx"> --infodir='\${prefix}/share/info' \
</span><span class="cx"> --mandir='\${prefix}/share/man' \
</span><del>- --without-lisp-files \
</del><span class="cx"> --disable-wxwidgets \
</span><span class="cx"> --without-bitmap-terminals \
</span><span class="cx"> --without-cairo \
</span></span></pre></div>
<a id="trunkdportsmathgnuplotfilespatchconfigureaquatermdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff (133178 => 133274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2015-02-23 09:12:09 UTC (rev 133178)
+++ trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2015-02-24 17:02:00 UTC (rev 133274)
</span><span class="lines">@@ -1,366 +1,88 @@
</span><ins>+https://sourceforge.net/p/gnuplot/bugs/1571/
+https://trac.macports.org/ticket/46942
+
</ins><span class="cx"> --- config.hin.orig
</span><span class="cx"> +++ config.hin
</span><del>-@@ -145,7 +145,7 @@
- /* Define to 1 if you have the `lgamma' function. */
- #undef HAVE_LGAMMA
</del><ins>+@@ -100,7 +100,7 @@
+ /* Define to 1 if you have the `fork' function. */
+ #undef HAVE_FORK
</ins><span class="cx">
</span><del>--/* Define to 1 if you're using the aquaterm library on Mac OS X */
</del><ins>+-/* Define to 1 if you're using the Aquaterm framework on Mac OS X */
</ins><span class="cx"> +/* Define to 1 if you're using the AquaTerm framework on Mac OS X */
</span><del>- #undef HAVE_LIBAQUATERM
</del><ins>+ #undef HAVE_FRAMEWORK_AQUATERM
</ins><span class="cx">
</span><del>- /* Define to 1 if you have the <libc.h> header file. */
</del><ins>+ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
</ins><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><del>-@@ -812,6 +812,7 @@ with_texdir
- with_kpsexpand
- with_x
- with_x_app_defaultdir
-+with_aquaterm
- with_lasergnu
- with_gihdir
- with_linux_vga
-@@ -1533,6 +1534,7 @@ Optional Packages:
</del><ins>+@@ -1531,7 +1531,7 @@ Optional Packages:
</ins><span class="cx"> --with-x use the X Window System
</span><span class="cx"> --with-x-app-defaultdir=DIR location of X11 application defaults
</span><span class="cx"> (default /etc/X11/app-defaults/)
</span><del>-+ --without-aquaterm disable aqua terminal (default --with-aquaterm=/Library/Frameworks)
- --with-lasergnu install lasergnu printer script
</del><ins>+- --with-aquaterm include support for aquaterm on OSX
++ --with-aquaterm include support for AquaTerm on OSX
</ins><span class="cx"> --with-gihdir=DIR location of .gih help text file
</span><span class="cx"> (default PREFIX/share/PACKAGE/VERSION)
</span><del>-@@ -8086,8 +8088,8 @@ fi
- rm -f conftest*
</del><ins>+ --with-linux-vga use the Linux SVGA console driver
+@@ -8863,10 +8863,10 @@ $as_echo "yes" >&6; }
+ if test "${with_aquaterm+set}" = set; then :
+ withval=$with_aquaterm; if test "$withval" == yes; then
</ins><span class="cx">
</span><ins>+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Aquaterm framework presence" >&5
+-$as_echo_n "checking for Aquaterm framework presence... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm framework presence" >&5
++$as_echo_n "checking for AquaTerm framework presence... " >&6; }
+ ac_gnuplot_save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -framework Foundation -framework Aquaterm"
++ LDFLAGS="$LDFLAGS -framework Foundation -framework AquaTerm"
+ ac_ext=m
+ ac_cpp='$OBJCPP $CPPFLAGS'
+ ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -8875,7 +8875,7 @@ ac_compiler_gnu=$ac_cv_objc_compiler_gnu
</ins><span class="cx">
</span><del>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apple MacOS X" >&5
--$as_echo_n "checking for Apple MacOS X... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apple Mac OS X" >&5
-+$as_echo_n "checking for Apple Mac OS X... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</del><ins>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</ins><span class="cx"> /* end confdefs.h. */
</span><del>- #if defined(__APPLE__) && defined(__MACH__)
-@@ -8097,15 +8099,98 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aqtInit in -laquaterm" >&5
--$as_echo_n "checking for aqtInit in -laquaterm... " >&6; }
--if ${ac_cv_lib_aquaterm_aqtInit+:} false; then :
-+ is_apple=yes
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ is_apple=no
-+fi
-+rm -f conftest*
-+
-+
-+
-+
-+if test "$is_apple" = "yes"; then
-+
-+# Check whether --with-aquaterm was given.
-+if test "${with_aquaterm+set}" = set; then :
-+ withval=$with_aquaterm;
-+else
-+ with_aquaterm="yes"
-+fi
-+
-+
-+ # if AquaTerm wasn't explicitly disabled
-+ if test "x$with_aquaterm" != xno; then
-+ aquaterm_libs=""
-+ if test "x$with_aquaterm" = xyes; then :
-+ # Default location of AquaTerm framework
-+ aquaterm_framework_path="/Library/Frameworks"
-+else
-+ # Location of frameworks provided by user
-+ aquaterm_framework_path="$with_aquaterm"
-+ aquaterm_libs=" -F$aquaterm_framework_path"
-+fi
-+
-+ if test ! -d "$aquaterm_framework_path/AquaTerm.framework"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Framework '$aquaterm_framework_path/AquaTerm.framework' doesn't exist." >&5
-+$as_echo "$as_me: WARNING: Framework '$aquaterm_framework_path/AquaTerm.framework' doesn't exist." >&2;}
-+ aquaterm_libs=""
-+fi
-+
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm/AQTAdapter.h" >&5
-+$as_echo_n "checking for AquaTerm/AQTAdapter.h... " >&6; }
-+if ${ac_cv_header_aquaterm_aqtadapter_h+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-laquaterm -lobjc $LIBS"
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
</del><ins>+-#import <Aquaterm/AQTAdapter.h>
</ins><span class="cx"> +#import <AquaTerm/AQTAdapter.h>
</span><del>-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_aquaterm_aqtadapter_h=yes
-+else
-+ ac_cv_header_aquaterm_aqtadapter_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_aquaterm_aqtadapter_h" >&5
-+$as_echo "$ac_cv_header_aquaterm_aqtadapter_h" >&6; }
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ CFLAGS="$ac_save_CFLAGS"
-+
-+ if test "x$ac_cv_header_aquaterm_aqtadapter_h" = "xno"; then :
-+ with_aquaterm=no
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aqtInit in AquaTerm framework" >&5
-+$as_echo_n "checking for aqtInit in AquaTerm framework... " >&6; }
-+if ${ac_cv_framework_AquaTerm_aqtInit+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_framework_save_LIBS=$LIBS
-+LIBS="-framework AquaTerm $aquaterm_libs $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -8125,33 +8210,32 @@ return aqtInit ();
</del><ins>+ int
+ main ()
+ {
+@@ -8885,9 +8885,9 @@ main ()
</ins><span class="cx"> }
</span><span class="cx"> _ACEOF
</span><del>- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_aquaterm_aqtInit=yes
-+ ac_cv_framework_AquaTerm_aqtInit=yes
</del><ins>+ if ac_fn_objc_try_link "$LINENO"; then :
+- eval "gnuplot_framework_Aquaterm=yes"
++ eval "gnuplot_framework_AquaTerm=yes"
</ins><span class="cx"> else
</span><del>-- ac_cv_lib_aquaterm_aqtInit=no
-+ ac_cv_framework_AquaTerm_aqtInit=no
</del><ins>+- eval "gnuplot_framework_Aquaterm=no"
++ eval "gnuplot_framework_AquaTerm=no"
</ins><span class="cx"> fi
</span><span class="cx"> rm -f core conftest.err conftest.$ac_objext \
</span><span class="cx"> conftest$ac_exeext conftest.$ac_ext
</span><del>--LIBS=$ac_check_lib_save_LIBS
-+LIBS=$ac_check_framework_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aquaterm_aqtInit" >&5
--$as_echo "$ac_cv_lib_aquaterm_aqtInit" >&6; }
--if test "x$ac_cv_lib_aquaterm_aqtInit" = xyes; then :
-- LIBS="-laquaterm $LIBS -framework Foundation"
-- CFLAGS="$CFLAGS -ObjC"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_AquaTerm_aqtInit" >&5
-+$as_echo "$ac_cv_framework_AquaTerm_aqtInit" >&6; }
-+if test $ac_cv_framework_AquaTerm_aqtInit = yes; then :
</del><ins>+@@ -8898,13 +8898,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</ins><span class="cx">
</span><del>- $as_echo "#define HAVE_LIBAQUATERM 1" >>confdefs.h
</del><ins>+ LDFLAGS="$ac_gnuplot_save_LDFLAGS"
+- if test "$gnuplot_framework_Aquaterm" = yes; then
++ if test "$gnuplot_framework_AquaTerm" = yes; then
</ins><span class="cx">
</span><del>-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ LIBS="$LIBS -framework Foundation -framework AquaTerm$aquaterm_libs"
-+ with_aquaterm=yes
</del><ins>+ $as_echo "#define HAVE_FRAMEWORK_AQUATERM 1" >>confdefs.h
</ins><span class="cx">
</span><del>-+else
-+ with_aquaterm=no
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CFLAGS="$CFLAGS -ObjC"; LDFLAGS="$LDFLAGS -framework Foundation -framework Aquaterm"
++ CFLAGS="$CFLAGS -ObjC"; LDFLAGS="$LDFLAGS -framework Foundation -framework AquaTerm"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16366,7 +16366,7 @@ else
+ $as_echo " caca terminal: no (requires libcaca >= 0.99.beta15)" >&6; }
</ins><span class="cx"> fi
</span><del>--
-- is_apple=yes
--
-+fi
-+ fi
- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- is_apple=no
-+ with_aquaterm=no
- fi
--rm -f conftest*
</del><span class="cx">
</span><del>-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BeOS" >&5
-@@ -14306,9 +14390,9 @@ esac
-
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- # Files that config.status was made for.
--config_files="`echo $ac_config_files`"
--config_headers="`echo $ac_config_headers`"
--config_commands="`echo $ac_config_commands`"
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-
- _ACEOF
-
-@@ -15548,7 +15632,7 @@ else
- $as_echo " next terminal: no" >&6; }
- fi
-
--if test "$ac_cv_lib_aquaterm_aqtInit" = yes; then
-+if test "$with_aquaterm" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: aqua terminal: yes" >&5
- $as_echo " aqua terminal: yes" >&6; }
</del><ins>+-if test "$gnuplot_framework_Aquaterm" = yes; then
++if test "$gnuplot_framework_AquaTerm" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: aqua terminal (OSX): yes" >&5
+ $as_echo " aqua terminal (OSX): yes" >&6; }
</ins><span class="cx"> else
</span><del>---- configure.in.orig
-+++ configure.in
-@@ -1373,7 +1373,7 @@ else
- AC_MSG_RESULT([ next terminal: no])
- fi
-
--if test "$ac_cv_lib_aquaterm_aqtInit" = yes; then
-+if test "$with_aquaterm" = yes; then
- AC_MSG_RESULT([ aqua terminal: yes])
- else
- AC_MSG_RESULT([ aqua terminal: no])
---- m4/apple.m4.orig
-+++ m4/apple.m4
-@@ -1,27 +1,117 @@
-+# serial 1
-+
-+# The following code has been found in several open source projects online.
-+# It's true origin is unknown.
-+#
-+# AC_CHECK_FRAMEWORK(FRAMEWORK, FUNCTION,
-+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-+# [OTHER-LIBRARIES])
-+# ------------------------------------------------------
-+#
-+AC_DEFUN([AC_CHECK_FRAMEWORK],
-+[m4_ifval([$3], , [AH_CHECK_FRAMEWORK([$1])])dnl
-+AS_LITERAL_IF([$1],
-+ [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1_$2])],
-+ [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1''_$2])])dnl
-+AC_CACHE_CHECK([for $2 in $1 framework], ac_Framework,
-+[ac_check_framework_save_LIBS=$LIBS
-+LIBS="-framework $1 $5 $LIBS"
-+AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
-+ [AS_VAR_SET(ac_Framework, yes)],
-+ [AS_VAR_SET(ac_Framework, no)])
-+LIBS=$ac_check_framework_save_LIBS])
-+AS_IF([test AS_VAR_GET(ac_Framework) = yes],
-+ [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FRAMEWORK_$1))
-+ LIBS="-framework $1 $LIBS"
-+])],
-+ [$4])dnl
-+AS_VAR_POPDEF([ac_Framework])dnl
-+])# AC_CHECK_FRAMEWORK
-+
-+# AH_CHECK_FRAMEWORK(FRAMEWORK)
-+# ---------------------
-+m4_define([AH_CHECK_FRAMEWORK],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_FRAMEWORK_$1),
-+ [Define to 1 if you have the `]$1[' framework (-framework ]$1[).])])
-+
-+
- ## ------------------------------- ##
- ## Check for Apple Mac OS X ##
--## From Leigh Smith ##
- ## ------------------------------- ##
-
--# serial 1
--
- AC_DEFUN([GP_APPLE],
--[AC_MSG_CHECKING(for Apple MacOS X)
-+[AC_MSG_CHECKING(for Apple Mac OS X)
- AC_EGREP_CPP(yes,
- [#if defined(__APPLE__) && defined(__MACH__)
- yes
- #endif
--],
-- [ AC_MSG_RESULT(yes)
-- AC_CHECK_LIB(aquaterm, aqtInit,
-- [ LIBS="-laquaterm $LIBS -framework Foundation"
-- CFLAGS="$CFLAGS -ObjC"
-- AC_DEFINE(HAVE_LIBAQUATERM,1,
-- [Define to 1 if you're using the aquaterm library on Mac OS X])
-- ],[], -lobjc)
-- is_apple=yes
-- ],
-- AC_MSG_RESULT(no)
-- is_apple=no)
--])
-+],
-+ [AC_MSG_RESULT(yes)
-+ is_apple=yes],
-+ [AC_MSG_RESULT(no)
-+ is_apple=no])
-
-+dnl AquaTerm terminal for Mac OS X
-+
-+dnl The terminal only works on Mac OS X, so the test will only be performed there
-+dnl It is enabled by default (if AquaTerm can be found).
-+dnl One can disabled it with --without-aquaterm
-+dnl or choose a different framework location with --with-aquaterm=/path/to/Frameworks
-+dnl
-+dnl Somewhere we have to document that --with-aquaterm=/path/to/Frameworks will try to include
-+dnl /path/to/Frameworks/AquaTerm.framework by using -F/path/to/Frameworks
-+dnl as well as
-+dnl -I/path/to/Frameworks/AquaTerm.framework/Headers
-+dnl but of course one can always simply use explicit LDFLAGS and CFLAGS.
-+
-+if test "$is_apple" = "yes"; then
-+ AC_ARG_WITH(aquaterm, [ --without-aquaterm disable aqua terminal (default --with-aquaterm=/Library/Frameworks)], [], [with_aquaterm="yes"])
-+
-+ # if AquaTerm wasn't explicitly disabled
-+ if test "x$with_aquaterm" != xno; then
-+ aquaterm_libs=""
-+ AS_IF([test "x$with_aquaterm" = xyes],
-+ # Default location of AquaTerm framework
-+ [aquaterm_framework_path="/Library/Frameworks"],
-+ # Location of frameworks provided by user
-+ [aquaterm_framework_path="$with_aquaterm"
-+ aquaterm_libs=" -F$aquaterm_framework_path"])
-+
-+ dnl Test if /path/to/Frameworks/AquaTerm.framework as provided by
-+ dnl --with-aquaterm=/path/to/Frameworks or /Library/Frameworks
-+ dnl exists and issue a warning if it doesn't
-+ dnl (however it might still be the case that one used explicit flags, so don't make that fatal, just informative)
-+ AS_IF([test ! -d "$aquaterm_framework_path/AquaTerm.framework"],
-+ [AC_MSG_WARN([Framework '$aquaterm_framework_path/AquaTerm.framework' doesn't exist.])
-+ aquaterm_libs=""])
-+
-+ dnl We need to check if AquaTerm/AQTAdapter.h can be found.
-+ dnl We could actually use AC_LANG_PUSH([Objective C]) here, but for real compilation C with -ObjC is used
-+ dnl and it might be that users have set CFLAGS and no OBJCFLAGS, which would lead to discrepancies.
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ AC_LANG_PUSH([C])
-+ AC_CACHE_CHECK([for AquaTerm/AQTAdapter.h],
-+ [ac_cv_header_aquaterm_aqtadapter_h],
-+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#import <AquaTerm/AQTAdapter.h>]],[[]])],
-+ [ac_cv_header_aquaterm_aqtadapter_h=yes],
-+ [ac_cv_header_aquaterm_aqtadapter_h=no])])
-+ AC_LANG_POP([C])
-+ CFLAGS="$ac_save_CFLAGS"
-+
-+ dnl And now finally test if AquaTerm framework can be linked against
-+ AS_IF([test "x$ac_cv_header_aquaterm_aqtadapter_h" = "xno"],
-+ [with_aquaterm=no],
-+ [AC_CHECK_FRAMEWORK([AquaTerm],[aqtInit],
-+ [AC_DEFINE(HAVE_LIBAQUATERM,1,
-+ [Define to 1 if you're using the AquaTerm framework on Mac OS X])
-+ CFLAGS="$CFLAGS -ObjC$aquaterm_libs"
-+ LIBS="$LIBS -framework Foundation -framework AquaTerm$aquaterm_libs"
-+ with_aquaterm=yes
-+ ],[with_aquaterm=no],[$aquaterm_libs])])
-+ fi
-+else
-+ with_aquaterm=no
-+fi
-+
-+])
</del><span class="cx"> --- term/aquaterm.trm.orig
</span><span class="cx"> +++ term/aquaterm.trm
</span><span class="cx"> @@ -94,7 +94,7 @@ TERM_PUBLIC void ENHAQUA_writec __PROTO((int c));
</span></span></pre>
</div>
</div>
</body>
</html>