| | 1 | --- configure.orig |
| | 2 | +++ configure |
| | 3 | @@ -1531,7 +1531,7 @@ Optional Packages: |
| | 4 | --with-x use the X Window System |
| | 5 | --with-x-app-defaultdir=DIR location of X11 application defaults |
| | 6 | (default /etc/X11/app-defaults/) |
| | 7 | - --with-aquaterm include support for aquaterm on OSX |
| | 8 | + --with-aquaterm include support for AquaTerm on OSX |
| | 9 | --with-gihdir=DIR location of .gih help text file |
| | 10 | (default PREFIX/share/PACKAGE/VERSION) |
| | 11 | --with-linux-vga use the Linux SVGA console driver |
| | 12 | @@ -8863,10 +8863,10 @@ $as_echo "yes" >&6; } |
| | 13 | if test "${with_aquaterm+set}" = set; then : |
| | 14 | withval=$with_aquaterm; if test "$withval" == yes; then |
| | 15 | |
| | 16 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Aquaterm framework presence" >&5 |
| | 17 | -$as_echo_n "checking for Aquaterm framework presence... " >&6; } |
| | 18 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AquaTerm framework presence" >&5 |
| | 19 | +$as_echo_n "checking for AquaTerm framework presence... " >&6; } |
| | 20 | ac_gnuplot_save_LDFLAGS="$LDFLAGS" |
| | 21 | - LDFLAGS="$LDFLAGS -framework Foundation -framework Aquaterm" |
| | 22 | + LDFLAGS="$LDFLAGS -framework Foundation -framework AquaTerm" |
| | 23 | ac_ext=m |
| | 24 | ac_cpp='$OBJCPP $CPPFLAGS' |
| | 25 | ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| | 26 | @@ -8875,7 +8875,7 @@ ac_compiler_gnu=$ac_cv_objc_compiler_gnu |
| | 27 | |
| | 28 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| | 29 | /* end confdefs.h. */ |
| | 30 | -#import <Aquaterm/AQTAdapter.h> |
| | 31 | +#import <AquaTerm/AQTAdapter.h> |
| | 32 | int |
| | 33 | main () |
| | 34 | { |
| | 35 | @@ -8885,9 +8885,9 @@ main () |
| | 36 | } |
| | 37 | _ACEOF |
| | 38 | if ac_fn_objc_try_link "$LINENO"; then : |
| | 39 | - eval "gnuplot_framework_Aquaterm=yes" |
| | 40 | + eval "gnuplot_framework_AquaTerm=yes" |
| | 41 | else |
| | 42 | - eval "gnuplot_framework_Aquaterm=no" |
| | 43 | + eval "gnuplot_framework_AquaTerm=no" |
| | 44 | fi |
| | 45 | rm -f core conftest.err conftest.$ac_objext \ |
| | 46 | conftest$ac_exeext conftest.$ac_ext |
| | 47 | @@ -8898,13 +8898,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ |
| | 48 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| | 49 | |
| | 50 | LDFLAGS="$ac_gnuplot_save_LDFLAGS" |
| | 51 | - if test "$gnuplot_framework_Aquaterm" = yes; then |
| | 52 | + if test "$gnuplot_framework_AquaTerm" = yes; then |
| | 53 | |
| | 54 | $as_echo "#define HAVE_FRAMEWORK_AQUATERM 1" >>confdefs.h |
| | 55 | |
| | 56 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| | 57 | $as_echo "yes" >&6; } |
| | 58 | - CFLAGS="$CFLAGS -ObjC"; LDFLAGS="$LDFLAGS -framework Foundation -framework Aquaterm" |
| | 59 | + CFLAGS="$CFLAGS -ObjC"; LDFLAGS="$LDFLAGS -framework Foundation -framework AquaTerm" |
| | 60 | else |
| | 61 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| | 62 | $as_echo "no" >&6; } |
| | 63 | @@ -16366,7 +16366,7 @@ else |
| | 64 | $as_echo " caca terminal: no (requires libcaca >= 0.99.beta15)" >&6; } |
| | 65 | fi |
| | 66 | |
| | 67 | -if test "$gnuplot_framework_Aquaterm" = yes; then |
| | 68 | +if test "$gnuplot_framework_AquaTerm" = yes; then |
| | 69 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: aqua terminal (OSX): yes" >&5 |
| | 70 | $as_echo " aqua terminal (OSX): yes" >&6; } |
| | 71 | else |
