[GRASS-SVN] r34342 - in grass/trunk: . include/Make
visualization/xganim
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Nov 17 13:28:51 EST 2008
Author: glynn
Date: 2008-11-17 13:28:51 -0500 (Mon, 17 Nov 2008)
New Revision: 34342
Added:
grass/trunk/visualization/xganim/gui.cc
grass/trunk/visualization/xganim/main.cc
Removed:
grass/trunk/visualization/xganim/Clr_table.c
grass/trunk/visualization/xganim/gui.c
grass/trunk/visualization/xganim/local_proto.h
grass/trunk/visualization/xganim/main.c
Modified:
grass/trunk/configure
grass/trunk/configure.in
grass/trunk/include/Make/Platform.make.in
grass/trunk/visualization/xganim/Makefile
grass/trunk/visualization/xganim/gui.h
Log:
Convert xganim from Motif to wxWidgets
Remove Motif, Xt checks and variables
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/configure 2008-11-17 18:28:51 UTC (rev 34342)
@@ -51,8 +51,6 @@
ac_help="$ac_help
--with-lapack support LAPACK functionality (default: no)"
ac_help="$ac_help
- --with-motif support Motif functionality (default: no)"
-ac_help="$ac_help
--with-cairo support Cairo functionality (default: no)"
ac_help="$ac_help
--with-freetype support FreeType functionality (default: no)"
@@ -158,11 +156,6 @@
ac_help="$ac_help
--with-lapack-libs=DIRS LAPACK library files are in DIRS"
ac_help="$ac_help
- --with-motif-includes=DIRS
- Motif include files are in DIRS"
-ac_help="$ac_help
- --with-motif-libs=DIRS Motif library files are in DIRS"
-ac_help="$ac_help
--with-cairo-includes=DIRS
cairo include files are in DIRS"
ac_help="$ac_help
@@ -730,7 +723,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:734: checking host system type" >&5
+echo "configure:727: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -753,7 +746,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:757: checking for $ac_word" >&5
+echo "configure:750: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -780,7 +773,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:784: checking for $ac_word" >&5
+echo "configure:777: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -828,7 +821,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:832: checking for $ac_word" >&5
+echo "configure:825: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -857,7 +850,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:861: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:854: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -868,12 +861,12 @@
cat > conftest.$ac_ext << EOF
-#line 872 "configure"
+#line 865 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -899,19 +892,19 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:903: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:896: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:908: checking whether we are using GNU C" >&5
+echo "configure:901: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -929,7 +922,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:933: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:926: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -958,10 +951,10 @@
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:962: checking for Cygwin environment" >&5
+echo "configure:955: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 965 "configure"
+#line 958 "configure"
#include "confdefs.h"
int main() {
@@ -972,7 +965,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -988,17 +981,17 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:992: checking for mingw32 environment" >&5
+echo "configure:985: checking for mingw32 environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 995 "configure"
+#line 988 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1016,7 +1009,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1020: checking for executable suffix" >&5
+echo "configure:1013: checking for executable suffix" >&5
if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
ac_cv_exeext=.exe
@@ -1035,23 +1028,23 @@
IEEEFLAG=
echo $ac_n "checking for full floating-point support""... $ac_c" 1>&6
-echo "configure:1039: checking for full floating-point support" >&5
+echo "configure:1032: checking for full floating-point support" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
echo $ac_n "checking whether "cc -mieee" works""... $ac_c" 1>&6
-echo "configure:1044: checking whether "cc -mieee" works" >&5
+echo "configure:1037: checking whether "cc -mieee" works" >&5
ac_save_cflags=${CFLAGS}
CFLAGS="$CFLAGS -mieee"
cat > conftest.$ac_ext <<EOF
-#line 1048 "configure"
+#line 1041 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
IEEEFLAG="-mieee"
@@ -1067,7 +1060,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 1071 "configure"
+#line 1064 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1081,7 +1074,7 @@
}
EOF
-if { (eval echo configure:1085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -1094,14 +1087,14 @@
CFLAGS=-mieee
echo $ac_n "checking for full floating-point support with -mieee""... $ac_c" 1>&6
-echo "configure:1098: checking for full floating-point support with -mieee" >&5
+echo "configure:1091: checking for full floating-point support with -mieee" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
{ echo "configure: error: *** INTERNAL CONFIGURE ERROR" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1105 "configure"
+#line 1098 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1115,7 +1108,7 @@
}
EOF
-if { (eval echo configure:1119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
IEEEFLAG="-mieee"
@@ -1152,7 +1145,7 @@
# Extract the first word of "pwd", so it can be a program name with args.
set dummy pwd; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1156: checking for $ac_word" >&5
+echo "configure:1149: checking for $ac_word" >&5
case "$pwd" in
/*)
@@ -1190,7 +1183,7 @@
fi
echo $ac_n "checking for source directory""... $ac_c" 1>&6
-echo "configure:1194: checking for source directory" >&5
+echo "configure:1187: checking for source directory" >&5
if test -z "$srcdir" ; then
SRCDIR=`$pwd`
@@ -1201,7 +1194,7 @@
echo "$ac_t"""$SRCDIR"" 1>&6
echo $ac_n "checking for build directory""... $ac_c" 1>&6
-echo "configure:1205: checking for build directory" >&5
+echo "configure:1198: checking for build directory" >&5
DSTDIR=`$pwd`
WINDSTDIR=`$winpwd`
@@ -1286,7 +1279,7 @@
echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1290: checking for MacOSX App" >&5
+echo "configure:1283: checking for MacOSX App" >&5
case "$enable_macosx_app" in
yes) MACOSX_APP=1 ;;
no) MACOSX_APP= ;;
@@ -1309,7 +1302,7 @@
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1313: checking how to build libraries" >&5
+echo "configure:1306: checking how to build libraries" >&5
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
@@ -1352,7 +1345,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1356: checking for $ac_word" >&5
+echo "configure:1349: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -1377,7 +1370,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1381: checking how to run the C preprocessor" >&5
+echo "configure:1374: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1390,13 +1383,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1394 "configure"
+#line 1387 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1407,13 +1400,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1411 "configure"
+#line 1404 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1424,13 +1417,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1428 "configure"
+#line 1421 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1458,7 +1451,7 @@
# Step 0.a: Enable 64 bit support?
echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
-echo "configure:1462: checking if 64bit support is requested" >&5
+echo "configure:1455: checking if 64bit support is requested" >&5
# Check whether --enable-64bit or --disable-64bit was given.
if test "${enable_64bit+set}" = set; then
enableval="$enable_64bit"
@@ -1478,7 +1471,7 @@
# Step 0.b: Enable Solaris 64 bit VIS support?
echo $ac_n "checking if 64bit Sparc VIS support is requested""... $ac_c" 1>&6
-echo "configure:1482: checking if 64bit Sparc VIS support is requested" >&5
+echo "configure:1475: checking if 64bit Sparc VIS support is requested" >&5
# Check whether --enable-64bit-vis or --disable-64bit-vis was given.
if test "${enable_64bit_vis+set}" = set; then
enableval="$enable_64bit_vis"
@@ -1502,7 +1495,7 @@
# there are a few systems, like Next, where this doesn't work.
echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6
-echo "configure:1506: checking system version (for dynamic loading)" >&5
+echo "configure:1499: checking system version (for dynamic loading)" >&5
if test -f /usr/lib/NextStep/software_version; then
system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
else
@@ -1528,13 +1521,13 @@
# Linux can use either -ldl or -ldld for dynamic loading.
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1532: checking for dlopen in -ldl" >&5
+echo "configure:1525: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1538 "configure"
+#line 1531 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1545,7 +1538,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:1549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1592,7 +1585,7 @@
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1596: checking for $ac_word" >&5
+echo "configure:1589: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -1721,13 +1714,13 @@
# known GMT value.
echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:1725: checking for gettimeofday in -lbsd" >&5
+echo "configure:1718: checking for gettimeofday in -lbsd" >&5
ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1731 "configure"
+#line 1724 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1738,7 +1731,7 @@
gettimeofday()
; return 0; }
EOF
-if { (eval echo configure:1742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1779,13 +1772,13 @@
# is always linked to, for compatibility.
#-----------------------------------------------------------
echo $ac_n "checking for inet_ntoa in -lbind""... $ac_c" 1>&6
-echo "configure:1783: checking for inet_ntoa in -lbind" >&5
+echo "configure:1776: checking for inet_ntoa in -lbind" >&5
ac_lib_var=`echo bind'_'inet_ntoa | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1789 "configure"
+#line 1782 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1796,7 +1789,7 @@
inet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1857,13 +1850,13 @@
SHLIB_SUFFIX=".sl"
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1861: checking for shl_load in -ldld" >&5
+echo "configure:1854: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1867 "configure"
+#line 1860 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1874,7 +1867,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1939,13 +1932,13 @@
HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
SHLIB_SUFFIX=".sl"
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1943: checking for shl_load in -ldld" >&5
+echo "configure:1936: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1949 "configure"
+#line 1942 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1956,7 +1949,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2078,15 +2071,15 @@
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2082: checking for dld.h" >&5
+echo "configure:2075: checking for dld.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2085 "configure"
+#line 2078 "configure"
#include "confdefs.h"
#include <dld.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2146,15 +2139,15 @@
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2150: checking for dld.h" >&5
+echo "configure:2143: checking for dld.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2153 "configure"
+#line 2146 "configure"
#include "confdefs.h"
#include <dld.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2251,9 +2244,9 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2255: checking for ELF" >&5
+echo "configure:2248: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 2257 "configure"
+#line 2250 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -2283,15 +2276,15 @@
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:2287: checking for dlfcn.h" >&5
+echo "configure:2280: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2290 "configure"
+#line 2283 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2315,9 +2308,9 @@
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2319: checking for ELF" >&5
+echo "configure:2312: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 2321 "configure"
+#line 2314 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -2641,17 +2634,17 @@
# that don't grok the -Bexport option. Test that it does.
hold_ldflags=$LDFLAGS
echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
-echo "configure:2645: checking for ld accepts -Bexport flag" >&5
+echo "configure:2638: checking for ld accepts -Bexport flag" >&5
LDFLAGS="${LDFLAGS} -Wl,-Bexport"
cat > conftest.$ac_ext <<EOF
-#line 2648 "configure"
+#line 2641 "configure"
#include "confdefs.h"
int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
found=yes
else
@@ -2920,16 +2913,6 @@
-# Check whether --with-motif or --without-motif was given.
-if test "${with_motif+set}" = set; then
- withval="$with_motif"
- :
-else
- with_motif=no
-fi
-
-
-
# Check whether --with-cairo or --without-cairo was given.
if test "${with_cairo+set}" = set; then
withval="$with_cairo"
@@ -3293,23 +3276,6 @@
-# Check whether --with-motif-includes or --without-motif-includes was given.
-if test "${with_motif_includes+set}" = set; then
- withval="$with_motif_includes"
- :
-fi
-
-
-
-# Check whether --with-motif-libs or --without-motif-libs was given.
-if test "${with_motif_libs+set}" = set; then
- withval="$with_motif_libs"
- :
-fi
-
-
-
-
# Check whether --with-cairo-includes or --without-cairo-includes was given.
if test "${with_cairo_includes+set}" = set; then
withval="$with_cairo_includes"
@@ -3419,7 +3385,7 @@
# Done checking fortran
echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:3423: checking for additional include dirs" >&5
+echo "configure:3389: checking for additional include dirs" >&5
case "$with_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to list --with-includes." 1>&2; exit 1; }
@@ -3442,7 +3408,7 @@
# With libs option
echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:3446: checking for additional library dirs" >&5
+echo "configure:3412: checking for additional library dirs" >&5
case "$with_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory list to --with-libs." 1>&2; exit 1; }
@@ -3476,7 +3442,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3480: checking for a BSD compatible install" >&5
+echo "configure:3446: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
@@ -3529,7 +3495,7 @@
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3533: checking for $ac_word" >&5
+echo "configure:3499: checking for $ac_word" >&5
if test -n "$LEX"; then
ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -3560,13 +3526,13 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3564: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3530: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3570 "configure"
+#line 3536 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3577,7 +3543,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3602,7 +3568,7 @@
# Extract the first word of "lex", so it can be a program name with args.
set dummy lex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3606: checking for $ac_word" >&5
+echo "configure:3572: checking for $ac_word" >&5
case "$LEXPATH" in
/*)
@@ -3642,7 +3608,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3646: checking for $ac_word" >&5
+echo "configure:3612: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3673,7 +3639,7 @@
# Extract the first word of "yacc", so it can be a program name with args.
set dummy yacc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3677: checking for $ac_word" >&5
+echo "configure:3643: checking for $ac_word" >&5
case "$YACCPATH" in
/*)
@@ -3711,7 +3677,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3715: checking for $ac_word" >&5
+echo "configure:3681: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3740,7 +3706,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3744: checking for $ac_word" >&5
+echo "configure:3710: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -3771,7 +3737,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3775: checking for $ac_word" >&5
+echo "configure:3741: checking for $ac_word" >&5
if test -n "$ENV"; then
ac_cv_prog_ENV="$ENV" # Let the user override the test.
@@ -3800,7 +3766,7 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3804: checking for $ac_word" >&5
+echo "configure:3770: checking for $ac_word" >&5
case "$PERL" in
/*)
@@ -3831,10 +3797,10 @@
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3835: checking for ANSI C header files" >&5
+echo "configure:3801: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3838 "configure"
+#line 3804 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3842,7 +3808,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3859,7 +3825,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3863 "configure"
+#line 3829 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -3877,7 +3843,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3881 "configure"
+#line 3847 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -3898,7 +3864,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 3902 "configure"
+#line 3868 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3909,7 +3875,7 @@
exit (0); }
EOF
-if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -3936,15 +3902,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3940: checking for $ac_hdr" >&5
+echo "configure:3906: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3943 "configure"
+#line 3909 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3973,15 +3939,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3977: checking for $ac_hdr" >&5
+echo "configure:3943: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3980 "configure"
+#line 3946 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4010,15 +3976,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4014: checking for $ac_hdr" >&5
+echo "configure:3980: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4017 "configure"
+#line 3983 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4047,15 +4013,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4051: checking for $ac_hdr" >&5
+echo "configure:4017: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4054 "configure"
+#line 4020 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4084,15 +4050,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4088: checking for $ac_hdr" >&5
+echo "configure:4054: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4091 "configure"
+#line 4057 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4118,10 +4084,10 @@
done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4122: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4088: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 4125 "configure"
+#line 4091 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -4130,7 +4096,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:4134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -4150,10 +4116,10 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4154: checking for off_t" >&5
+echo "configure:4120: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4157 "configure"
+#line 4123 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -4180,10 +4146,10 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4184: checking for uid_t in sys/types.h" >&5
+echo "configure:4150: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4187 "configure"
+#line 4153 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -4211,10 +4177,10 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4215: checking return type of signal handlers" >&5
+echo "configure:4181: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 4218 "configure"
+#line 4184 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -4231,7 +4197,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:4235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -4249,10 +4215,10 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4253: checking for Cygwin environment" >&5
+echo "configure:4219: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 4256 "configure"
+#line 4222 "configure"
#include "confdefs.h"
int main() {
@@ -4263,7 +4229,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:4267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -4281,10 +4247,10 @@
for ac_func in ftime gethostname gettimeofday lseek nice time uname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4285: checking for $ac_func" >&5
+echo "configure:4251: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4288 "configure"
+#line 4254 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4307,7 +4273,7 @@
; return 0; }
EOF
-if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4333,10 +4299,10 @@
for ac_func in seteuid setpriority setreuid setruid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4337: checking for $ac_func" >&5
+echo "configure:4303: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4340 "configure"
+#line 4306 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4359,7 +4325,7 @@
; return 0; }
EOF
-if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4385,10 +4351,10 @@
for ac_func in drand48
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4389: checking for $ac_func" >&5
+echo "configure:4355: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4392 "configure"
+#line 4358 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4411,7 +4377,7 @@
; return 0; }
EOF
-if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4437,10 +4403,10 @@
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4441: checking for $ac_func" >&5
+echo "configure:4407: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4444 "configure"
+#line 4410 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4463,7 +4429,7 @@
; return 0; }
EOF
-if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4489,10 +4455,10 @@
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4493: checking for $ac_func" >&5
+echo "configure:4459: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4496 "configure"
+#line 4462 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4515,7 +4481,7 @@
; return 0; }
EOF
-if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4540,13 +4506,13 @@
if test "$cross_compiling" != "yes" ; then
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:4544: checking whether setpgrp takes no argument" >&5
+echo "configure:4510: checking whether setpgrp takes no argument" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 4550 "configure"
+#line 4516 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -4566,7 +4532,7 @@
}
EOF
-if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_setpgrp_void=no
else
@@ -4594,16 +4560,16 @@
fi
echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:4598: checking for long long int" >&5
+echo "configure:4564: checking for long long int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4600 "configure"
+#line 4566 "configure"
#include "confdefs.h"
int main() {
long long int x;
; return 0; }
EOF
-if { (eval echo configure:4607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -4623,7 +4589,7 @@
rm -f conftest*
echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:4627: checking for W11" >&5
+echo "configure:4593: checking for W11" >&5
case "$enable_w11" in
yes|no) echo "$ac_t"""$enable_w11"" 1>&6 ;;
*) { echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; } ;;
@@ -4651,7 +4617,7 @@
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4655: checking for X" >&5
+echo "configure:4621: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -4711,12 +4677,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 4715 "configure"
+#line 4681 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4785,14 +4751,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4789 "configure"
+#line 4755 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -4897,17 +4863,17 @@
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4901: checking whether -R must be followed by a space" >&5
+echo "configure:4867: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 4904 "configure"
+#line 4870 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -4923,14 +4889,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 4927 "configure"
+#line 4893 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -4962,13 +4928,13 @@
# libraries were built with DECnet support. And karl at cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4966: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4932: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4972 "configure"
+#line 4938 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4979,7 +4945,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5000,13 +4966,13 @@
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:5004: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4970: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5010 "configure"
+#line 4976 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5017,7 +4983,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5045,10 +5011,10 @@
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey at clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5049: checking for gethostbyname" >&5
+echo "configure:5015: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 5052 "configure"
+#line 5018 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -5071,7 +5037,7 @@
; return 0; }
EOF
-if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -5091,13 +5057,13 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5095: checking for gethostbyname in -lnsl" >&5
+echo "configure:5061: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5101 "configure"
+#line 5067 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5108,7 +5074,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:5112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5137,10 +5103,10 @@
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:5141: checking for connect" >&5
+echo "configure:5107: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 5144 "configure"
+#line 5110 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -5163,7 +5129,7 @@
; return 0; }
EOF
-if { (eval echo configure:5167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -5183,13 +5149,13 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:5187: checking for connect in -lsocket" >&5
+echo "configure:5153: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5193 "configure"
+#line 5159 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5200,7 +5166,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:5204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5223,10 +5189,10 @@
# gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5227: checking for remove" >&5
+echo "configure:5193: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 5230 "configure"
+#line 5196 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -5249,7 +5215,7 @@
; return 0; }
EOF
-if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -5269,13 +5235,13 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5273: checking for remove in -lposix" >&5
+echo "configure:5239: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5279 "configure"
+#line 5245 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5286,7 +5252,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5309,10 +5275,10 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5313: checking for shmat" >&5
+echo "configure:5279: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 5316 "configure"
+#line 5282 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -5335,7 +5301,7 @@
; return 0; }
EOF
-if { (eval echo configure:5339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -5355,13 +5321,13 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5359: checking for shmat in -lipc" >&5
+echo "configure:5325: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5365 "configure"
+#line 5331 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5372,7 +5338,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:5376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5404,13 +5370,13 @@
# libraries we check for below, so use a different variable.
# --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:5408: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:5374: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5414 "configure"
+#line 5380 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5421,7 +5387,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5461,12 +5427,12 @@
LIBS=""
echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:5465: checking for library containing cuserid" >&5
+echo "configure:5431: checking for library containing cuserid" >&5
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_cuserid="no"
cat > conftest.$ac_ext <<EOF
-#line 5470 "configure"
+#line 5436 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5477,7 +5443,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:5481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_cuserid="none required"
else
@@ -5488,7 +5454,7 @@
test "$ac_cv_search_cuserid" = "no" && for i in compat; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5492 "configure"
+#line 5458 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5499,7 +5465,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:5503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_cuserid="-l$i"
break
@@ -5525,10 +5491,10 @@
# Note: -lxdr -liberty -lws2_32 is for MinGW
echo $ac_n "checking for xdrmem_create""... $ac_c" 1>&6
-echo "configure:5529: checking for xdrmem_create" >&5
+echo "configure:5495: checking for xdrmem_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 5532 "configure"
+#line 5498 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char xdrmem_create(); below. */
@@ -5551,7 +5517,7 @@
; return 0; }
EOF
-if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_xdrmem_create=yes"
else
@@ -5569,13 +5535,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
-echo "configure:5573: checking for xdrmem_create in -lsun" >&5
+echo "configure:5539: checking for xdrmem_create in -lsun" >&5
ac_lib_var=`echo sun'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5579 "configure"
+#line 5545 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5586,7 +5552,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5605,13 +5571,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
-echo "configure:5609: checking for xdrmem_create in -lnsl" >&5
+echo "configure:5575: checking for xdrmem_create in -lnsl" >&5
ac_lib_var=`echo nsl'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5615 "configure"
+#line 5581 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5622,7 +5588,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5641,13 +5607,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
-echo "configure:5645: checking for xdrmem_create in -lrpclib" >&5
+echo "configure:5611: checking for xdrmem_create in -lrpclib" >&5
ac_lib_var=`echo rpclib'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lrpclib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5651 "configure"
+#line 5617 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5658,7 +5624,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5677,13 +5643,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lxdr""... $ac_c" 1>&6
-echo "configure:5681: checking for xdrmem_create in -lxdr" >&5
+echo "configure:5647: checking for xdrmem_create in -lxdr" >&5
ac_lib_var=`echo xdr'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lxdr -liberty -lws2_32 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5687 "configure"
+#line 5653 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5694,7 +5660,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5728,10 +5694,10 @@
for ac_func in asprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5732: checking for $ac_func" >&5
+echo "configure:5698: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5735 "configure"
+#line 5701 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5754,7 +5720,7 @@
; return 0; }
EOF
-if { (eval echo configure:5758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -5781,10 +5747,10 @@
# Test if mathlib needs -lm flag or is included with libc
echo $ac_n "checking for atan""... $ac_c" 1>&6
-echo "configure:5785: checking for atan" >&5
+echo "configure:5751: checking for atan" >&5
cat > conftest.$ac_ext <<EOF
-#line 5788 "configure"
+#line 5754 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atan(); below. */
@@ -5807,7 +5773,7 @@
; return 0; }
EOF
-if { (eval echo configure:5811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_atan=yes"
else
@@ -5825,13 +5791,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:5829: checking for atan in -lm" >&5
+echo "configure:5795: checking for atan in -lm" >&5
ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5835 "configure"
+#line 5801 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5842,7 +5808,7 @@
atan()
; return 0; }
EOF
-if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5869,10 +5835,10 @@
echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:5873: checking for dlsym" >&5
+echo "configure:5839: checking for dlsym" >&5
cat > conftest.$ac_ext <<EOF
-#line 5876 "configure"
+#line 5842 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym(); below. */
@@ -5895,7 +5861,7 @@
; return 0; }
EOF
-if { (eval echo configure:5899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlsym=yes"
else
@@ -5913,13 +5879,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:5917: checking for dlsym in -ldl" >&5
+echo "configure:5883: checking for dlsym in -ldl" >&5
ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5923 "configure"
+#line 5889 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5930,7 +5896,7 @@
dlsym()
; return 0; }
EOF
-if { (eval echo configure:5934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5957,10 +5923,10 @@
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:5961: checking for iconv" >&5
+echo "configure:5927: checking for iconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 5964 "configure"
+#line 5930 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -5983,7 +5949,7 @@
; return 0; }
EOF
-if { (eval echo configure:5987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_iconv=yes"
else
@@ -6001,13 +5967,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:6005: checking for iconv in -liconv" >&5
+echo "configure:5971: checking for iconv in -liconv" >&5
ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6011 "configure"
+#line 5977 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6018,7 +5984,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6037,13 +6003,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6041: checking for iconv in -lgiconv" >&5
+echo "configure:6007: checking for iconv in -lgiconv" >&5
ac_lib_var=`echo giconv'_'iconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6047 "configure"
+#line 6013 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6054,7 +6020,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:6058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6073,10 +6039,10 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:6077: checking for libiconv" >&5
+echo "configure:6043: checking for libiconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 6080 "configure"
+#line 6046 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -6099,7 +6065,7 @@
; return 0; }
EOF
-if { (eval echo configure:6103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_libiconv=yes"
else
@@ -6117,13 +6083,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:6121: checking for libiconv in -liconv" >&5
+echo "configure:6087: checking for libiconv in -liconv" >&5
ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6127 "configure"
+#line 6093 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6134,7 +6100,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6153,13 +6119,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6157: checking for libiconv in -lgiconv" >&5
+echo "configure:6123: checking for libiconv in -lgiconv" >&5
ac_lib_var=`echo giconv'_'libiconv | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6163 "configure"
+#line 6129 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6170,7 +6136,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:6174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6207,10 +6173,10 @@
have_socket=1
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:6211: checking for socket" >&5
+echo "configure:6177: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 6214 "configure"
+#line 6180 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -6233,7 +6199,7 @@
; return 0; }
EOF
-if { (eval echo configure:6237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -6251,13 +6217,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6255: checking for socket in -lsocket" >&5
+echo "configure:6221: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6261 "configure"
+#line 6227 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6268,7 +6234,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:6272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6316,7 +6282,7 @@
echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:6320: checking for location of zlib includes" >&5
+echo "configure:6286: checking for location of zlib includes" >&5
case "$with_zlib_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-zlib-includes." 1>&2; exit 1; }
@@ -6342,15 +6308,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6346: checking for $ac_hdr" >&5
+echo "configure:6312: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6349 "configure"
+#line 6315 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6384,7 +6350,7 @@
echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:6388: checking for location of zlib library" >&5
+echo "configure:6354: checking for location of zlib library" >&5
case "$with_zlib_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-zlib-libs." 1>&2; exit 1; }
@@ -6409,13 +6375,13 @@
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:6413: checking for deflate in -lz" >&5
+echo "configure:6379: checking for deflate in -lz" >&5
ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6419 "configure"
+#line 6385 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6426,7 +6392,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:6430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6474,7 +6440,7 @@
echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
-echo "configure:6478: checking for location of External PROJ.4 includes" >&5
+echo "configure:6444: checking for location of External PROJ.4 includes" >&5
case "$with_proj_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-includes." 1>&2; exit 1; }
@@ -6500,15 +6466,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6504: checking for $ac_hdr" >&5
+echo "configure:6470: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6507 "configure"
+#line 6473 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6545,7 +6511,7 @@
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:6549: checking External PROJ.4 version" >&5
+echo "configure:6515: checking External PROJ.4 version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -6553,7 +6519,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6557 "configure"
+#line 6523 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6565,7 +6531,7 @@
}
EOF
-if { (eval echo configure:6569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
proj_ver=`cat conftestdata`
echo "$ac_t""$proj_ver" 1>&6
@@ -6590,7 +6556,7 @@
echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:6594: checking for location of External PROJ.4 library" >&5
+echo "configure:6560: checking for location of External PROJ.4 library" >&5
case "$with_proj_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-libs." 1>&2; exit 1; }
@@ -6615,13 +6581,13 @@
echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:6619: checking for pj_get_def in -lproj" >&5
+echo "configure:6585: checking for pj_get_def in -lproj" >&5
ac_lib_var=`echo proj'_'pj_get_def | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lproj $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6625 "configure"
+#line 6591 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6632,7 +6598,7 @@
pj_get_def()
; return 0; }
EOF
-if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6666,7 +6632,7 @@
echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
-echo "configure:6670: checking for location of External PROJ.4 data files" >&5
+echo "configure:6636: checking for location of External PROJ.4 data files" >&5
case "$with_proj_share" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-proj-share." 1>&2; exit 1; }
@@ -6690,14 +6656,14 @@
# LOC_CHECK_SHARE does not work when cross compiling
if test "$cross_compiling" = "yes" ; then
echo $ac_n "checking for epsg""... $ac_c" 1>&6
-echo "configure:6694: checking for epsg" >&5
+echo "configure:6660: checking for epsg" >&5
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
ac_safe=`echo "$PROJSHARE/epsg" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $PROJSHARE/epsg""... $ac_c" 1>&6
-echo "configure:6701: checking for $PROJSHARE/epsg" >&5
+echo "configure:6667: checking for $PROJSHARE/epsg" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
@@ -6729,7 +6695,7 @@
# Extract the first word of "nad2bin", so it can be a program name with args.
set dummy nad2bin; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6733: checking for $ac_word" >&5
+echo "configure:6699: checking for $ac_word" >&5
case "$NAD2BIN" in
/*)
@@ -6769,7 +6735,7 @@
echo $ac_n "checking whether to use regex""... $ac_c" 1>&6
-echo "configure:6773: checking whether to use regex" >&5
+echo "configure:6739: checking whether to use regex" >&5
echo "$ac_t"""$with_regex"" 1>&6
case "$with_regex" in
"no") USE_REGEX= ;;
@@ -6789,7 +6755,7 @@
echo $ac_n "checking for location of regex includes""... $ac_c" 1>&6
-echo "configure:6793: checking for location of regex includes" >&5
+echo "configure:6759: checking for location of regex includes" >&5
case "$with_regex_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-regex-includes." 1>&2; exit 1; }
@@ -6815,15 +6781,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6819: checking for $ac_hdr" >&5
+echo "configure:6785: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6822 "configure"
+#line 6788 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6857,7 +6823,7 @@
echo $ac_n "checking for location of regex library""... $ac_c" 1>&6
-echo "configure:6861: checking for location of regex library" >&5
+echo "configure:6827: checking for location of regex library" >&5
case "$with_regex_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-regex-libs." 1>&2; exit 1; }
@@ -6882,10 +6848,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:6886: checking for regcomp" >&5
+echo "configure:6852: checking for regcomp" >&5
cat > conftest.$ac_ext <<EOF
-#line 6889 "configure"
+#line 6855 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -6908,7 +6874,7 @@
; return 0; }
EOF
-if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp=yes"
else
@@ -6935,13 +6901,13 @@
echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
-echo "configure:6939: checking for regcomp in -lregex" >&5
+echo "configure:6905: checking for regcomp in -lregex" >&5
ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lregex $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6945 "configure"
+#line 6911 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6952,7 +6918,7 @@
regcomp()
; return 0; }
EOF
-if { (eval echo configure:6956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7002,7 +6968,7 @@
echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:7006: checking whether to use Readline" >&5
+echo "configure:6972: checking whether to use Readline" >&5
echo "$ac_t"""$with_readline"" 1>&6
case "$with_readline" in
"no") USE_READLINE= ;;
@@ -7023,7 +6989,7 @@
echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:7027: checking for location of Readline includes" >&5
+echo "configure:6993: checking for location of Readline includes" >&5
case "$with_readline_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-readline-includes." 1>&2; exit 1; }
@@ -7049,15 +7015,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7053: checking for $ac_hdr" >&5
+echo "configure:7019: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7056 "configure"
+#line 7022 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7093,15 +7059,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7097: checking for $ac_hdr" >&5
+echo "configure:7063: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7100 "configure"
+#line 7066 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7135,7 +7101,7 @@
echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:7139: checking for location of Readline library" >&5
+echo "configure:7105: checking for location of Readline library" >&5
case "$with_readline_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-readline-libs." 1>&2; exit 1; }
@@ -7160,13 +7126,13 @@
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:7164: checking for readline in -lreadline" >&5
+echo "configure:7130: checking for readline in -lreadline" >&5
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7170 "configure"
+#line 7136 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7177,7 +7143,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:7181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7212,13 +7178,13 @@
echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:7216: checking for add_history in -lhistory" >&5
+echo "configure:7182: checking for add_history in -lhistory" >&5
ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lhistory $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7222 "configure"
+#line 7188 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7229,7 +7195,7 @@
add_history()
; return 0; }
EOF
-if { (eval echo configure:7233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7272,7 +7238,7 @@
echo $ac_n "checking whether to use JPEG""... $ac_c" 1>&6
-echo "configure:7276: checking whether to use JPEG" >&5
+echo "configure:7242: checking whether to use JPEG" >&5
echo "$ac_t"""$with_jpeg"" 1>&6
case "$with_jpeg" in
"no") USE_JPEG= ;;
@@ -7292,7 +7258,7 @@
echo $ac_n "checking for location of JPEG includes""... $ac_c" 1>&6
-echo "configure:7296: checking for location of JPEG includes" >&5
+echo "configure:7262: checking for location of JPEG includes" >&5
case "$with_jpeg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-jpeg-includes." 1>&2; exit 1; }
@@ -7318,15 +7284,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7322: checking for $ac_hdr" >&5
+echo "configure:7288: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7325 "configure"
+#line 7291 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7360,7 +7326,7 @@
echo $ac_n "checking for location of JPEG library""... $ac_c" 1>&6
-echo "configure:7364: checking for location of JPEG library" >&5
+echo "configure:7330: checking for location of JPEG library" >&5
case "$with_jpeg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-jpeg-libs." 1>&2; exit 1; }
@@ -7387,13 +7353,13 @@
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7391: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7357: checking for jpeg_start_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7397 "configure"
+#line 7363 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7404,7 +7370,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7423,13 +7389,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7427: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7393: checking for jpeg_start_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7433 "configure"
+#line 7399 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7440,7 +7406,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:7444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7489,7 +7455,7 @@
# GDAL option
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:7493: checking whether to use GDAL" >&5
+echo "configure:7459: checking whether to use GDAL" >&5
GDAL_LIBS=
GDAL_CFLAGS=
@@ -7507,7 +7473,7 @@
# Extract the first word of "gdal-config", so it can be a program name with args.
set dummy gdal-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7511: checking for $ac_word" >&5
+echo "configure:7477: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -7562,14 +7528,14 @@
LIBS="$LIBS $GDAL_LIBS"
CFLAGS="$CFLAGS $GDAL_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 7566 "configure"
+#line 7532 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -7578,14 +7544,14 @@
LIBS="$LIBS $GDAL_DEP_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7582 "configure"
+#line 7548 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:7589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS"
else
@@ -7618,7 +7584,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:7622: checking whether to use TIFF" >&5
+echo "configure:7588: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -7638,7 +7604,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:7642: checking for location of TIFF includes" >&5
+echo "configure:7608: checking for location of TIFF includes" >&5
case "$with_tiff_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tiff-includes." 1>&2; exit 1; }
@@ -7664,15 +7630,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7668: checking for $ac_hdr" >&5
+echo "configure:7634: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7671 "configure"
+#line 7637 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7706,7 +7672,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:7710: checking for location of TIFF library" >&5
+echo "configure:7676: checking for location of TIFF library" >&5
case "$with_tiff_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tiff-libs." 1>&2; exit 1; }
@@ -7737,13 +7703,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7741: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7707: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7747 "configure"
+#line 7713 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7754,7 +7720,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7773,13 +7739,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7777: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7743: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7783 "configure"
+#line 7749 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7790,7 +7756,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7809,13 +7775,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7813: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7779: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7819 "configure"
+#line 7785 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7826,7 +7792,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7845,13 +7811,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7849: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7815: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7855 "configure"
+#line 7821 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7862,7 +7828,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7881,13 +7847,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7885: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7851: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7891 "configure"
+#line 7857 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7898,7 +7864,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7917,13 +7883,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7921: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7887: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7927 "configure"
+#line 7893 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7934,7 +7900,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7953,13 +7919,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7957: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7923: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7963 "configure"
+#line 7929 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7970,7 +7936,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7989,13 +7955,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7993: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7959: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7999 "configure"
+#line 7965 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8006,7 +7972,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8104,7 +8070,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:8108: checking whether to use PNG" >&5
+echo "configure:8074: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -8123,7 +8089,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:8127: checking for location of PNG includes" >&5
+echo "configure:8093: checking for location of PNG includes" >&5
case "$with_png_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-png-includes." 1>&2; exit 1; }
@@ -8149,15 +8115,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8153: checking for $ac_hdr" >&5
+echo "configure:8119: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8156 "configure"
+#line 8122 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8191,7 +8157,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:8195: checking for location of PNG library" >&5
+echo "configure:8161: checking for location of PNG library" >&5
case "$with_png_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-png-libs." 1>&2; exit 1; }
@@ -8216,13 +8182,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8220: checking for png_read_image in -lpng" >&5
+echo "configure:8186: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpng $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8226 "configure"
+#line 8192 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8233,7 +8199,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8275,7 +8241,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:8279: checking whether to use Tcl/Tk" >&5
+echo "configure:8245: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -8295,7 +8261,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:8299: checking for location of Tcl/Tk includes" >&5
+echo "configure:8265: checking for location of Tcl/Tk includes" >&5
case "$with_tcltk_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tcltk-includes." 1>&2; exit 1; }
@@ -8321,15 +8287,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8325: checking for $ac_hdr" >&5
+echo "configure:8291: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8328 "configure"
+#line 8294 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8366,15 +8332,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8370: checking for $ac_hdr" >&5
+echo "configure:8336: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8373 "configure"
+#line 8339 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -8408,7 +8374,7 @@
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:8412: checking Tcl version" >&5
+echo "configure:8378: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -8416,7 +8382,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8420 "configure"
+#line 8386 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8428,7 +8394,7 @@
}
EOF
-if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
tcl_ver=`cat conftestdata`
echo "$ac_t""$tcl_ver" 1>&6
@@ -8446,7 +8412,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:8450: checking Tk version" >&5
+echo "configure:8416: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -8454,7 +8420,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8458 "configure"
+#line 8424 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8466,7 +8432,7 @@
}
EOF
-if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
tk_ver=`cat conftestdata`
echo "$ac_t""$tk_ver" 1>&6
@@ -8495,7 +8461,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:8499: checking for location of Tcl/Tk library" >&5
+echo "configure:8465: checking for location of Tcl/Tk library" >&5
case "$with_tcltk_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tcltk-libs." 1>&2; exit 1; }
@@ -8525,13 +8491,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8529: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8495: checking for Tcl_Init in -ltcl" >&5
ac_lib_var=`echo tcl'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8535 "configure"
+#line 8501 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8542,7 +8508,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8561,13 +8527,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8565: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8531: checking for Tcl_Init in -ltcl" >&5
ac_lib_var=`echo tcl'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8571 "configure"
+#line 8537 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8578,7 +8544,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8605,13 +8571,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8609: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8575: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
ac_lib_var=`echo tcl$tcltk_ver'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8615 "configure"
+#line 8581 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8622,7 +8588,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8641,13 +8607,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8645: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8611: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
ac_lib_var=`echo tcl$tcltk_ver'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8651 "configure"
+#line 8617 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8658,7 +8624,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8685,13 +8651,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8689: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8655: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
ac_lib_var=`echo tcl$tcltk_ver2'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver2 $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8695 "configure"
+#line 8661 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8702,7 +8668,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8721,13 +8687,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8725: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8691: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
ac_lib_var=`echo tcl$tcltk_ver2'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver2 $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8731 "configure"
+#line 8697 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8738,7 +8704,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8816,13 +8782,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8820: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8786: checking for Tk_MainWindow in -ltk" >&5
ac_lib_var=`echo tk'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk $TCLLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8826 "configure"
+#line 8792 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8833,7 +8799,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8852,13 +8818,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8856: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8822: checking for Tk_MainWindow in -ltk" >&5
ac_lib_var=`echo tk'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8862 "configure"
+#line 8828 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8869,7 +8835,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8896,13 +8862,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8900: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:8866: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
ac_lib_var=`echo tk$tcltk_ver'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver $TCLLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8906 "configure"
+#line 8872 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8913,7 +8879,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8932,13 +8898,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8936: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:8902: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
ac_lib_var=`echo tk$tcltk_ver'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8942 "configure"
+#line 8908 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8949,7 +8915,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8976,13 +8942,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8980: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:8946: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
ac_lib_var=`echo tk$tcltk_ver2'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver2 $TCLLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8986 "configure"
+#line 8952 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8993,7 +8959,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9012,13 +8978,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:9016: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:8982: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
ac_lib_var=`echo tk$tcltk_ver2'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver2 $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9022 "configure"
+#line 8988 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9029,7 +8995,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:9033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9121,7 +9087,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:9125: checking whether to use PostgreSQL" >&5
+echo "configure:9091: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -9148,7 +9114,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:9152: checking for location of PostgreSQL includes" >&5
+echo "configure:9118: checking for location of PostgreSQL includes" >&5
case "$with_postgres_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-postgres-includes." 1>&2; exit 1; }
@@ -9174,15 +9140,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9178: checking for $ac_hdr" >&5
+echo "configure:9144: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9181 "configure"
+#line 9147 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9220,7 +9186,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:9224: checking for location of PostgreSQL library" >&5
+echo "configure:9190: checking for location of PostgreSQL library" >&5
case "$with_postgres_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-postgres-libs." 1>&2; exit 1; }
@@ -9249,13 +9215,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9253: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9219: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9259 "configure"
+#line 9225 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9266,7 +9232,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9285,13 +9251,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9289: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9255: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lssl -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9295 "configure"
+#line 9261 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9302,7 +9268,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9321,13 +9287,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9325: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9291: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9331 "configure"
+#line 9297 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9338,7 +9304,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9357,13 +9323,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9361: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9327: checking for PQsetdbLogin in -lpq" >&5
ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lcrypt -lssl -lcrypto $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9367 "configure"
+#line 9333 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9374,7 +9340,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9431,13 +9397,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9435: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9401: checking for PQcmdTuples in -lpq" >&5
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9441 "configure"
+#line 9407 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9448,7 +9414,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9470,13 +9436,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9474: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9440: checking for PQcmdTuples in -lpq" >&5
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpq -lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9480 "configure"
+#line 9446 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9487,7 +9453,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9530,7 +9496,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:9534: checking whether to use MySQL" >&5
+echo "configure:9500: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -9550,7 +9516,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:9554: checking for location of MySQL includes" >&5
+echo "configure:9520: checking for location of MySQL includes" >&5
case "$with_mysql_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-mysql-includes." 1>&2; exit 1; }
@@ -9576,15 +9542,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9580: checking for $ac_hdr" >&5
+echo "configure:9546: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9583 "configure"
+#line 9549 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9621,7 +9587,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:9625: checking for location of MySQL library" >&5
+echo "configure:9591: checking for location of MySQL library" >&5
case "$with_mysql_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-mysql-libs." 1>&2; exit 1; }
@@ -9652,13 +9618,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9656: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9622: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9662 "configure"
+#line 9628 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9669,7 +9635,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9688,13 +9654,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9692: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9658: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9698 "configure"
+#line 9664 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9705,7 +9671,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9724,13 +9690,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9728: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9694: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $SOCKLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9734 "configure"
+#line 9700 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9741,7 +9707,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9760,13 +9726,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9764: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9730: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $SOCKLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9770 "configure"
+#line 9736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9777,7 +9743,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9796,13 +9762,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9800: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9766: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9806 "configure"
+#line 9772 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9813,7 +9779,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9832,13 +9798,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9836: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9802: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9842 "configure"
+#line 9808 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9849,7 +9815,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9868,13 +9834,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9872: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9838: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $SOCKLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9878 "configure"
+#line 9844 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9885,7 +9851,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9904,13 +9870,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9908: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9874: checking for mysql_query in -lmysqlclient" >&5
ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lmysqlclient $ZLIB $SOCKLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9914 "configure"
+#line 9880 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9921,7 +9887,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10011,7 +9977,7 @@
# Extract the first word of "mysql_config", so it can be a program name with args.
set dummy mysql_config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10015: checking for $ac_word" >&5
+echo "configure:9981: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -10060,10 +10026,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:10064: checking for mysql_server_init" >&5
+echo "configure:10030: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 10067 "configure"
+#line 10033 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -10089,7 +10055,7 @@
; return 0; }
EOF
-if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_mysql_server_init=yes"
else
@@ -10141,7 +10107,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:10145: checking whether to use SQLite" >&5
+echo "configure:10111: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -10161,7 +10127,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:10165: checking for location of SQLite includes" >&5
+echo "configure:10131: checking for location of SQLite includes" >&5
case "$with_sqlite_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-sqlite-includes." 1>&2; exit 1; }
@@ -10187,15 +10153,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10191: checking for $ac_hdr" >&5
+echo "configure:10157: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10194 "configure"
+#line 10160 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10238,7 +10204,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:10242: checking for location of SQLite library" >&5
+echo "configure:10208: checking for location of SQLite library" >&5
case "$with_sqlite_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-sqlite-libs." 1>&2; exit 1; }
@@ -10265,13 +10231,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10269: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10235: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10275 "configure"
+#line 10241 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10282,7 +10248,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10301,13 +10267,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10305: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10271: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10311 "configure"
+#line 10277 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10318,7 +10284,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10371,7 +10337,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10375: checking whether to use FFMPEG" >&5
+echo "configure:10341: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -10391,7 +10357,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10395: checking for location of FFMPEG includes" >&5
+echo "configure:10361: checking for location of FFMPEG includes" >&5
case "$with_ffmpeg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-ffmpeg-includes." 1>&2; exit 1; }
@@ -10417,15 +10383,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10421: checking for $ac_hdr" >&5
+echo "configure:10387: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10424 "configure"
+#line 10390 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10461,15 +10427,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10465: checking for $ac_hdr" >&5
+echo "configure:10431: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10468 "configure"
+#line 10434 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10505,15 +10471,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10509: checking for $ac_hdr" >&5
+echo "configure:10475: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10512 "configure"
+#line 10478 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10556,7 +10522,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10560: checking for location of FFMPEG library" >&5
+echo "configure:10526: checking for location of FFMPEG library" >&5
case "$with_ffmpeg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-ffmpeg-libs." 1>&2; exit 1; }
@@ -10583,13 +10549,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10587: checking for av_free in -lavutil" >&5
+echo "configure:10553: checking for av_free in -lavutil" >&5
ac_lib_var=`echo avutil'_'av_free | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10593 "configure"
+#line 10559 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10600,7 +10566,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10619,13 +10585,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10623: checking for av_free in -lavutil" >&5
+echo "configure:10589: checking for av_free in -lavutil" >&5
ac_lib_var=`echo avutil'_'av_free | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavutil $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10629 "configure"
+#line 10595 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10636,7 +10602,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10681,13 +10647,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10685: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10651: checking for avcodec_init in -lavcodec" >&5
ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavcodec $FFMPEGLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10691 "configure"
+#line 10657 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10698,7 +10664,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10717,13 +10683,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10721: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10687: checking for avcodec_init in -lavcodec" >&5
ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavcodec $FFMPEGLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10727 "configure"
+#line 10693 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10734,7 +10700,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10779,13 +10745,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10783: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10749: checking for av_set_parameters in -lavformat" >&5
ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavformat $FFMPEGLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10789 "configure"
+#line 10755 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10796,7 +10762,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10815,13 +10781,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10819: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10785: checking for av_set_parameters in -lavformat" >&5
ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10825 "configure"
+#line 10791 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10832,7 +10798,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10892,7 +10858,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:10896: checking whether to use OpenGL" >&5
+echo "configure:10862: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -10926,7 +10892,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10930: checking for location of OpenGL includes" >&5
+echo "configure:10896: checking for location of OpenGL includes" >&5
case "$with_opengl_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-includes." 1>&2; exit 1; }
@@ -10952,15 +10918,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10956: checking for $ac_hdr" >&5
+echo "configure:10922: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10959 "configure"
+#line 10925 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -10994,7 +10960,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10998: checking for location of OpenGL library" >&5
+echo "configure:10964: checking for location of OpenGL library" >&5
case "$with_opengl_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-libs." 1>&2; exit 1; }
@@ -11023,13 +10989,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11027: checking for glBegin in -lGL" >&5
+echo "configure:10993: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11033 "configure"
+#line 10999 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11040,7 +11006,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11059,13 +11025,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11063: checking for glBegin in -lGL" >&5
+echo "configure:11029: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11069 "configure"
+#line 11035 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11076,7 +11042,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11095,13 +11061,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11099: checking for glBegin in -lGL" >&5
+echo "configure:11065: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11105 "configure"
+#line 11071 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11112,7 +11078,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11131,13 +11097,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11135: checking for glBegin in -lGL" >&5
+echo "configure:11101: checking for glBegin in -lGL" >&5
ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lpthread -lXext $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11141 "configure"
+#line 11107 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11148,7 +11114,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11210,13 +11176,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11214: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11180: checking for gluBeginCurve in -lGLU" >&5
ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11220 "configure"
+#line 11186 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11227,7 +11193,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11246,13 +11212,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11250: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11216: checking for gluBeginCurve in -lGLU" >&5
ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lstdc++ $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11256 "configure"
+#line 11222 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11263,7 +11229,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11310,10 +11276,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:11314: checking for glXCreatePbuffer" >&5
+echo "configure:11280: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 11317 "configure"
+#line 11283 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -11336,7 +11302,7 @@
; return 0; }
EOF
-if { (eval echo configure:11340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_glXCreatePbuffer=yes"
else
@@ -11373,10 +11339,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11377: checking for glXCreateGLXPixmap" >&5
+echo "configure:11343: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 11380 "configure"
+#line 11346 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -11399,7 +11365,7 @@
; return 0; }
EOF
-if { (eval echo configure:11403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_glXCreateGLXPixmap=yes"
else
@@ -11442,7 +11408,7 @@
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:11446: checking for location of OpenGL framework" >&5
+echo "configure:11412: checking for location of OpenGL framework" >&5
case "$with_opengl_framework" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-framework." 1>&2; exit 1; }
@@ -11466,15 +11432,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11470: checking for $ac_hdr" >&5
+echo "configure:11436: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11473 "configure"
+#line 11439 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11510,10 +11476,10 @@
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11514: checking for glBegin" >&5
+echo "configure:11480: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 11517 "configure"
+#line 11483 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -11536,7 +11502,7 @@
; return 0; }
EOF
-if { (eval echo configure:11540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_glBegin=yes"
else
@@ -11573,10 +11539,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11577: checking for gluBeginCurve" >&5
+echo "configure:11543: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 11580 "configure"
+#line 11546 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -11599,7 +11565,7 @@
; return 0; }
EOF
-if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gluBeginCurve=yes"
else
@@ -11647,7 +11613,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11651: checking for location of OpenGL includes" >&5
+echo "configure:11617: checking for location of OpenGL includes" >&5
case "$with_opengl_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-includes." 1>&2; exit 1; }
@@ -11673,15 +11639,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11677: checking for $ac_hdr" >&5
+echo "configure:11643: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11680 "configure"
+#line 11646 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11715,7 +11681,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11719: checking for location of OpenGL library" >&5
+echo "configure:11685: checking for location of OpenGL library" >&5
case "$with_opengl_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-libs." 1>&2; exit 1; }
@@ -11740,18 +11706,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11744: checking for OpenGL library" >&5
+echo "configure:11710: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 11748 "configure"
+#line 11714 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:11755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11775,18 +11741,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11779: checking for GLU library" >&5
+echo "configure:11745: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 11783 "configure"
+#line 11749 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:11790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11835,7 +11801,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11839: checking whether to use ODBC" >&5
+echo "configure:11805: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -11854,7 +11820,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11858: checking for location of ODBC includes" >&5
+echo "configure:11824: checking for location of ODBC includes" >&5
case "$with_odbc_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-odbc-includes." 1>&2; exit 1; }
@@ -11880,15 +11846,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11884: checking for $ac_hdr" >&5
+echo "configure:11850: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11887 "configure"
+#line 11853 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11922,7 +11888,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:11926: checking for location of ODBC library" >&5
+echo "configure:11892: checking for location of ODBC library" >&5
case "$with_odbc_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-odbc-libs." 1>&2; exit 1; }
@@ -11947,13 +11913,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:11951: checking for SQLConnect in -lodbc" >&5
+echo "configure:11917: checking for SQLConnect in -lodbc" >&5
ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lodbc $ICONVLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11957 "configure"
+#line 11923 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11964,7 +11930,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11989,13 +11955,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:11993: checking for SQLConnect in -liodbc" >&5
+echo "configure:11959: checking for SQLConnect in -liodbc" >&5
ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-liodbc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11999 "configure"
+#line 11965 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12006,7 +11972,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12031,11 +11997,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:12035: checking for ODBC library" >&5
+echo "configure:12001: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 12039 "configure"
+#line 12005 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -12043,7 +12009,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:12047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -12092,7 +12058,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:12096: checking whether to use FFTW" >&5
+echo "configure:12062: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -12111,7 +12077,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:12115: checking for location of FFTW includes" >&5
+echo "configure:12081: checking for location of FFTW includes" >&5
case "$with_fftw_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-fftw-includes." 1>&2; exit 1; }
@@ -12137,15 +12103,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12141: checking for $ac_hdr" >&5
+echo "configure:12107: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12144 "configure"
+#line 12110 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12173,15 +12139,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12177: checking for $ac_hdr" >&5
+echo "configure:12143: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12180 "configure"
+#line 12146 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12209,15 +12175,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12213: checking for $ac_hdr" >&5
+echo "configure:12179: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12216 "configure"
+#line 12182 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12263,7 +12229,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:12267: checking for location of FFTW library" >&5
+echo "configure:12233: checking for location of FFTW library" >&5
case "$with_fftw_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-fftw-libs." 1>&2; exit 1; }
@@ -12288,13 +12254,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:12292: checking for fftw_execute in -lfftw3" >&5
+echo "configure:12258: checking for fftw_execute in -lfftw3" >&5
ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfftw3 $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12298 "configure"
+#line 12264 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12305,7 +12271,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:12309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12330,13 +12296,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:12334: checking for fftwnd_one in -lfftw" >&5
+echo "configure:12300: checking for fftwnd_one in -lfftw" >&5
ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfftw $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12340 "configure"
+#line 12306 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12347,7 +12313,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12372,13 +12338,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:12376: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:12342: checking for fftwnd_one in -ldfftw" >&5
ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldfftw $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12382 "configure"
+#line 12348 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12389,7 +12355,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12446,7 +12412,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:12450: checking whether to use BLAS" >&5
+echo "configure:12416: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -12467,7 +12433,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:12471: checking for location of BLAS includes" >&5
+echo "configure:12437: checking for location of BLAS includes" >&5
case "$with_blas_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-blas-includes." 1>&2; exit 1; }
@@ -12487,7 +12453,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:12491: checking for location of BLAS library" >&5
+echo "configure:12457: checking for location of BLAS library" >&5
case "$with_blas_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-blas-libs." 1>&2; exit 1; }
@@ -12513,15 +12479,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12517: checking for $ac_hdr" >&5
+echo "configure:12483: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12520 "configure"
+#line 12486 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -12556,13 +12522,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12560: checking for dnrm2_ in -lblas" >&5
+echo "configure:12526: checking for dnrm2_ in -lblas" >&5
ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12566 "configure"
+#line 12532 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12573,7 +12539,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12592,13 +12558,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12596: checking for dnrm2_ in -lblas" >&5
+echo "configure:12562: checking for dnrm2_ in -lblas" >&5
ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $MATHLIB -lg2c $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12602 "configure"
+#line 12568 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12609,7 +12575,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12653,13 +12619,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:12657: checking for ATL_xerbla in -latlas" >&5
+echo "configure:12623: checking for ATL_xerbla in -latlas" >&5
ac_lib_var=`echo atlas'_'ATL_xerbla | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-latlas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12663 "configure"
+#line 12629 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12670,7 +12636,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:12674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12685,13 +12651,13 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sgemm_ in -lf77blas""... $ac_c" 1>&6
-echo "configure:12689: checking for sgemm_ in -lf77blas" >&5
+echo "configure:12655: checking for sgemm_ in -lf77blas" >&5
ac_lib_var=`echo f77blas'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lf77blas -latlas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12695 "configure"
+#line 12661 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12702,7 +12668,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12717,13 +12683,13 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for cblas_dgemm in -lcblas""... $ac_c" 1>&6
-echo "configure:12721: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12687: checking for cblas_dgemm in -lcblas" >&5
ac_lib_var=`echo cblas'_'cblas_dgemm | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lcblas -lf77blas -latlas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12727 "configure"
+#line 12693 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12734,7 +12700,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:12738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12779,16 +12745,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12783: checking for sgemm in $vlib_flags" >&5
+echo "configure:12749: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 12785 "configure"
+#line 12751 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:12792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
blas_ok=yes; BLASLIB="$vlib_flags"
else
@@ -12806,13 +12772,13 @@
# BLAS in PhiPACK libraries? (requires generic BLAS, too)
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:12810: checking for sgemm_ in -lblas" >&5
+echo "configure:12776: checking for sgemm_ in -lblas" >&5
ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12816 "configure"
+#line 12782 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12823,7 +12789,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12838,13 +12804,13 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dgemm_ in -ldgemm""... $ac_c" 1>&6
-echo "configure:12842: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12808: checking for dgemm_ in -ldgemm" >&5
ac_lib_var=`echo dgemm'_'dgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ldgemm -lblas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12848 "configure"
+#line 12814 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12855,7 +12821,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:12859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12870,13 +12836,13 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sgemm_ in -lsgemm""... $ac_c" 1>&6
-echo "configure:12874: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12840: checking for sgemm_ in -lsgemm" >&5
ac_lib_var=`echo sgemm'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsgemm -lblas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12880 "configure"
+#line 12846 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12887,7 +12853,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12921,13 +12887,13 @@
if test $blas_ok = no; then
if test "x$GCC" != xyes; then # only works with Sun CC
echo $ac_n "checking for acosp in -lsunmath""... $ac_c" 1>&6
-echo "configure:12925: checking for acosp in -lsunmath" >&5
+echo "configure:12891: checking for acosp in -lsunmath" >&5
ac_lib_var=`echo sunmath'_'acosp | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsunmath $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12931 "configure"
+#line 12897 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12938,7 +12904,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:12942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12953,13 +12919,13 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sgemm_ in -lsunperf""... $ac_c" 1>&6
-echo "configure:12957: checking for sgemm_ in -lsunperf" >&5
+echo "configure:12923: checking for sgemm_ in -lsunperf" >&5
ac_lib_var=`echo sunperf'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsunperf -lsunmath $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12963 "configure"
+#line 12929 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12970,7 +12936,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13000,13 +12966,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:13004: checking for sgemm_ in -lblas" >&5
+echo "configure:12970: checking for sgemm_ in -lblas" >&5
ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lblas $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13010 "configure"
+#line 12976 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13017,7 +12983,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13056,7 +13022,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:13060: checking whether to use LAPACK" >&5
+echo "configure:13026: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -13081,7 +13047,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:13085: checking for location of LAPACK includes" >&5
+echo "configure:13051: checking for location of LAPACK includes" >&5
case "$with_lapack_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-lapack-includes." 1>&2; exit 1; }
@@ -13101,7 +13067,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:13105: checking for location of LAPACK library" >&5
+echo "configure:13071: checking for location of LAPACK library" >&5
case "$with_lapack_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-lapack-libs." 1>&2; exit 1; }
@@ -13127,15 +13093,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13131: checking for $ac_hdr" >&5
+echo "configure:13097: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13134 "configure"
+#line 13100 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13167,10 +13133,10 @@
save_LIBS="$LIBS"; LIBS="$LIBS $BLASLIB $MATHLIB $FLIBS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS"
echo $ac_n "checking for dsegv_""... $ac_c" 1>&6
-echo "configure:13171: checking for dsegv_" >&5
+echo "configure:13137: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 13174 "configure"
+#line 13140 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -13193,7 +13159,7 @@
; return 0; }
EOF
-if { (eval echo configure:13197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dsegv_=yes"
else
@@ -13220,13 +13186,13 @@
save_libs="$LIBS"; LIBS="$BLASLIB $MATHLIB $LIBS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS"
echo $ac_n "checking for desgv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13224: checking for desgv_ in -llapack" >&5
+echo "configure:13190: checking for desgv_ in -llapack" >&5
ac_lib_var=`echo lapack'_'desgv_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-llapack $FLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13230 "configure"
+#line 13196 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13237,7 +13203,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:13241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13269,13 +13235,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13273: checking for dgesv_ in -llapack" >&5
+echo "configure:13239: checking for dgesv_ in -llapack" >&5
ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-llapack $BLASLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13279 "configure"
+#line 13245 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13286,7 +13252,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:13290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13305,13 +13271,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13309: checking for dgesv_ in -llapack" >&5
+echo "configure:13275: checking for dgesv_ in -llapack" >&5
ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-llapack $BLASLIB $MATHLIB -lg2c $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13315 "configure"
+#line 13281 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13322,7 +13288,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:13326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13374,181 +13340,11 @@
# Done checking LAPACK
-# Enable Motif option
-
-
-echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:13382: checking whether to use Motif" >&5
-echo "$ac_t"""$with_motif"" 1>&6
-case "$with_motif" in
- "no") USE_MOTIF= ;;
- "yes") USE_MOTIF="1" ;;
- *) { echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; } ;;
-esac
-
-
-
-XMINC=
-XMLIB=
-
-if test -n "$USE_MOTIF"; then
-
-# With Motif includes directory
-
-
-echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:13401: checking for location of Motif includes" >&5
-case "$with_motif_includes" in
-y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-motif-includes." 1>&2; exit 1; }
- ;;
-esac
-echo "$ac_t""$with_motif_includes" 1>&6
-
-if test -n "$with_motif_includes" ; then
- for dir in $with_motif_includes; do
- if test -d "$dir"; then
- XMINC="$XMINC -I$dir"
- else
- { echo "configure: error: *** Motif includes directory $dir does not exist." 1>&2; exit 1; }
- fi
- done
-fi
-
-
-
-ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$XMINC $X_CFLAGS $CPPFLAGS"
-for ac_hdr in Xm/Xm.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13427: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13430 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-{ echo "configure: error: *** Unable to locate Motif includes." 1>&2; exit 1; }
-
-fi
-done
-
-CPPFLAGS=$ac_save_cppflags
-
-
-# With Motif library directory
-
-
-echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:13469: checking for location of Motif library" >&5
-case "$with_motif_libs" in
-y | ye | yes | n | no)
- { echo "configure: error: *** You must supply a directory to --with-motif-libs." 1>&2; exit 1; }
- ;;
-esac
-echo "$ac_t""$with_motif_libs" 1>&6
-
-if test -n "$with_motif_libs"; then
- for dir in $with_motif_libs; do
- if test -d "$dir"; then
- XMLIB="$XMLIB -L$dir"
- else
- { echo "configure: error: *** Motif library directory $dir does not exist." 1>&2; exit 1; }
- fi
- done
-fi
-
-
-
-ac_save_ldflags="$LDFLAGS"
-LDFLAGS="$XMLIB $LDFLAGS"
-
-
-echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:13494: checking for XmStringCreate in -lXm" >&5
-ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lXm $X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 13500 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char XmStringCreate();
-
-int main() {
-XmStringCreate()
-; return 0; }
-EOF
-if { (eval echo configure:13511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- XMLIB="$XMLIB -lXm "
-else
- echo "$ac_t""no" 1>&6
-
-LDFLAGS=${ac_save_ldflags}
-
- { echo "configure: error: *** Unable to locate Motif library." 1>&2; exit 1; }
-
-
-fi
-
-
-
-LDFLAGS=${ac_save_ldflags}
-
-
-fi # $USE_MOTIF
-
-
-
-
-# Done checking Motif
-
# Enable Cairo display driver option
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:13552: checking whether to use Cairo" >&5
+echo "configure:13348: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -13569,7 +13365,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:13573: checking for location of cairo includes" >&5
+echo "configure:13369: checking for location of cairo includes" >&5
case "$with_cairo_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-includes." 1>&2; exit 1; }
@@ -13595,15 +13391,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13599: checking for $ac_hdr" >&5
+echo "configure:13395: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13602 "configure"
+#line 13398 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13639,7 +13435,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:13643: checking for location of cairo library" >&5
+echo "configure:13439: checking for location of cairo library" >&5
case "$with_cairo_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-libs." 1>&2; exit 1; }
@@ -13659,7 +13455,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:13663: checking for cairo linking flags" >&5
+echo "configure:13459: checking for cairo linking flags" >&5
case "$with_cairo_ldflags" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-ldflags." 1>&2; exit 1; }
@@ -13675,10 +13471,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:13679: checking for cairo_create" >&5
+echo "configure:13475: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 13682 "configure"
+#line 13478 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -13701,7 +13497,7 @@
; return 0; }
EOF
-if { (eval echo configure:13705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_create=yes"
else
@@ -13744,7 +13540,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:13748: checking whether to use FreeType" >&5
+echo "configure:13544: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -13763,7 +13559,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:13767: checking for location of FreeType includes" >&5
+echo "configure:13563: checking for location of FreeType includes" >&5
case "$with_freetype_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-freetype-includes." 1>&2; exit 1; }
@@ -13789,15 +13585,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13793: checking for $ac_hdr" >&5
+echo "configure:13589: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13796 "configure"
+#line 13592 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -13831,7 +13627,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:13835: checking for location of FreeType library" >&5
+echo "configure:13631: checking for location of FreeType library" >&5
case "$with_freetype_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-freetype-libs." 1>&2; exit 1; }
@@ -13856,13 +13652,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:13860: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:13656: checking for FT_Init_FreeType in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13866 "configure"
+#line 13662 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13873,7 +13669,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:13877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13914,7 +13710,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:13918: checking whether to use NLS" >&5
+echo "configure:13714: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -13934,10 +13730,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:13938: checking for gettext" >&5
+echo "configure:13734: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 13941 "configure"
+#line 13737 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -13960,7 +13756,7 @@
; return 0; }
EOF
-if { (eval echo configure:13964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gettext=yes"
else
@@ -13978,13 +13774,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:13982: checking for gettext in -lintl" >&5
+echo "configure:13778: checking for gettext in -lintl" >&5
ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13988 "configure"
+#line 13784 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13995,7 +13791,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:13999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14030,7 +13826,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:14034: checking whether to use C++" >&5
+echo "configure:13830: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -14046,7 +13842,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14050: checking for $ac_word" >&5
+echo "configure:13846: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -14075,7 +13871,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:14079: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:13875: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -14086,12 +13882,12 @@
cat > conftest.$ac_ext << EOF
-#line 14090 "configure"
+#line 13886 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:14095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -14117,19 +13913,19 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:14121: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:13917: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:14126: checking whether we are using GNU C++" >&5
+echo "configure:13922: checking whether we are using GNU C++" >&5
cat > conftest.C <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:14133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:13929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -14147,7 +13943,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:14151: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:13947: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -14188,7 +13984,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:14192: checking whether to use openDWG" >&5
+echo "configure:13988: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -14208,7 +14004,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:14212: checking for location of openDGW includes" >&5
+echo "configure:14008: checking for location of openDGW includes" >&5
case "$with_opendwg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opendwg-includes." 1>&2; exit 1; }
@@ -14234,15 +14030,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14238: checking for $ac_hdr" >&5
+echo "configure:14034: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14241 "configure"
+#line 14037 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14276,7 +14072,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:14280: checking for location of openDWG library" >&5
+echo "configure:14076: checking for location of openDWG library" >&5
case "$with_opendwg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opendwg-libs." 1>&2; exit 1; }
@@ -14323,7 +14119,7 @@
if test "$enable_largefile" = yes; then
echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:14327: checking for special C compiler options needed for large files" >&5
+echo "configure:14123: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -14331,7 +14127,7 @@
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
cat > conftest.$ac_ext <<EOF
-#line 14335 "configure"
+#line 14131 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14347,7 +14143,7 @@
; return 0; }
EOF
-if { (eval echo configure:14351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -14356,7 +14152,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 14360 "configure"
+#line 14156 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14372,7 +14168,7 @@
; return 0; }
EOF
-if { (eval echo configure:14376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -14392,11 +14188,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:14396: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:14192: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 14400 "configure"
+#line 14196 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14412,14 +14208,14 @@
; return 0; }
EOF
-if { (eval echo configure:14416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14423 "configure"
+#line 14219 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -14437,7 +14233,7 @@
; return 0; }
EOF
-if { (eval echo configure:14441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -14456,11 +14252,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:14460: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:14256: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 14464 "configure"
+#line 14260 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14476,14 +14272,14 @@
; return 0; }
EOF
-if { (eval echo configure:14480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14487 "configure"
+#line 14283 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -14501,7 +14297,7 @@
; return 0; }
EOF
-if { (eval echo configure:14505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -14520,25 +14316,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:14524: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14320: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 14528 "configure"
+#line 14324 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14542 "configure"
+#line 14338 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -14547,7 +14343,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14568,10 +14364,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:14572: checking if system supports Large Files at all" >&5
+echo "configure:14368: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 14575 "configure"
+#line 14371 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -14603,7 +14399,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:14607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -14632,7 +14428,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:14636: checking whether to use Python" >&5
+echo "configure:14432: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -14652,7 +14448,7 @@
# Extract the first word of "python-config", so it can be a program name with args.
set dummy python-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14656: checking for $ac_word" >&5
+echo "configure:14452: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -14697,15 +14493,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14701: checking for $ac_hdr" >&5
+echo "configure:14497: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14704 "configure"
+#line 14500 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14745,7 +14541,7 @@
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14749: checking for $ac_word" >&5
+echo "configure:14545: checking for $ac_word" >&5
case "$SWIG" in
/*)
@@ -14791,7 +14587,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:14795: checking whether to use wxWidgets" >&5
+echo "configure:14591: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -14811,7 +14607,7 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14815: checking for $ac_word" >&5
+echo "configure:14611: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -14859,7 +14655,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:14863: checking wxWidgets version" >&5
+echo "configure:14659: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -14882,15 +14678,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14886: checking for $ac_hdr" >&5
+echo "configure:14682: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14889 "configure"
+#line 14685 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14926,15 +14722,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14930: checking for $ac_hdr" >&5
+echo "configure:14726: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14933 "configure"
+#line 14729 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -15219,8 +15015,6 @@
s%@BLASINC@%$BLASINC%g
s%@LAPACKLIB@%$LAPACKLIB%g
s%@LAPACKINC@%$LAPACKINC%g
-s%@XMINC@%$XMINC%g
-s%@XMLIB@%$XMLIB%g
s%@CAIROINC@%$CAIROINC%g
s%@CAIROLIB@%$CAIROLIB%g
s%@USE_CAIRO@%$USE_CAIRO%g
@@ -15551,8 +15345,6 @@
echo " Large File support (LFS): `if test -n "${USE_LARGEFILES}" ; then echo yes ; else echo no ; fi`"
-echo " Motif support: `if test -n "${USE_MOTIF}" ; then echo yes ; else echo no ; fi`"
-
echo " MySQL support: `if test -n "${USE_MYSQL}" ; then echo yes ; else echo no ; fi`"
echo " NLS support: `if test -n "${USE_NLS}" ; then echo yes ; else echo no ; fi`"
Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/configure.in 2008-11-17 18:28:51 UTC (rev 34342)
@@ -189,7 +189,6 @@
LOC_ARG_WITH(fftw, FFTW)
LOC_ARG_WITH(blas, BLAS, no)
LOC_ARG_WITH(lapack, LAPACK, no)
-LOC_ARG_WITH(motif, Motif, no)
LOC_ARG_WITH(cairo, Cairo, no)
LOC_ARG_WITH(freetype, FreeType, no)
LOC_ARG_WITH(nls, NLS, no)
@@ -261,9 +260,6 @@
LOC_ARG_WITH_INC(lapack, LAPACK)
LOC_ARG_WITH_LIB(lapack, LAPACK)
-LOC_ARG_WITH_INC(motif, Motif)
-LOC_ARG_WITH_LIB(motif, Motif)
-
LOC_ARG_WITH_INC(cairo, cairo)
LOC_ARG_WITH_LIB(cairo, cairo)
LOC_ARG_WITH_LDFLAGS(cairo, cairo)
@@ -1383,34 +1379,6 @@
# Done checking LAPACK
-# Enable Motif option
-
-LOC_CHECK_USE(motif,Motif,USE_MOTIF)
-
-XMINC=
-XMLIB=
-
-if test -n "$USE_MOTIF"; then
-
-# With Motif includes directory
-
-LOC_CHECK_INC_PATH(motif,Motif,XMINC)
-
-LOC_CHECK_INCLUDES(Xm/Xm.h,Motif,$XMINC $X_CFLAGS)
-
-# With Motif library directory
-
-LOC_CHECK_LIB_PATH(motif,Motif,XMLIB)
-
-LOC_CHECK_LIBS(Xm,XmStringCreate,Motif,$XMLIB,XMLIB,$X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS,,)
-
-fi # $USE_MOTIF
-
-AC_SUBST(XMINC)
-AC_SUBST(XMLIB)
-
-# Done checking Motif
-
# Enable Cairo display driver option
LOC_CHECK_USE(cairo,Cairo,USE_CAIRO)
@@ -1737,7 +1705,6 @@
LOC_MSG_USE(JPEG support,USE_JPEG)
LOC_MSG_USE(LAPACK support,USE_LAPACK)
LOC_MSG_USE(Large File support (LFS), USE_LARGEFILES)
-LOC_MSG_USE(Motif support,USE_MOTIF)
LOC_MSG_USE(MySQL support,USE_MYSQL)
LOC_MSG_USE(NLS support,USE_NLS)
LOC_MSG_USE(ODBC support,USE_ODBC)
Modified: grass/trunk/include/Make/Platform.make.in
===================================================================
--- grass/trunk/include/Make/Platform.make.in 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/include/Make/Platform.make.in 2008-11-17 18:28:51 UTC (rev 34342)
@@ -92,11 +92,8 @@
DLLIB = @DLLIB@
XCFLAGS = @X_CFLAGS@
-XMINC = @XMINC@
XLIBPATH = @X_LIBS@
XLIB = @X_PRE_LIBS@ @XLIB@
-XTLIB = @XTLIB@
-XMLIB = @XMLIB@
XEXTRALIBS = @X_EXTRA_LIBS@
USE_X11 = @USE_X11@
Deleted: grass/trunk/visualization/xganim/Clr_table.c
===================================================================
--- grass/trunk/visualization/xganim/Clr_table.c 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/visualization/xganim/Clr_table.c 2008-11-17 18:28:51 UTC (rev 34342)
@@ -1,323 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <grass/gis.h>
-#include <grass/glocale.h>
-#include <grass/colors.h>
-#include "local_proto.h"
-
-Display *dpy;
-Window grwin;
-int scrn;
-Colormap fixedcmap;
-
-static int NCOLORS;
-static unsigned long *xpixels;
-
-static int Red[256], Grn[256], Blu[256];
-static int Gray[256];
-
-static int r_pos, g_pos, b_pos;
-static int r_size, g_size, b_size;
-static int r_scale, g_scale, b_scale;
-
-
-static void get_shifts(unsigned long mask, int *pos, int *size, int *scale)
-{
- int i, j;
-
- for (i = 0; (mask & 1) == 0; i++)
- mask >>= 1;
- if (pos)
- *pos = i;
-
- for (j = i; (mask & 1) != 0; j++)
- mask >>= 1;
- if (size)
- *size = j - i;
- if (scale)
- *scale = 8 - (j - i);
-}
-
-static int get_rgb_shifts(void)
-{
- get_shifts(use_visual->red_mask, &r_pos, &r_size, &r_scale);
- get_shifts(use_visual->green_mask, &g_pos, &g_size, &g_scale);
- get_shifts(use_visual->blue_mask, &b_pos, &b_size, &b_scale);
-
- return (1 << r_size) * (1 << g_size) * (1 << b_size);
-}
-
-static unsigned long
-find_color_gray(unsigned int r, unsigned int g, unsigned int b)
-{
- unsigned int y = (r + g + b) / 3;
-
- return xpixels[Gray[y]];
-}
-
-static unsigned long
-find_color_indexed(unsigned int r, unsigned int g, unsigned int b)
-{
- return xpixels[Red[r] + Grn[g] + Blu[b]];
-}
-
-static unsigned long
-find_color_rgb(unsigned int r, unsigned int g, unsigned int b)
-{
- unsigned int rr = r >> r_scale;
- unsigned int gg = g >> g_scale;
- unsigned int bb = b >> b_scale;
-
- return (rr << r_pos) + (gg << g_pos) + (bb << b_pos);
-}
-
-unsigned long find_color(unsigned int r, unsigned int g, unsigned int b)
-{
-
- switch (use_visual->class) {
- case StaticGray:
- case GrayScale:
- return find_color_gray(r, g, b);
- case StaticColor:
- case PseudoColor:
- return find_color_indexed(r, g, b);
- case TrueColor:
- case DirectColor:
- return find_color_rgb(r, g, b);
- default:
- G_fatal_error(_("Unknown visual class [%d]."), use_visual->class);
- return 0;
- }
-}
-
-static void get_max_levels(int n_colors, int *rr, int *gg, int *bb)
-{
- int r, g, b, i;
-
- for (i = 0; i * i * i < n_colors; i++) ;
-
- for (r = g = b = i;;) {
- if (r * g * b <= n_colors)
- break;
- b--;
- if (r * g * b <= n_colors)
- break;
- r--;
- if (r * g * b <= n_colors)
- break;
- g--;
- }
-
- *rr = r;
- *gg = g;
- *bb = b;
-}
-
-static int get_fewer_levels(int *rr, int *gg, int *bb)
-{
- int r = *rr;
- int g = *gg;
- int b = *bb;
-
- /* 888 -> 887 -> 787 -> 777 -> ... */
-
- if (r > b) /* 887 -> 787 */
- r--;
- else if (g > b) /* 787 -> 777 */
- g--;
- else /* 888 -> 888 */
- b--;
-
- *rr = r;
- *gg = g;
- *bb = b;
-
- return r >= 2 && g >= 2 && b >= 2;
-}
-
-static int try_get_colors(Colormap cmap, int nr, int ng, int nb)
-{
- XColor xcolor;
- int n_pixels;
- int r, g, b;
-
- xpixels = (unsigned long *)G_realloc(xpixels,
- nr * ng * nb *
- sizeof(unsigned long));
- n_pixels = 0;
-
- xcolor.flags = DoRed | DoGreen | DoBlue;
-
- for (r = 0; r < nr; r++) {
- for (g = 0; g < ng; g++) {
- for (b = 0; b < nb; b++) {
- xcolor.red = (unsigned short)(r * 0xFFFF / (nr - 1));
- xcolor.green = (unsigned short)(g * 0xFFFF / (ng - 1));
- xcolor.blue = (unsigned short)(b * 0xFFFF / (nb - 1));
- if (!XAllocColor(dpy, cmap, &xcolor)) {
- XFreeColors(dpy, cmap, xpixels, n_pixels,
- (unsigned long)0);
- return 0;
- }
-
- xpixels[n_pixels++] = xcolor.pixel;
- }
- }
- }
-
- return 1;
-}
-
-static int try_get_grays(Colormap cmap, int ny)
-{
- XColor xcolor;
- int n_pixels;
- int y;
-
- xpixels = (unsigned long *)G_realloc(xpixels, ny * sizeof(unsigned long));
- n_pixels = 0;
-
- xcolor.flags = DoRed | DoGreen | DoBlue;
-
- for (y = 0; y < ny; y++) {
- unsigned short v = (unsigned short)(y * 0xFFFF / (ny - 1));
-
- xcolor.red = v;
- xcolor.green = v;
- xcolor.blue = v;
-
- if (!XAllocColor(dpy, cmap, &xcolor)) {
- XFreeColors(dpy, cmap, xpixels, n_pixels, (unsigned long)0);
- return y;
- }
-
- xpixels[n_pixels++] = xcolor.pixel;
- }
-
- return ny;
-}
-
-static Colormap ramp_colormap(void)
-{
- int n_colors = use_visual->map_entries;
- Colormap cmap = XCreateColormap(dpy, RootWindow(dpy, scrn),
- use_visual, AllocAll);
- int i;
-
- for (i = 0; i < n_colors; i++) {
- unsigned int k = i * 65535 / (n_colors - 1);
- unsigned int l = i * 255 / (n_colors - 1);
- XColor xcolor;
-
- xcolor.flags = DoRed | DoGreen | DoBlue;
- xcolor.blue = k;
- xcolor.green = k;
- xcolor.red = k;
- xcolor.pixel = find_color_rgb(l, l, l);
-
- XStoreColor(dpy, cmap, &xcolor);
- }
-
- return cmap;
-}
-
-Colormap InitColorTableFixed(Colormap cmap)
-{
- int n_colors = use_visual->map_entries;
- int r, g, b, y, i;
-
- switch (use_visual->class) {
- case StaticGray:
- case GrayScale:
- /* determine how many levels of gray we can actually get */
- y = try_get_grays(cmap, n_colors);
- if (y > 2 && y < n_colors)
- y = try_get_grays(cmap, y);
- if (y < 2)
- G_fatal_error(_("Unable to get sufficient gray shades."));
-
- NCOLORS = y;
-
- for (i = 0; i < 256; i++)
- Gray[i] = i * y / 256;
-
- break;
-
- case StaticColor:
- case PseudoColor:
- /* determine how many levels of r, g, and b are possible */
- get_max_levels(n_colors, &r, &g, &b);
-
- /* now see how many we can actually get */
- while (!try_get_colors(cmap, r, g, b))
- if (!get_fewer_levels(&r, &g, &b))
- G_fatal_error(_("Unable to get sufficient colors."));
-
- NCOLORS = r * g * b;
-
- for (i = 0; i < 256; i++) {
- Red[i] = (i * r / 256) * g * b;
- Grn[i] = (i * g / 256) * b;
- Blu[i] = (i * b / 256);
- }
-
- break;
-
- case DirectColor:
- G_warning(_("Using private colormap for DirectColor visual."));
-
- /* free any previously-allocated Colormap */
- if (cmap != DefaultColormap(dpy, scrn))
- XFreeColormap(dpy, cmap);
-
- /* get shift factors for R,G,B masks */
- NCOLORS = get_rgb_shifts();
-
- /* create colormap (emulates TrueColor visual) */
- cmap = ramp_colormap();
- break;
-
- case TrueColor:
- /* get shift factors for R,G,B masks */
- NCOLORS = get_rgb_shifts();
- break;
-
- default:
- G_fatal_error(_("Unknown visual class [%d]."), use_visual->class);
- break;
- }
-
- return cmap;
-}
-
-int _get_lookup_for_color(unsigned int r, unsigned int g, unsigned int b)
-{
- switch (use_visual->class) {
- case StaticGray:
- case GrayScale:
- return Gray[(r + g + b) / 3];
- break;
-
- case StaticColor:
- case PseudoColor:
- return Red[r] + Grn[g] + Blu[b];
- break;
-
- case DirectColor:
- case TrueColor:
- return find_color_rgb(r, g, b);
- break;
-
- default:
- G_fatal_error(_("Unknown visual class [%d]."), use_visual->class);
- break;
- }
-
- return -1;
-}
Modified: grass/trunk/visualization/xganim/Makefile
===================================================================
--- grass/trunk/visualization/xganim/Makefile 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/visualization/xganim/Makefile 2008-11-17 18:28:51 UTC (rev 34342)
@@ -2,13 +2,15 @@
PGM = xganim
-EXTRA_CFLAGS=$(XCFLAGS) $(XMINC)
+EXTRA_CFLAGS = $(WXWIDGETSCXXFLAGS) -DWXINTL_NO_GETTEXT_MACRO
-LIBES = $(GISLIB) $(XLIBPATH) $(XMLIB) $(XTLIB) $(XLIB) $(XEXTRALIBS)
+LIBES = $(GISLIB) $(WXWIDGETSLIB)
DEPENDENCIES = $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
-ifneq ($(strip $(XMLIB)),)
+ifneq ($(USE_WXWIDGETS),)
+ifneq ($(strip $(CXX)),)
default: cmd
endif
+endif
Deleted: grass/trunk/visualization/xganim/gui.c
===================================================================
--- grass/trunk/visualization/xganim/gui.c 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/visualization/xganim/gui.c 2008-11-17 18:28:51 UTC (rev 34342)
@@ -1,389 +0,0 @@
-/* Written by Bill Brown, USACERL (brown at zorro.cecer.army.mil)
- * May 2-12, 1994
- *
- * This code is in the public domain. Specifically, we give to the public
- * domain all rights for future licensing of the source code, all resale
- * rights, and all publishing rights.
- *
- * We ask, but do not require, that the following message be included in
- * all derived works:
- * "Portions developed at the US Army Construction Engineering
- * Research Laboratories, Champaign, Illinois."
- *
- * USACERL GIVES NO WARRANTY, EXPRESSED OR IMPLIED,
- * FOR THE SOFTWARE AND/OR DOCUMENTATION PROVIDED, INCLUDING, WITHOUT
- * LIMITATION, WARRANTY OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A
- * PARTICULAR PURPOSE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "bitmaps/rewind.xbm"
-#include "bitmaps/rplay.xbm"
-#include "bitmaps/stepb.xbm"
-#include "bitmaps/stop.xbm"
-#include "bitmaps/stepf.xbm"
-#include "bitmaps/play.xbm"
-#include "bitmaps/loop.xbm"
-#include "bitmaps/swing.xbm"
-#include "bitmaps/snail.xbm"
-#include "bitmaps/rabbit.xbm"
-
-#include "gui.h"
-
-
-/* callback procs */
-static void rewind_callback(Widget w, XtPointer data, XtPointer cbs);
-static void rplay_callback(Widget w, XtPointer data, XtPointer cbs);
-static void stepb_callback(Widget w, XtPointer data, XtPointer cbs);
-static void stop_callback(Widget w, XtPointer data, XtPointer cbs);
-static void stepf_callback(Widget w, XtPointer data, XtPointer cbs);
-static void play_callback(Widget w, XtPointer data, XtPointer cbs);
-static void loop_callback(Widget w, XtPointer data, XtPointer cbs);
-static void swing_callback(Widget w, XtPointer data, XtPointer cbs);
-static void exit_callback(Widget w, XtPointer data, XtPointer cbs);
-static void names_callback(Widget w, XtPointer data, XtPointer cbs);
-static void slower_callback(Widget w, XtPointer data, XtPointer cbs);
-static void faster_callback(Widget w, XtPointer data, XtPointer cbs);
-
-/* global variables */
-static Widget rew, rplay, stepb, stop, stepf, play, loop, swing;
-static Widget slower, faster;
-static struct gui_data *cd;
-
-
-void make_buttons(struct gui_data *data, Widget trc, Screen * scr)
-{
- unsigned int n;
- Arg wargs[10];
- Widget shnames, doexit;
-
- cd = data;
-
- /***************** rewind */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- rew = XtCreateManagedWidget("rd", xmPushButtonWidgetClass, trc, wargs, n);
-
- /***************** rplay */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- rplay = XtCreateManagedWidget("ry", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** stepb */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- stepb = XtCreateManagedWidget("sb", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** stop */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- stop = XtCreateManagedWidget("sp", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** stepf */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- stepf = XtCreateManagedWidget("sf", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** play */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- play = XtCreateManagedWidget("py", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** loop */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- loop = XtCreateManagedWidget("lp", xmToggleButtonWidgetClass,
- trc, wargs, n);
-
- /***************** swing */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- swing = XtCreateManagedWidget("sw", xmToggleButtonWidgetClass,
- trc, wargs, n);
-
- /***************** slower */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- slower = XtCreateManagedWidget("Sl", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** faster */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- faster = XtCreateManagedWidget("Fa", xmPushButtonWidgetClass,
- trc, wargs, n);
-
- /***************** shownames */
- n = 0;
- XtSetArg(wargs[n], XmNforeground, BlackPixelOfScreen(scr));
- n++;
- XtSetArg(wargs[n], XmNheight, 30);
- n++;
- XtSetArg(wargs[n], XmNwidth, 30);
- n++;
- XtSetArg(wargs[n], XmNset, TRUE);
- n++;
- shnames = XtCreateManagedWidget("names", xmPushButtonWidgetClass,
- trc, wargs, n);
- XtAddCallback(shnames, XmNactivateCallback,
- (XtCallbackProc) names_callback, (XtPointer) NULL);
-
- n = 0;
- XtSetArg(wargs[n], XmNmarginLeft, 0);
- n++;
- doexit = XtCreateManagedWidget("Exit", xmPushButtonWidgetClass,
- trc, wargs, n);
- XtAddCallback(doexit, XmNactivateCallback, (XtCallbackProc) exit_callback,
- (XtPointer) NULL);
-}
-
-void set_buttons_pixmap(Display * display, Drawable d)
-{
- Pixel fg, bg;
- unsigned int depth;
- Pixmap button_pix;
-
- XtVaGetValues(rew, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, rewind_bits, rewind_width,
- rewind_height, fg, bg, depth);
- XtVaSetValues(rew, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(rew, XmNactivateCallback, (XtCallbackProc) rewind_callback,
- (XtPointer) NULL);
-
- XtVaGetValues(rplay, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, rplay_bits, rplay_width,
- rplay_height, fg, bg, depth);
- XtVaSetValues(rplay, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(rplay, XmNactivateCallback, (XtCallbackProc) rplay_callback,
- (XtPointer) NULL);
-
- XtVaGetValues(stepb, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, stepb_bits, stepb_width,
- stepb_height, fg, bg, depth);
- XtVaSetValues(stepb, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(stepb, XmNactivateCallback, (XtCallbackProc) stepb_callback,
- (XtPointer) NULL);
-
- XtVaGetValues(stop, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, stop_bits, stop_width,
- stop_height, fg, bg, depth);
- XtVaSetValues(stop, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(stop, XmNactivateCallback, (XtCallbackProc) stop_callback,
- (XtPointer) NULL);
-
- XtVaGetValues(stepf, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, stepf_bits, stepf_width,
- stepf_height, fg, bg, depth);
- XtVaSetValues(stepf, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(stepf, XmNactivateCallback, (XtCallbackProc) stepf_callback,
- (XtPointer) NULL);
-
- XtVaGetValues(play, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, play_bits, play_width,
- play_height, fg, bg, depth);
- XtVaSetValues(play, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(play, XmNactivateCallback, (XtCallbackProc) play_callback,
- (XtPointer) NULL);
-
- XtVaGetValues(loop, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, loop_bits, loop_width,
- loop_height, fg, bg, depth);
- XtVaSetValues(loop, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(loop, XmNvalueChangedCallback,
- (XtCallbackProc) loop_callback, (XtPointer) NULL);
-
- XtVaGetValues(swing, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, swing_bits, swing_width,
- swing_height, fg, bg, depth);
- XtVaSetValues(swing, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(swing, XmNvalueChangedCallback,
- (XtCallbackProc) swing_callback, (XtPointer) NULL);
-
- XtVaGetValues(faster, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, rabbit_bits, rabbit_width,
- rabbit_height, fg, bg, depth);
- XtVaSetValues(faster, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(faster, XmNactivateCallback,
- (XtCallbackProc) faster_callback, (XtPointer) NULL);
-
- XtVaGetValues(slower, XmNforeground, &fg,
- XmNbackground, &bg, XmNdepth, &depth, NULL);
- button_pix = XCreatePixmapFromBitmapData(display,
- d, snail_bits, snail_width,
- snail_height, fg, bg, depth);
- XtVaSetValues(slower, XmNlabelType, XmPIXMAP, XmNlabelPixmap, button_pix,
- NULL);
- XtAddCallback(slower, XmNactivateCallback,
- (XtCallbackProc) slower_callback, (XtPointer) NULL);
-
-}
-
-static void rewind_callback(Widget w, XtPointer data, XtPointer cbs)
-{
-
- cd->step = 0;
- cd->stop = 1;
- cd->rewind = 1;
-
-}
-
-static void rplay_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->step = 0;
- cd->stop = 0;
- cd->direction = -1;
- cd->curframe = cd->prevframe + cd->direction;
-
-}
-
-static void stepb_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->step = 1;
- cd->direction = -1;
- cd->curframe = cd->prevframe + cd->direction;
-}
-
-static void stop_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->stop = 1;
-}
-
-static void stepf_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->step = 1;
- cd->direction = 1;
- cd->curframe = cd->prevframe + cd->direction;
-}
-
-static void play_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->step = 0;
- cd->stop = 0;
- cd->direction = 1;
- cd->curframe = cd->prevframe + cd->direction;
-}
-
-static void loop_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->loop = XmToggleButtonGetState(loop);
- cd->swing = 0;
- XmToggleButtonSetState(swing, 0, False);
- cd->stop = !cd->loop;
-}
-
-static void swing_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->swing = XmToggleButtonGetState(swing);
- cd->loop = 0;
- XmToggleButtonSetState(loop, 0, False);
- cd->stop = !cd->swing;
-}
-
-static void slower_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- if (cd->speed) {
- if (cd->speed < 200000)
- cd->speed *= 3;
- }
- else
- cd->speed = 1;
-}
-
-static void faster_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- if (cd->speed > 1)
- cd->speed /= 3;
-}
-
-static void names_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- cd->shownames = (1 + cd->shownames) % 3;
-}
-
-static void exit_callback(Widget w, XtPointer data, XtPointer cbs)
-{
- exit(0);
-}
Added: grass/trunk/visualization/xganim/gui.cc
===================================================================
--- grass/trunk/visualization/xganim/gui.cc (rev 0)
+++ grass/trunk/visualization/xganim/gui.cc 2008-11-17 18:28:51 UTC (rev 34342)
@@ -0,0 +1,305 @@
+/* Written by Bill Brown, USACERL (brown at zorro.cecer.army.mil)
+ * May 2-12, 1994
+ *
+ * This code is in the public domain. Specifically, we give to the public
+ * domain all rights for future licensing of the source code, all resale
+ * rights, and all publishing rights.
+ *
+ * We ask, but do not require, that the following message be included in
+ * all derived works:
+ * "Portions developed at the US Army Construction Engineering
+ * Research Laboratories, Champaign, Illinois."
+ *
+ * USACERL GIVES NO WARRANTY, EXPRESSED OR IMPLIED,
+ * FOR THE SOFTWARE AND/OR DOCUMENTATION PROVIDED, INCLUDING, WITHOUT
+ * LIMITATION, WARRANTY OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A
+ * PARTICULAR PURPOSE.
+ */
+
+#include <stdlib.h>
+#include <wx/button.h>
+#include <wx/bmpbuttn.h>
+#include <wx/bitmap.h>
+#include <wx/sizer.h>
+#include <wx/strconv.h>
+#include <wx/event.h>
+#include <wx/dcclient.h>
+#include <wx/dc.h>
+#include <wx/colour.h>
+#include "gui.h"
+
+#include "bitmaps/rewind.xbm"
+#include "bitmaps/rplay.xbm"
+#include "bitmaps/stepb.xbm"
+#include "bitmaps/stop.xbm"
+#include "bitmaps/stepf.xbm"
+#include "bitmaps/play.xbm"
+#include "bitmaps/loop.xbm"
+#include "bitmaps/swing.xbm"
+#include "bitmaps/snail.xbm"
+#include "bitmaps/rabbit.xbm"
+
+enum {
+ MYID_REW,
+ MYID_RPLAY,
+ MYID_STEPB,
+ MYID_STOP,
+ MYID_STEPF,
+ MYID_PLAY,
+ MYID_LOOP,
+ MYID_SWING,
+ MYID_SLOWER,
+ MYID_FASTER,
+ MYID_SHNAMES,
+ MYID_DOEXIT,
+};
+
+BEGIN_EVENT_TABLE(MyCanvas, wxPanel)
+EVT_ERASE_BACKGROUND(MyCanvas::erase)
+END_EVENT_TABLE()
+
+MyCanvas::MyCanvas(wxWindow *parent, wxWindowID id, const wxSize &size)
+ : wxPanel(parent, id, wxDefaultPosition, size)
+{
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+}
+
+void MyCanvas::erase(wxEraseEvent &ev)
+{
+ ev.GetDC();
+}
+
+void MyCanvas::draw_image(wxBitmap *bmp)
+{
+ wxClientDC dc(this);
+
+ dc.DrawBitmap(*bmp, 0, 0, false);
+}
+
+void MyCanvas::draw_text(int style, int x, int y, const char *str)
+{
+ wxClientDC dc(this);
+
+ switch (style) {
+ case 1:
+ dc.SetTextBackground(*wxWHITE);
+ dc.SetTextForeground(*wxBLACK);
+ break;
+ case 2:
+ dc.SetTextBackground(*wxBLACK);
+ dc.SetTextForeground(*wxWHITE);
+ break;
+ default:
+ return;
+ }
+
+ dc.DrawText(wxString(str, wxConvISO8859_1), x, y);
+}
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+EVT_BUTTON(MYID_REW, MyFrame::rewind_callback)
+EVT_BUTTON(MYID_RPLAY, MyFrame::rplay_callback)
+EVT_BUTTON(MYID_STEPB, MyFrame::stepb_callback)
+EVT_BUTTON(MYID_STOP, MyFrame::stop_callback)
+EVT_BUTTON(MYID_STEPF, MyFrame::stepf_callback)
+EVT_BUTTON(MYID_PLAY, MyFrame::play_callback)
+EVT_BUTTON(MYID_LOOP, MyFrame::loop_callback)
+EVT_BUTTON(MYID_SWING, MyFrame::swing_callback)
+EVT_BUTTON(MYID_SLOWER, MyFrame::slower_callback)
+EVT_BUTTON(MYID_FASTER, MyFrame::faster_callback)
+EVT_BUTTON(MYID_SHNAMES, MyFrame::names_callback)
+EVT_BUTTON(MYID_DOEXIT, MyFrame::exit_callback)
+END_EVENT_TABLE()
+
+void MyFrame::make_buttons(wxSizer *sizer)
+{
+ sizer->Add(new wxBitmapButton(this, MYID_REW , wxBitmap(rewind_bits, rewind_width, rewind_height)));
+ sizer->Add(new wxBitmapButton(this, MYID_RPLAY , wxBitmap(rplay_bits , rplay_width , rplay_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_STEPB , wxBitmap(stepb_bits , stepb_width , stepb_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_STOP , wxBitmap(stop_bits , stop_width , stop_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_STEPF , wxBitmap(stepf_bits , stepf_width , stepf_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_PLAY , wxBitmap(play_bits , play_width , play_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_LOOP , wxBitmap(loop_bits , loop_width , loop_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_SWING , wxBitmap(swing_bits , swing_width , swing_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_SLOWER, wxBitmap(snail_bits , snail_width , snail_height )));
+ sizer->Add(new wxBitmapButton(this, MYID_FASTER, wxBitmap(rabbit_bits, rabbit_width, rabbit_height)));
+ sizer->Add(new wxButton(this, MYID_SHNAMES, wxString("Names", wxConvISO8859_1)));
+ sizer->Add(new wxButton(this, MYID_DOEXIT, wxString("Exit", wxConvISO8859_1)));
+}
+
+void MyFrame::rewind_callback(wxCommandEvent &event)
+{
+ cd->step = 0;
+ cd->stop = 1;
+ cd->rewind = 1;
+}
+
+void MyFrame::rplay_callback(wxCommandEvent &event)
+{
+ cd->step = 0;
+ cd->stop = 0;
+ cd->direction = -1;
+ cd->curframe = cd->prevframe + cd->direction;
+}
+
+void MyFrame::stepb_callback(wxCommandEvent &event)
+{
+ cd->step = 1;
+ cd->direction = -1;
+ cd->curframe = cd->prevframe + cd->direction;
+}
+
+void MyFrame::stop_callback(wxCommandEvent &event)
+{
+ cd->stop = 1;
+}
+
+void MyFrame::stepf_callback(wxCommandEvent &event)
+{
+ cd->step = 1;
+ cd->direction = 1;
+ cd->curframe = cd->prevframe + cd->direction;
+}
+
+void MyFrame::play_callback(wxCommandEvent &event)
+{
+ cd->step = 0;
+ cd->stop = 0;
+ cd->direction = 1;
+ cd->curframe = cd->prevframe + cd->direction;
+}
+
+void MyFrame::loop_callback(wxCommandEvent &event)
+{
+ cd->loop = !cd->loop;
+ cd->swing = 0;
+ cd->stop = !cd->loop;
+}
+
+void MyFrame::swing_callback(wxCommandEvent &event)
+{
+ cd->swing = !cd->swing;
+ cd->loop = 0;
+ cd->stop = !cd->swing;
+}
+
+void MyFrame::slower_callback(wxCommandEvent &event)
+{
+ if (cd->speed) {
+ if (cd->speed < 200000)
+ cd->speed *= 3;
+ }
+ else
+ cd->speed = 1;
+}
+
+void MyFrame::faster_callback(wxCommandEvent &event)
+{
+ if (cd->speed > 1)
+ cd->speed /= 3;
+}
+
+void MyFrame::names_callback(wxCommandEvent &event)
+{
+ cd->shownames = (1 + cd->shownames) % 3;
+}
+
+void MyFrame::exit_callback(wxCommandEvent &event)
+{
+ exit(0);
+}
+
+void MyFrame::change_label(const char *label)
+{
+ flabel->SetLabel(wxString(label, wxConvISO8859_1));
+}
+
+#if 0
+
+void MyFrame::init_graphics()
+{
+/* global variables */
+ Widget canvas;
+ Display *theDisplay;
+ XImage *pic_array[MAXIMAGES];
+ GC invertGC, drawGC;
+
+ int scrn;
+ Display *dpy;
+ Window grwin;
+ Colormap fixedcmap;
+ unsigned long blackPix, whitePix;
+
+ unsigned int depth;
+ Visual *use_visual;
+
+ dpy = XtDisplay(canvas);
+ grwin = XtWindow(canvas);
+ scrn = DefaultScreen(dpy);
+ use_visual = DefaultVisual(dpy, scrn);
+#if 1
+ fixedcmap = XCreateColormap(dpy, grwin, use_visual, AllocNone);
+#else
+ fixedcmap = DefaultColormap(dpy, scrn);
+#endif
+ fixedcmap = InitColorTableFixed(fixedcmap);
+
+ XtVaGetValues(canvas, XmNdepth, &depth, NULL);
+
+ XtVaSetValues(toplevel, XmNcolormap, fixedcmap, NULL);
+ XtSetWMColormapWindows(toplevel, &canvas, 1);
+
+ /**************************************************************/
+
+ blackPix = _get_lookup_for_color(0, 0, 0);
+ whitePix = _get_lookup_for_color(255, 255, 255);
+
+ drawGC =
+ XCreateGC(XtDisplay(canvas), XtWindow(canvas), (unsigned long)0,
+ NULL);
+
+ theDisplay = XtDisplay(toplevel);
+
+ XSetFunction(theDisplay, drawGC, GXcopy);
+ XSetForeground(theDisplay, drawGC, blackPix);
+ XSetBackground(theDisplay, drawGC, whitePix);
+
+ invertGC =
+ XCreateGC(XtDisplay(canvas), XtWindow(canvas), (unsigned long)0,
+ NULL);
+ XSetFunction(theDisplay, invertGC, GXcopy);
+ XSetForeground(theDisplay, invertGC, whitePix);
+ XSetBackground(theDisplay, invertGC, blackPix);
+
+}
+
+#endif
+
+MyFrame::MyFrame(const wxString& title, int ncols, int nrows, struct gui_data *cd)
+ : wxFrame((wxFrame *)NULL, wxID_ANY, title), cd(cd)
+{
+ canvas = new MyCanvas(this, wxID_ANY, wxSize(ncols, nrows));
+
+ wxBoxSizer *sizer, *buttons;
+
+ if (ncols > nrows) {
+ sizer = new wxBoxSizer(wxVERTICAL);
+ buttons = new wxBoxSizer(wxHORIZONTAL);
+ sizer->Add(canvas);
+ sizer->Add(buttons);
+ }
+ else {
+ sizer = new wxBoxSizer(wxHORIZONTAL);
+ buttons = new wxBoxSizer(wxVERTICAL);
+ sizer->Add(canvas);
+ sizer->Add(buttons);
+ }
+
+ make_buttons(buttons);
+
+ flabel = new wxStaticText(this, wxID_ANY, wxString("00000", wxConvISO8859_1), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
+ buttons->Add(flabel);
+
+ SetSizerAndFit(sizer);
+}
+
Modified: grass/trunk/visualization/xganim/gui.h
===================================================================
--- grass/trunk/visualization/xganim/gui.h 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/visualization/xganim/gui.h 2008-11-17 18:28:51 UTC (rev 34342)
@@ -1,16 +1,14 @@
-#include <X11/Xlib.h>
-#include <X11/StringDefs.h>
-#include <X11/Intrinsic.h>
-#include <X11/Xutil.h>
-#include <Xm/Xm.h>
-#include <Xm/DrawingA.h>
-#include <Xm/RowColumn.h>
-#include <Xm/Form.h>
-#include <Xm/Label.h>
-#include <Xm/PushB.h>
-#include <Xm/ToggleB.h>
-#include <Xm/ArrowB.h>
+#include <wx/app.h>
+#include <wx/event.h>
+#include <wx/window.h>
+#include <wx/panel.h>
+#include <wx/frame.h>
+#include <wx/stattext.h>
+#include <wx/bitmap.h>
+#define MAXIMAGES 400
+#define MAXVIEWS 4
+
struct gui_data
{
int step, speed, stop, direction;
@@ -18,12 +16,61 @@
int loop, swing, shownames;
};
+class MyCanvas: public wxPanel
+{
+public:
+ MyCanvas(wxWindow *parent, wxWindowID id, const wxSize& size);
+ void erase(wxEraseEvent &ev);
+ void draw_image(wxBitmap *bmp);
+ void draw_text(int style, int x, int y, const char *str);
-/* function prototypes */
-/* gui.c */
-void make_buttons(struct gui_data *data, Widget trc, Screen * scr);
-void set_buttons_pixmap(Display * display, Drawable d);
+ DECLARE_EVENT_TABLE()
+};
-/* Clr_table.c */
-Colormap InitColorTableFixed(Colormap cmap);
-int _get_lookup_for_color(unsigned int r, unsigned int g, unsigned int b);
+class MyFrame: public wxFrame
+{
+public:
+ MyFrame(const wxString& title, int ncols, int nrows, struct gui_data *cd);
+ void change_label(const char *label);
+
+ MyCanvas *canvas;
+
+private:
+ struct gui_data *cd;
+ wxStaticText *flabel;
+
+ void make_buttons(wxSizer *);
+
+ void rewind_callback(wxCommandEvent &);
+ void rplay_callback(wxCommandEvent &);
+ void stepb_callback(wxCommandEvent &);
+ void stop_callback(wxCommandEvent &);
+ void stepf_callback(wxCommandEvent &);
+ void play_callback(wxCommandEvent &);
+ void loop_callback(wxCommandEvent &);
+ void swing_callback(wxCommandEvent &);
+ void exit_callback(wxCommandEvent &);
+ void names_callback(wxCommandEvent &);
+ void slower_callback(wxCommandEvent &);
+ void faster_callback(wxCommandEvent &);
+
+ DECLARE_EVENT_TABLE()
+};
+
+class MyApp: public wxApp
+{
+private:
+ wxBitmap *pic_array[MAXIMAGES];
+
+public:
+ virtual bool OnInit();
+
+private:
+ MyFrame *mainwin;
+ struct gui_data gd;
+
+ int load_files(void);
+ void do_run(wxIdleEvent &);
+
+ DECLARE_EVENT_TABLE()
+};
Deleted: grass/trunk/visualization/xganim/local_proto.h
===================================================================
--- grass/trunk/visualization/xganim/local_proto.h 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/visualization/xganim/local_proto.h 2008-11-17 18:28:51 UTC (rev 34342)
@@ -1 +0,0 @@
-extern Visual *use_visual;
Deleted: grass/trunk/visualization/xganim/main.c
===================================================================
--- grass/trunk/visualization/xganim/main.c 2008-11-17 18:27:48 UTC (rev 34341)
+++ grass/trunk/visualization/xganim/main.c 2008-11-17 18:28:51 UTC (rev 34342)
@@ -1,632 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE: xganim
- * AUTHOR(S): Bill Brown <brown gis.uiuc.edu> CERL (original contributor),
- * Markus Neteler <neteler itc.it>,
- * Roberto Flor <flor itc.it>,
- * Bernhard Reiter <bernhard intevation.de>,
- * Brad Douglas <rez touchofmadness.com>,
- * Glynn Clements <glynn gclements.plus.com>
- * PURPOSE: a tool for animating a series of GRASS raster files
- * COPYRIGHT: (C) 1999-2006 by the GRASS Development Team
- *
- * This program is free software under the GNU General Public
- * License (>=v2). Read the file COPYING that comes with GRASS
- * for details.
- *
- *****************************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <limits.h>
-#include <unistd.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-#include "gui.h"
-#include "local_proto.h"
-
-#define COLOR_OFFSET 0
-#define MAXIMAGES 400
-#define DEF_MAX 900
-#define DEF_MIN 600
-#define MAXVIEWS 4
-#define BORDER_W 2
-
-
-/* function prototypes */
-static int load_files();
-static Boolean do_run(XtPointer);
-static char **gee_wildfiles(char *wildarg, char *element, int *num);
-static void change_label(Widget wid, char *str);
-static void parse_command(struct Option **viewopts,
- char *vfiles[MAXVIEWS][MAXIMAGES],
- int *numviews, int *numframes);
-
-
-/* global variables */
-Widget canvas, flabel;
-Display *theDisplay;
-XImage *pic_array[MAXIMAGES];
-GC invertGC, drawGC;
-unsigned int nrows, ncols;
-int numviews;
-int Top = 0, Left = 0;
-char frame[MAXIMAGES][4];
-char *vfiles[MAXVIEWS][MAXIMAGES];
-int LabelPos[MAXVIEWS][2];
-
-float vscale, scale; /* resampling scale factors */
-int irows, icols, vrows, vcols;
-int frames;
-
-unsigned int depth;
-
-Visual *use_visual;
-
-int main(int argc, char **argv)
-{
- Widget toplevel, mainwin, trc;
- int scrn;
- Display *dpy;
- Window grwin;
- Colormap fixedcmap;
-
- int i, j;
- unsigned int *sdimp;
- int longdim;
- unsigned long blackPix, whitePix;
-
- struct gui_data cd;
-
- XtAppContext AppC;
- Arg wargs[15];
- unsigned int n;
-
- struct Option *viewopts[MAXVIEWS];
-
- G_gisinit(argv[0]);
-
-
- for (i = 0; i < MAXVIEWS; i++) {
- char buf[BUFSIZ];
- viewopts[i] = G_define_option();
- sprintf(buf, "view%d", i + 1);
- viewopts[i]->key = G_store(buf);
- viewopts[i]->type = TYPE_STRING;
- viewopts[i]->required = (i ? NO : YES);
- viewopts[i]->multiple = YES;
- viewopts[i]->gisprompt = "old,cell,Raster";;
- sprintf(buf, _("Raster file(s) for View%d"), i + 1);
- viewopts[i]->description = G_store(buf);
- }
-
- if (G_parser(argc, argv))
- exit(EXIT_FAILURE);
-
- parse_command(viewopts, vfiles, &numviews, &frames);
-
- /* debug */
- if (G_verbose() > G_verbose_std()) {
- for (i = 0; i < numviews; i++) {
- fprintf(stderr, "\nVIEW %d: ", i + 1);
- for (j = 0; j < frames; j++) {
- fprintf(stderr, "%s ", vfiles[i][j]);
- }
- }
- }
- fprintf(stderr, "\n");
-
- vrows = G_window_rows();
- vcols = G_window_cols();
- nrows = vrows;
- ncols = vcols;
-
- /* short dimension */
- sdimp = nrows > ncols ? &ncols : &nrows;
-
- /* these proportions should work fine for 1 or 4 views, but for
- 2 views, want to double the narrow dim & for 3 views triple it */
- if (numviews == 2)
- *sdimp *= 2;
- else if (numviews == 3)
- *sdimp *= 3;
-
- longdim = nrows > ncols ? nrows : ncols;
-
- scale = 1.0;
-
- { /* find animation image size */
- int max, min;
- char *p;
-
- max = DEF_MAX;
- min = DEF_MIN;
-
- if ((p = getenv("XGANIM_SIZE")))
- max = min = atoi(p);
-
- if (longdim > max) /* scale down */
- scale = (float)max / longdim;
- else if (longdim < min) /* scale up */
- scale = (float)min / longdim;
- }
-
- vscale = scale;
- if (numviews == 4)
- vscale = scale / 2.;
-
- nrows *= scale;
- ncols *= scale;
- /* now nrows & ncols are the size of the combined - views image */
- vrows *= vscale;
- vcols *= vscale;
- /* now vrows & vcols are the size for each sub-image */
-
- /* add to nrows & ncols for borders */
- /* irows, icols used for vert/horizontal determination in loop below */
- irows = nrows;
- icols = ncols;
- nrows += (1 + (nrows / vrows)) * BORDER_W;
- ncols += (1 + (ncols / vcols)) * BORDER_W;
-
- toplevel = XtAppInitialize(&AppC, "xganimate", NULL, 0,
- &argc, argv, NULL, wargs, 0);
-
- theDisplay = XtDisplay(toplevel);
-
- n = 0;
- if (ncols > nrows) {
- XtSetArg(wargs[n], XmNwidth, ncols);
- n++;
- XtSetArg(wargs[n], XmNheight, nrows + 60);
- n++;
- }
- else {
- XtSetArg(wargs[n], XmNwidth, ncols + 80);
- n++;
- XtSetArg(wargs[n], XmNheight, nrows);
- n++;
- }
- mainwin = XtCreateManagedWidget("GRASS Animate", xmFormWidgetClass,
- toplevel, wargs, n);
-
- cd.speed = 100;
- cd.direction = 1;
- cd.shownames = 1;
-
- n = 0;
- XtSetArg(wargs[n], XmNtopAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNleftAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNwidth, ncols);
- n++;
- XtSetArg(wargs[n], XmNheight, nrows);
- n++;
- canvas = XtCreateManagedWidget("canvas", xmDrawingAreaWidgetClass,
- mainwin, wargs, n);
-
- n = 0;
- if (ncols > nrows) {
- XtSetArg(wargs[n], XmNorientation, XmHORIZONTAL);
- n++;
- XtSetArg(wargs[n], XmNleftAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNrightAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNbottomAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNtopAttachment, XmATTACH_WIDGET);
- n++;
- XtSetArg(wargs[n], XmNtopWidget, canvas);
- n++;
- }
- else {
- XtSetArg(wargs[n], XmNorientation, XmVERTICAL);
- n++;
- XtSetArg(wargs[n], XmNleftAttachment, XmATTACH_WIDGET);
- n++;
- XtSetArg(wargs[n], XmNleftWidget, canvas);
- n++;
- XtSetArg(wargs[n], XmNrightAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNbottomAttachment, XmATTACH_FORM);
- n++;
- XtSetArg(wargs[n], XmNtopAttachment, XmATTACH_FORM);
- n++;
- }
- XtSetArg(wargs[n], XmNbackground, WhitePixelOfScreen(XtScreen(toplevel)));
- n++;
- XtSetArg(wargs[n], XmNadjustMargin, False);
- n++;
- trc = XtCreateManagedWidget("controls_rc",
- xmRowColumnWidgetClass, mainwin, wargs, n);
-
- make_buttons(&cd, trc, XtScreen(toplevel));
-
- n = 0;
- XtSetArg(wargs[n], XmNalignment, XmALIGNMENT_END);
- n++;
- flabel = XtCreateManagedWidget("cfr", xmLabelWidgetClass, trc, wargs, n);
-
- XtRealizeWidget(toplevel);
- set_buttons_pixmap(theDisplay, XtWindow(canvas));
-
- /**************************************************************/
-
- dpy = XtDisplay(canvas);
- grwin = XtWindow(canvas);
- scrn = DefaultScreen(dpy);
- use_visual = DefaultVisual(dpy, scrn);
-#if 1
- fixedcmap = XCreateColormap(dpy, grwin, use_visual, AllocNone);
-#else
- fixedcmap = DefaultColormap(dpy, scrn);
-#endif
- fixedcmap = InitColorTableFixed(fixedcmap);
-
- XtVaGetValues(canvas, XmNdepth, &depth, NULL);
-
- XtVaSetValues(toplevel, XmNcolormap, fixedcmap, NULL);
- XtSetWMColormapWindows(toplevel, &canvas, 1);
-
- /**************************************************************/
-
- blackPix = _get_lookup_for_color(0, 0, 0);
- whitePix = _get_lookup_for_color(255, 255, 255);
-
- drawGC =
- XCreateGC(XtDisplay(canvas), XtWindow(canvas), (unsigned long)0,
- NULL);
- XSetFunction(theDisplay, drawGC, GXcopy);
- XSetForeground(theDisplay, drawGC, blackPix);
- XSetBackground(theDisplay, drawGC, whitePix);
-
- invertGC =
- XCreateGC(XtDisplay(canvas), XtWindow(canvas), (unsigned long)0,
- NULL);
- XSetFunction(theDisplay, invertGC, GXcopy);
- XSetForeground(theDisplay, invertGC, whitePix);
- XSetBackground(theDisplay, invertGC, blackPix);
-
-
- for (j = 0; j < MAXIMAGES; j++)
- sprintf(frame[j], "%2d", j + 1);
-
- while (1) { /* wait for window */
- XEvent xev;
-
- XNextEvent(theDisplay, &xev);
- if (xev.type == MapNotify && xev.xmap.event == XtWindow(mainwin))
- break;
- }
-
- XtAppAddWorkProc(AppC, do_run, &cd);
- XtAppMainLoop(AppC);
-
- return 0;
-}
-
-
-static int load_files()
-{
- CELL *cell;
- FCELL *fcell;
- DCELL *dcell;
- void *voidc = NULL;
- unsigned char *tr, *tg, *tb, *tset;
- int tsiz, coff;
- int rowoff, row, col, vxoff, vyoff;
- int cnt, ret, fd;
- int vnum;
- XImage *pa;
- char *mapset, name[BUFSIZ];
- struct Colors colors;
- int rtype;
-
- cell = G_allocate_c_raster_buf();
- fcell = G_allocate_f_raster_buf();
- dcell = G_allocate_d_raster_buf();
-
- tsiz = G_window_cols();
-
- /* allocate memory */
- tr = G_malloc(tsiz * sizeof(char));
- tg = G_malloc(tsiz * sizeof(char));
- tb = G_malloc(tsiz * sizeof(char));
- tset = G_malloc(tsiz * sizeof(char));
-
- for (cnt = 0; cnt < frames; cnt++) {
- if (cnt > MAXIMAGES) {
- cnt--;
- break;
- }
-
- pa = XCreateImage(theDisplay, use_visual, depth, ZPixmap,
- 0, NULL, ncols, nrows, 8, 0);
- pa->data = G_malloc((size_t) nrows * pa->bytes_per_line);
- pic_array[cnt] = pa;
-
- for (vnum = 0; vnum < numviews; vnum++) {
- if (icols == vcols) {
- vxoff = BORDER_W;
- vyoff = (irows == vrows) ? BORDER_W :
- BORDER_W + vnum * (BORDER_W + vrows);
- }
- else if (irows == vrows) {
- vxoff = (icols == vcols) ? BORDER_W :
- BORDER_W + vnum * (BORDER_W + vcols);
- vyoff = BORDER_W;
- }
- else { /* 4 views */
- /* assumes we want :
- view1 view2
-
- view3 view4
- */
- vxoff = vnum % 2 ? BORDER_W : vcols + 2 * BORDER_W;
- vyoff = vnum > 1 ? vrows + 2 * BORDER_W : BORDER_W;
- }
- if (!cnt) {
- LabelPos[vnum][0] = vxoff;
- LabelPos[vnum][1] = vyoff + vrows - 1;
- }
-
- strcpy(name, vfiles[vnum][cnt]);
- G_message(_("Reading file [%s]..."), name);
-
- mapset = G_find_cell2(name, "");
- if (mapset == NULL)
- G_fatal_error(_("Raster map <%s> not found"), name);
-
- fd = G_open_cell_old(name, mapset);
- if (fd < 0)
- G_fatal_error(_("Unable to open raster map <%s>"), name);
- /*
- strcpy(title[cnt],G_get_cell_title(name, mapset));
- */
-
- rtype = G_get_raster_map_type(fd);
- if (rtype == CELL_TYPE)
- voidc = (CELL *) cell;
- else if (rtype == FCELL_TYPE)
- voidc = (FCELL *) fcell;
- else if (rtype == DCELL_TYPE)
- voidc = (DCELL *) dcell;
- else
- /* should not reach here */
- G_fatal_error(_("Unable to determine raster cell type"));
-
- ret = G_read_colors(name, mapset, &colors);
- if (ret < 0)
- G_fatal_error(_("Unable to read color file"));
-
- for (row = 0; row < vrows; row++) {
- if (G_get_raster_row
- (fd, (void *)voidc, (int)(row / vscale), rtype) < 0)
- G_fatal_error(_("Unable to read raster row"));
-
- rowoff = (vyoff + row) * ncols;
- G_lookup_raster_colors((void *)voidc, tr, tg, tb, tset, tsiz,
- &colors, rtype);
-
- for (col = 0; col < vcols; col++) {
- coff = (int)(col / vscale);
-
- if (!tset[coff])
- tr[coff] = tg[coff] = tb[coff] = 255;
-
- XPutPixel(pa, vxoff + col, vyoff + row,
- _get_lookup_for_color(tr[coff],
- tg[coff], tb[coff]));
- }
- }
-
- G_close_cell(fd);
- }
-
- XPutImage(theDisplay, XtWindow(canvas), drawGC, pa, 0, 0,
- Left, Top, ncols, nrows);
- change_label(flabel, frame[cnt]);
-
- }
- G_free(cell);
- G_free(fcell);
- G_free(dcell);
- G_free(tr);
- G_free(tg);
- G_free(tb);
- G_free(tset);
-
- return (cnt);
-}
-
-
-/* ###################################################### */
-static Boolean do_run(XtPointer p)
-{
- static int first = 1;
- struct gui_data *cd = p;
- int i, cnt;
- Drawable dr;
-
- if (first) {
- first = 0;
- cnt = load_files();
- cd->curframe = cd->direction > 0 ? 0 : cnt - 1;
- cd->prevframe = cd->curframe;
- cd->step = cd->stop = 0;
- cd->loop = cd->swing = 0;
- cd->nframes = cnt;
-
- }
-
- if (cd->rewind) {
- cd->rewind = 0;
- cd->curframe = 0;
- cd->direction = 1;
- cd->step = 1;
- }
-
- if (cd->swing) {
- if (cd->curframe == cd->nframes || cd->curframe < 0) {
- cd->direction = -cd->direction;
- cd->curframe += cd->direction;
- }
- }
- else if (cd->loop) {
- if (cd->curframe == cd->nframes)
- cd->curframe = 0;
- else if (cd->curframe < 0)
- cd->curframe = cd->nframes - 1;
- }
- else if (cd->curframe == cd->nframes || cd->curframe < 0)
- cd->stop = 1;
-
- if (cd->stop && !cd->step)
- return (False);
-
- if (cd->curframe < cd->nframes && cd->curframe >= 0) {
- /* little pause */
- {
- float tf;
-
- for (tf = 0.0; tf < cd->speed; tf += .01) ;
- }
-
- dr = XtWindow(canvas);
- XPutImage(theDisplay, dr, drawGC, pic_array[cd->curframe], 0, 0,
- Left, Top, ncols, nrows);
-
- /* draw labels */
- if (cd->shownames == 1)
- for (i = 0; i < numviews; i++) {
- XDrawString(theDisplay, dr, drawGC,
- LabelPos[i][0] + 5, LabelPos[i][1] - 5,
- vfiles[i][cd->curframe],
- (int)strlen(vfiles[i][cd->curframe]));
- }
- else if (cd->shownames == 2)
- for (i = 0; i < numviews; i++) {
- XDrawString(theDisplay, dr, invertGC,
- LabelPos[i][0] + 5, LabelPos[i][1] - 5,
- vfiles[i][cd->curframe],
- (int)strlen(vfiles[i][cd->curframe]));
- }
- change_label(flabel, frame[cd->curframe]);
-
- cd->prevframe = cd->curframe;
- }
-
- cd->curframe += cd->direction;
-
- if (cd->step) {
- cd->step = 0;
- cd->stop = 1;
- }
-
- return False; /* to keep it running */
-}
-
-
-/* ###################################################### */
-static char **gee_wildfiles(char *wildarg, char *element, int *num)
-{
- int n, cnt = 0;
- char path[GPATH_MAX], *mapset, cmd[GPATH_MAX], buf[512];
- char *p, *tfile;
- static char *newfiles[MAXIMAGES];
- FILE *tf;
-
- *num = 0;
- tfile = G_tempfile();
-
- /* build list of filenames */
- for (n = 0; (mapset = G__mapset_name(n)); n++) {
- if (strcmp(mapset, ".") == 0)
- mapset = G_mapset();
-
- G__file_name(path, element, "", mapset);
- if (access(path, 0) == 0) {
- sprintf(cmd, "cd %s; \\ls %s >> %s 2> /dev/null", path, wildarg,
- tfile);
- system(cmd);
- }
- }
-
- if (NULL == (tf = fopen(tfile, "r")))
- G_warning(_("Error reading wildcard"));
- else {
- while (NULL != fgets(buf, 512, tf)) {
- /* replace newline with null */
- if ((p = strchr(buf, '\n')))
- *p = '\0';
- /* replace first space with null */
- else if ((p = strchr(buf, ' ')))
- *p = '\0';
-
- if (strlen(buf) > 1) {
- newfiles[cnt++] = G_store(buf);
- }
- }
- fclose(tf);
- }
- *num = cnt;
- G_free(tfile);
-
- return (newfiles);
-}
-
-
-/********************************************************************/
-/* to change label in label widget */
-
-static void change_label(Widget wid, char *str)
-{
- Arg wargs[1];
- XmString xmstr;
-
- xmstr = XmStringCreateSimple(str);
- XtSetArg(wargs[0], XmNlabelString, xmstr);
- XtSetValues(wid, wargs, 1);
- XmStringFree(xmstr);
-}
-
-
-/********************************************************************/
-static void parse_command(struct Option **viewopts,
- char *vfiles[MAXVIEWS][MAXIMAGES],
- int *numviews, int *numframes)
-{
- int i, j, k;
-
- *numviews = *numframes = 0;
-
- for (i = 0; i < MAXVIEWS; i++) {
- if (viewopts[i]->answers) {
- int numi, wildnum;
-
- (*numviews)++;
-
- for (j = 0, numi = 0; viewopts[i]->answers[j]; j++) {
- if ((NULL != strchr(viewopts[i]->answers[j], '*')) ||
- (NULL != strchr(viewopts[i]->answers[j], '?')) ||
- (NULL != strchr(viewopts[i]->answers[j], '['))) {
- char **wildfiles = gee_wildfiles(viewopts[i]->answers[j],
- "cell", &wildnum);
-
- for (k = 0; k < wildnum; k++)
- vfiles[i][numi++] = wildfiles[k];
- }
- else
- vfiles[i][numi++] = G_store(viewopts[i]->answers[j]);
- }
- /* keep track of smallest number of frames */
- *numframes =
- *numframes ? *numframes > numi ? numi : *numframes : numi;
- }
- }
-}
Added: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc (rev 0)
+++ grass/trunk/visualization/xganim/main.cc 2008-11-17 18:28:51 UTC (rev 34342)
@@ -0,0 +1,444 @@
+
+/****************************************************************************
+ *
+ * MODULE: xganim
+ * AUTHOR(S): Bill Brown <brown gis.uiuc.edu> CERL (original contributor),
+ * Markus Neteler <neteler itc.it>,
+ * Roberto Flor <flor itc.it>,
+ * Bernhard Reiter <bernhard intevation.de>,
+ * Brad Douglas <rez touchofmadness.com>,
+ * Glynn Clements <glynn gclements.plus.com>
+ * PURPOSE: a tool for animating a series of GRASS raster files
+ * COPYRIGHT: (C) 1999-2006 by the GRASS Development Team
+ *
+ * This program is free software under the GNU General Public
+ * License (>=v2). Read the file COPYING that comes with GRASS
+ * for details.
+ *
+ *****************************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include <wx/image.h>
+#include <wx/bitmap.h>
+#include <wx/event.h>
+
+extern "C" {
+#include <grass/gis.h>
+#include <grass/glocale.h>
+}
+
+#include "gui.h"
+
+#define DEF_MAX 900
+#define DEF_MIN 600
+#define BORDER_W 2
+
+static char **gee_wildfiles(char *wildarg, char *element, int *num);
+static void parse_command(
+ struct Option **viewopts, char *vfiles[MAXVIEWS][MAXIMAGES],
+ int *numviews, int *numframes);
+
+struct Option *viewopts[MAXVIEWS];
+
+unsigned int nrows, ncols;
+char *vfiles[MAXVIEWS][MAXIMAGES];
+int numviews;
+int frames;
+int Top = 0, Left = 0;
+char frame[MAXIMAGES][4];
+int LabelPos[MAXVIEWS][2];
+
+float vscale, scale; /* resampling scale factors */
+int irows, icols, vrows, vcols;
+
+BEGIN_EVENT_TABLE(MyApp, wxApp)
+EVT_IDLE(MyApp::do_run)
+END_EVENT_TABLE()
+
+int main(int argc, char **argv)
+{
+ int i;
+
+ G_gisinit(argv[0]);
+
+
+ for (i = 0; i < MAXVIEWS; i++) {
+ char buf[BUFSIZ];
+ viewopts[i] = G_define_option();
+ sprintf(buf, "view%d", i + 1);
+ viewopts[i]->key = G_store(buf);
+ viewopts[i]->type = TYPE_STRING;
+ viewopts[i]->required = (i ? NO : YES);
+ viewopts[i]->multiple = YES;
+ viewopts[i]->gisprompt = "old,cell,Raster";;
+ sprintf(buf, _("Raster file(s) for View%d"), i + 1);
+ viewopts[i]->description = G_store(buf);
+ }
+
+ if (G_parser(argc, argv))
+ exit(EXIT_FAILURE);
+
+ parse_command(viewopts, vfiles, &numviews, &frames);
+
+ return wxEntry(argc, argv);
+}
+
+bool MyApp::OnInit()
+{
+ int i, j;
+ unsigned int *sdimp;
+ int longdim;
+
+ /* debug */
+ if (G_verbose() > G_verbose_std()) {
+ for (i = 0; i < numviews; i++) {
+ fprintf(stderr, "\nVIEW %d: ", i + 1);
+ for (j = 0; j < frames; j++) {
+ fprintf(stderr, "%s ", vfiles[i][j]);
+ }
+ }
+ }
+ fprintf(stderr, "\n");
+
+ vrows = G_window_rows();
+ vcols = G_window_cols();
+ nrows = vrows;
+ ncols = vcols;
+
+ /* short dimension */
+ sdimp = nrows > ncols ? &ncols : &nrows;
+
+ /* these proportions should work fine for 1 or 4 views, but for
+ 2 views, want to double the narrow dim & for 3 views triple it */
+ if (numviews == 2)
+ *sdimp *= 2;
+ else if (numviews == 3)
+ *sdimp *= 3;
+
+ longdim = nrows > ncols ? nrows : ncols;
+
+ scale = 1.0;
+
+ { /* find animation image size */
+ int max, min;
+ char *p;
+
+ max = DEF_MAX;
+ min = DEF_MIN;
+
+ if ((p = getenv("XGANIM_SIZE")))
+ max = min = atoi(p);
+
+ if (longdim > max) /* scale down */
+ scale = (float)max / longdim;
+ else if (longdim < min) /* scale up */
+ scale = (float)min / longdim;
+ }
+
+ vscale = scale;
+ if (numviews == 4)
+ vscale = scale / 2.;
+
+ nrows = (unsigned int) (nrows * scale);
+ ncols = (unsigned int) (ncols * scale);
+ /* now nrows & ncols are the size of the combined - views image */
+ vrows = (int) (vrows * vscale);
+ vcols = (int) (vcols * vscale);
+ /* now vrows & vcols are the size for each sub-image */
+
+ /* add to nrows & ncols for borders */
+ /* irows, icols used for vert/horizontal determination in loop below */
+ irows = nrows;
+ icols = ncols;
+ nrows += (1 + (nrows / vrows)) * BORDER_W;
+ ncols += (1 + (ncols / vcols)) * BORDER_W;
+
+ gd.speed = 100;
+ gd.direction = 1;
+ gd.shownames = 1;
+
+ mainwin = new MyFrame(wxString("GRASS Animate", wxConvISO8859_1), ncols, nrows, &gd);
+ mainwin->Show();
+ SetTopWindow(mainwin);
+
+ for (j = 0; j < MAXIMAGES; j++)
+ sprintf(frame[j], "%2d", j + 1);
+
+ return true;
+}
+
+
+int MyApp::load_files(void)
+{
+ DCELL *dcell;
+ unsigned char *tr, *tg, *tb, *tset;
+ int tsiz, coff;
+ int rowoff, row, col, vxoff, vyoff;
+ int cnt, ret, fd;
+ int vnum;
+ const char *name;
+ struct Colors colors;
+
+ dcell = G_allocate_d_raster_buf();
+
+ tsiz = G_window_cols();
+
+ /* allocate memory */
+ tr = (unsigned char *) G_malloc(tsiz * sizeof(char));
+ tg = (unsigned char *) G_malloc(tsiz * sizeof(char));
+ tb = (unsigned char *) G_malloc(tsiz * sizeof(char));
+ tset = (unsigned char *) G_malloc(tsiz * sizeof(char));
+
+ wxImage img(ncols, nrows);
+
+ for (cnt = 0; cnt < frames; cnt++) {
+ if (cnt > MAXIMAGES) {
+ cnt--;
+ break;
+ }
+
+ for (vnum = 0; vnum < numviews; vnum++) {
+ if (icols == vcols) {
+ vxoff = BORDER_W;
+ vyoff = (irows == vrows) ? BORDER_W :
+ BORDER_W + vnum * (BORDER_W + vrows);
+ }
+ else if (irows == vrows) {
+ vxoff = (icols == vcols) ? BORDER_W :
+ BORDER_W + vnum * (BORDER_W + vcols);
+ vyoff = BORDER_W;
+ }
+ else { /* 4 views */
+ /* assumes we want :
+ view1 view2
+
+ view3 view4
+ */
+ vxoff = vnum % 2 ? BORDER_W : vcols + 2 * BORDER_W;
+ vyoff = vnum > 1 ? vrows + 2 * BORDER_W : BORDER_W;
+ }
+ if (!cnt) {
+ LabelPos[vnum][0] = vxoff;
+ LabelPos[vnum][1] = vyoff + vrows - 1;
+ }
+
+ name = vfiles[vnum][cnt];
+ G_message(_("Reading file [%s]..."), name);
+
+ fd = G_open_cell_old(name, "");
+ if (fd < 0)
+ G_fatal_error(_("Unable to open raster map <%s>"), name);
+ /*
+ strcpy(title[cnt],G_get_cell_title(name, mapset));
+ */
+
+ ret = G_read_colors(name, "", &colors);
+ if (ret < 0)
+ G_fatal_error(_("Unable to read color file"));
+
+ for (row = 0; row < vrows; row++) {
+ if (G_get_d_raster_row(fd, dcell, (int)(row / vscale)) < 0)
+ G_fatal_error(_("Unable to read raster row"));
+
+ rowoff = (vyoff + row) * ncols;
+ G_lookup_d_raster_colors(dcell, tr, tg, tb, tset, tsiz, &colors);
+
+ for (col = 0; col < vcols; col++) {
+ coff = (int)(col / vscale);
+
+ if (!tset[coff])
+ img.SetRGB(vxoff + col, vyoff + row, 255, 255, 255);
+ else
+ img.SetRGB(vxoff + col, vyoff + row, tr[coff], tg[coff], tb[coff]);
+ }
+ }
+
+ G_close_cell(fd);
+ }
+
+ wxBitmap *bmp = new wxBitmap(img);
+ pic_array[cnt] = bmp;
+
+ mainwin->canvas->draw_image(bmp);
+ mainwin->change_label(frame[cnt]);
+ }
+
+ G_free(dcell);
+ G_free(tr);
+ G_free(tg);
+ G_free(tb);
+ G_free(tset);
+
+ return cnt;
+}
+
+
+/* ###################################################### */
+
+void MyApp::do_run(wxIdleEvent &ev)
+{
+ static int first = 1;
+ struct gui_data *cd = &gd;
+ int i, cnt;
+
+ if (first) {
+ first = 0;
+ cnt = load_files();
+ cd->curframe = cd->direction > 0 ? 0 : cnt - 1;
+ cd->prevframe = cd->curframe;
+ cd->step = cd->stop = 0;
+ cd->loop = cd->swing = 0;
+ cd->nframes = cnt;
+
+ }
+
+ if (cd->rewind) {
+ cd->rewind = 0;
+ cd->curframe = 0;
+ cd->direction = 1;
+ cd->step = 1;
+ }
+
+ if (cd->swing) {
+ if (cd->curframe == cd->nframes || cd->curframe < 0) {
+ cd->direction = -cd->direction;
+ cd->curframe += cd->direction;
+ }
+ }
+ else if (cd->loop) {
+ if (cd->curframe == cd->nframes)
+ cd->curframe = 0;
+ else if (cd->curframe < 0)
+ cd->curframe = cd->nframes - 1;
+ }
+ else if (cd->curframe == cd->nframes || cd->curframe < 0)
+ cd->stop = 1;
+
+ if (cd->stop && !cd->step)
+ return;
+
+ if (cd->curframe < cd->nframes && cd->curframe >= 0) {
+ /* little pause */
+ {
+ float tf;
+
+ for (tf = 0.0; tf < cd->speed; tf += .01) ;
+ }
+
+ mainwin->canvas->draw_image(pic_array[cd->curframe]);
+
+ /* draw labels */
+ for (i = 0; i < numviews; i++) {
+ mainwin->canvas->draw_text(
+ cd->shownames,
+ LabelPos[i][0] + 5, LabelPos[i][1] - 5,
+ vfiles[i][cd->curframe]);
+ }
+
+ mainwin->change_label(frame[cd->curframe]);
+
+ cd->prevframe = cd->curframe;
+ }
+
+ cd->curframe += cd->direction;
+
+ if (cd->step) {
+ cd->step = 0;
+ cd->stop = 1;
+ }
+}
+
+
+/* ###################################################### */
+
+char **gee_wildfiles(char *wildarg, char *element, int *num)
+{
+ int n, cnt = 0;
+ char path[GPATH_MAX], *mapset, cmd[GPATH_MAX], buf[512];
+ char *p, *tfile;
+ static char *newfiles[MAXIMAGES];
+ FILE *tf;
+
+ *num = 0;
+ tfile = G_tempfile();
+
+ /* build list of filenames */
+ for (n = 0; (mapset = G__mapset_name(n)); n++) {
+ if (strcmp(mapset, ".") == 0)
+ mapset = G_mapset();
+
+ G__file_name(path, element, "", mapset);
+ if (access(path, 0) == 0) {
+ sprintf(cmd, "cd %s; \\ls %s >> %s 2> /dev/null", path, wildarg,
+ tfile);
+ system(cmd);
+ }
+ }
+
+ if (NULL == (tf = fopen(tfile, "r")))
+ G_warning(_("Error reading wildcard"));
+ else {
+ while (NULL != fgets(buf, 512, tf)) {
+ /* replace newline with null */
+ if ((p = strchr(buf, '\n')))
+ *p = '\0';
+ /* replace first space with null */
+ else if ((p = strchr(buf, ' ')))
+ *p = '\0';
+
+ if (strlen(buf) > 1) {
+ newfiles[cnt++] = G_store(buf);
+ }
+ }
+ fclose(tf);
+ }
+ *num = cnt;
+ G_free(tfile);
+
+ return (newfiles);
+}
+
+
+/********************************************************************/
+void parse_command(struct Option **viewopts,
+ char *vfiles[MAXVIEWS][MAXIMAGES],
+ int *numviews, int *numframes)
+{
+ int i, j, k;
+
+ *numviews = *numframes = 0;
+
+ for (i = 0; i < MAXVIEWS; i++) {
+ if (viewopts[i]->answers) {
+ int numi, wildnum;
+
+ (*numviews)++;
+
+ for (j = 0, numi = 0; viewopts[i]->answers[j]; j++) {
+ if ((NULL != strchr(viewopts[i]->answers[j], '*')) ||
+ (NULL != strchr(viewopts[i]->answers[j], '?')) ||
+ (NULL != strchr(viewopts[i]->answers[j], '['))) {
+ char **wildfiles = gee_wildfiles(viewopts[i]->answers[j],
+ "cell", &wildnum);
+
+ for (k = 0; k < wildnum; k++)
+ vfiles[i][numi++] = wildfiles[k];
+ }
+ else
+ vfiles[i][numi++] = G_store(viewopts[i]->answers[j]);
+ }
+ /* keep track of smallest number of frames */
+ *numframes =
+ *numframes ? *numframes > numi ? numi : *numframes : numi;
+ }
+ }
+}
+
+IMPLEMENT_APP_NO_MAIN(MyApp)
+
More information about the grass-commit
mailing list