[GRASS-SVN] r32854 - grass/trunk
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Aug 18 09:38:03 EDT 2008
Author: glynn
Date: 2008-08-18 09:38:03 -0400 (Mon, 18 Aug 2008)
New Revision: 32854
Modified:
grass/trunk/aclocal.m4
grass/trunk/configure
grass/trunk/configure.in
Log:
Add macros for --with-<package>-ldflags= option
Add --with-cairo-{includes,libs,ldflags}= options
Modified: grass/trunk/aclocal.m4
===================================================================
--- grass/trunk/aclocal.m4 2008-08-18 09:14:33 UTC (rev 32853)
+++ grass/trunk/aclocal.m4 2008-08-18 13:38:03 UTC (rev 32854)
@@ -86,6 +86,17 @@
fi
])
+AC_DEFUN([LOC_CHECK_LDFLAGS],[
+AC_MSG_CHECKING(for $2 linking flags)
+case "$with_$1_ldflags" in
+y | ye | yes | n | no)
+ AC_MSG_ERROR([*** You must supply a directory to --with-$1-ldflags.])
+ ;;
+esac
+AC_MSG_RESULT($with_$1_ldflags)
+$3="$$3 $with_$1_ldflags"
+])
+
AC_DEFUN([LOC_CHECK_INCLUDES],[
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$3 $CPPFLAGS"
@@ -268,6 +279,11 @@
LOC_PAD([ --with-$1-libs=DIRS])[$2 library files are in DIRS])
])
+AC_DEFUN([LOC_ARG_WITH_LDFLAGS],[
+AC_ARG_WITH($1-ldflags,
+LOC_PAD([ --with-$1-ldflags=FLAGS])[$2 needs FLAGS when linking])
+])
+
AC_DEFUN([LOC_ARG_WITH_SHARE],[
AC_ARG_WITH($1-share,
LOC_PAD([ --with-$1-share=DIR])[$2 data files are in DIR])
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2008-08-18 09:14:33 UTC (rev 32853)
+++ grass/trunk/configure 2008-08-18 13:38:03 UTC (rev 32854)
@@ -161,6 +161,14 @@
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
+ --with-cairo-libs=DIRS cairo library files are in DIRS"
+ac_help="$ac_help
+ --with-cairo-ldflags=FLAGS
+ cairo needs FLAGS when linking"
+ac_help="$ac_help
--with-freetype-includes=DIRS
FreeType include files are in DIRS"
ac_help="$ac_help
@@ -715,7 +723,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:719: checking host system type" >&5
+echo "configure:727: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -738,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:742: 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.
@@ -765,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:769: 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.
@@ -813,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:817: 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.
@@ -842,7 +850,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:846: 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.
@@ -853,12 +861,12 @@
cat > conftest.$ac_ext << EOF
-#line 857 "configure"
+#line 865 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:862: \"$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
@@ -884,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:888: 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:893: 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:900: \"$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
@@ -914,7 +922,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:918: 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
@@ -943,10 +951,10 @@
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:947: checking for Cygwin environment" >&5
+echo "configure:955: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 950 "configure"
+#line 958 "configure"
#include "confdefs.h"
int main() {
@@ -957,7 +965,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:961: \"$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
@@ -973,17 +981,17 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:977: checking for mingw32 environment" >&5
+echo "configure:985: checking for mingw32 environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 980 "configure"
+#line 988 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:987: \"$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
@@ -1001,7 +1009,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1005: 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
@@ -1020,23 +1028,23 @@
IEEEFLAG=
echo $ac_n "checking for full floating-point support""... $ac_c" 1>&6
-echo "configure:1024: 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:1029: 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 1033 "configure"
+#line 1041 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1040: \"$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"
@@ -1052,7 +1060,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 1056 "configure"
+#line 1064 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1066,7 +1074,7 @@
}
EOF
-if { (eval echo configure:1070: \"$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
@@ -1079,14 +1087,14 @@
CFLAGS=-mieee
echo $ac_n "checking for full floating-point support with -mieee""... $ac_c" 1>&6
-echo "configure:1083: 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 1090 "configure"
+#line 1098 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1100,7 +1108,7 @@
}
EOF
-if { (eval echo configure:1104: \"$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"
@@ -1137,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:1141: checking for $ac_word" >&5
+echo "configure:1149: checking for $ac_word" >&5
case "$pwd" in
/*)
@@ -1175,7 +1183,7 @@
fi
echo $ac_n "checking for source directory""... $ac_c" 1>&6
-echo "configure:1179: checking for source directory" >&5
+echo "configure:1187: checking for source directory" >&5
if test -z "$srcdir" ; then
SRCDIR=`$pwd`
@@ -1186,7 +1194,7 @@
echo "$ac_t"""$SRCDIR"" 1>&6
echo $ac_n "checking for build directory""... $ac_c" 1>&6
-echo "configure:1190: checking for build directory" >&5
+echo "configure:1198: checking for build directory" >&5
DSTDIR=`$pwd`
WINDSTDIR=`$winpwd`
@@ -1271,7 +1279,7 @@
echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1275: 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= ;;
@@ -1294,7 +1302,7 @@
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1298: 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"
@@ -1337,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:1341: 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.
@@ -1362,7 +1370,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1366: 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=
@@ -1375,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 1379 "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:1385: \"$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
:
@@ -1392,13 +1400,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1396 "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:1402: \"$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
:
@@ -1409,13 +1417,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1413 "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:1419: \"$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
:
@@ -1443,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:1447: 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"
@@ -1463,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:1467: 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"
@@ -1487,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:1491: 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
@@ -1513,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:1517: 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 1523 "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
@@ -1530,7 +1538,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:1534: \"$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
@@ -1577,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:1581: 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.
@@ -1706,13 +1714,13 @@
# known GMT value.
echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:1710: 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 1716 "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
@@ -1723,7 +1731,7 @@
gettimeofday()
; return 0; }
EOF
-if { (eval echo configure:1727: \"$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
@@ -1764,13 +1772,13 @@
# is always linked to, for compatibility.
#-----------------------------------------------------------
echo $ac_n "checking for inet_ntoa in -lbind""... $ac_c" 1>&6
-echo "configure:1768: 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 1774 "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
@@ -1781,7 +1789,7 @@
inet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1785: \"$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
@@ -1842,13 +1850,13 @@
SHLIB_SUFFIX=".sl"
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1846: 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 1852 "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
@@ -1859,7 +1867,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:1863: \"$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
@@ -1924,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:1928: 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 1934 "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
@@ -1941,7 +1949,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:1945: \"$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
@@ -2063,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:2067: checking for dld.h" >&5
+echo "configure:2075: checking for dld.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2070 "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:2075: \"$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*
@@ -2131,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:2135: checking for dld.h" >&5
+echo "configure:2143: checking for dld.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2138 "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:2143: \"$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*
@@ -2236,9 +2244,9 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2240: checking for ELF" >&5
+echo "configure:2248: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 2242 "configure"
+#line 2250 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -2268,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:2272: checking for dlfcn.h" >&5
+echo "configure:2280: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2275 "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:2280: \"$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*
@@ -2300,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:2304: checking for ELF" >&5
+echo "configure:2312: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 2306 "configure"
+#line 2314 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -2626,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:2630: 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 2633 "configure"
+#line 2641 "configure"
#include "confdefs.h"
int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2640: \"$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
@@ -3285,6 +3293,31 @@
+# Check whether --with-cairo-includes or --without-cairo-includes was given.
+if test "${with_cairo_includes+set}" = set; then
+ withval="$with_cairo_includes"
+ :
+fi
+
+
+
+# Check whether --with-cairo-libs or --without-cairo-libs was given.
+if test "${with_cairo_libs+set}" = set; then
+ withval="$with_cairo_libs"
+ :
+fi
+
+
+
+# Check whether --with-cairo-ldflags or --without-cairo-ldflags was given.
+if test "${with_cairo_ldflags+set}" = set; then
+ withval="$with_cairo_ldflags"
+ :
+fi
+
+
+
+
# Check whether --with-freetype-includes or --without-freetype-includes was given.
if test "${with_freetype_includes+set}" = set; then
withval="$with_freetype_includes"
@@ -3352,7 +3385,7 @@
# Done checking fortran
echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:3356: 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; }
@@ -3375,7 +3408,7 @@
# With libs option
echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:3379: 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; }
@@ -3409,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:3413: 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=":"
@@ -3462,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:3466: 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.
@@ -3493,13 +3526,13 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3497: 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 3503 "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
@@ -3510,7 +3543,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:3514: \"$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
@@ -3535,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:3539: checking for $ac_word" >&5
+echo "configure:3572: checking for $ac_word" >&5
case "$LEXPATH" in
/*)
@@ -3575,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:3579: 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.
@@ -3606,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:3610: checking for $ac_word" >&5
+echo "configure:3643: checking for $ac_word" >&5
case "$YACCPATH" in
/*)
@@ -3644,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:3648: 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.
@@ -3673,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:3677: 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.
@@ -3704,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:3708: 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.
@@ -3733,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:3737: checking for $ac_word" >&5
+echo "configure:3770: checking for $ac_word" >&5
case "$PERL" in
/*)
@@ -3764,10 +3797,10 @@
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3768: checking for ANSI C header files" >&5
+echo "configure:3801: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3771 "configure"
+#line 3804 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3775,7 +3808,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3779: \"$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*
@@ -3792,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 3796 "configure"
+#line 3829 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -3810,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 3814 "configure"
+#line 3847 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -3831,7 +3864,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 3835 "configure"
+#line 3868 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3842,7 +3875,7 @@
exit (0); }
EOF
-if { (eval echo configure:3846: \"$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
@@ -3869,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:3873: checking for $ac_hdr" >&5
+echo "configure:3906: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3876 "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:3881: \"$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*
@@ -3906,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:3910: checking for $ac_hdr" >&5
+echo "configure:3943: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3913 "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:3918: \"$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*
@@ -3943,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:3947: checking for $ac_hdr" >&5
+echo "configure:3980: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3950 "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:3955: \"$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*
@@ -3980,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:3984: checking for $ac_hdr" >&5
+echo "configure:4017: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3987 "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:3992: \"$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*
@@ -4017,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:4021: checking for $ac_hdr" >&5
+echo "configure:4054: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4024 "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:4029: \"$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*
@@ -4051,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:4055: 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 4058 "configure"
+#line 4091 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -4063,7 +4096,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:4067: \"$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
@@ -4083,10 +4116,10 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4087: checking for off_t" >&5
+echo "configure:4120: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4090 "configure"
+#line 4123 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -4113,10 +4146,10 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4117: 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 4120 "configure"
+#line 4153 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -4144,10 +4177,10 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4148: checking return type of signal handlers" >&5
+echo "configure:4181: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 4151 "configure"
+#line 4184 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -4164,7 +4197,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:4168: \"$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
@@ -4182,10 +4215,10 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4186: checking for Cygwin environment" >&5
+echo "configure:4219: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 4189 "configure"
+#line 4222 "configure"
#include "confdefs.h"
int main() {
@@ -4196,7 +4229,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:4200: \"$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
@@ -4214,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:4218: checking for $ac_func" >&5
+echo "configure:4251: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4221 "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. */
@@ -4240,7 +4273,7 @@
; return 0; }
EOF
-if { (eval echo configure:4244: \"$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
@@ -4266,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:4270: checking for $ac_func" >&5
+echo "configure:4303: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4273 "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. */
@@ -4292,7 +4325,7 @@
; return 0; }
EOF
-if { (eval echo configure:4296: \"$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
@@ -4318,10 +4351,10 @@
for ac_func in drand48
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4322: checking for $ac_func" >&5
+echo "configure:4355: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4325 "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. */
@@ -4344,7 +4377,7 @@
; return 0; }
EOF
-if { (eval echo configure:4348: \"$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
@@ -4370,10 +4403,10 @@
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4374: checking for $ac_func" >&5
+echo "configure:4407: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4377 "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. */
@@ -4396,7 +4429,7 @@
; return 0; }
EOF
-if { (eval echo configure:4400: \"$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
@@ -4422,10 +4455,10 @@
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4426: checking for $ac_func" >&5
+echo "configure:4459: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4429 "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. */
@@ -4448,7 +4481,7 @@
; return 0; }
EOF
-if { (eval echo configure:4452: \"$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
@@ -4473,13 +4506,13 @@
if test "$cross_compiling" != "yes" ; then
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:4477: 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 4483 "configure"
+#line 4516 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -4499,7 +4532,7 @@
}
EOF
-if { (eval echo configure:4503: \"$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
@@ -4527,16 +4560,16 @@
fi
echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:4531: checking for long long int" >&5
+echo "configure:4564: checking for long long int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4533 "configure"
+#line 4566 "configure"
#include "confdefs.h"
int main() {
long long int x;
; return 0; }
EOF
-if { (eval echo configure:4540: \"$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
@@ -4556,7 +4589,7 @@
rm -f conftest*
echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:4560: 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; } ;;
@@ -4584,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:4588: 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
@@ -4644,12 +4677,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 4648 "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:4653: \"$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*
@@ -4718,14 +4751,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4722 "configure"
+#line 4755 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:4729: \"$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.
@@ -4830,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:4834: 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 4837 "configure"
+#line 4870 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4844: \"$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
@@ -4856,14 +4889,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 4860 "configure"
+#line 4893 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:4867: \"$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
@@ -4895,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:4899: 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 4905 "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
@@ -4912,7 +4945,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4916: \"$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
@@ -4933,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:4937: 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 4943 "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
@@ -4950,7 +4983,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4954: \"$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
@@ -4978,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:4982: checking for gethostbyname" >&5
+echo "configure:5015: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 4985 "configure"
+#line 5018 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -5004,7 +5037,7 @@
; return 0; }
EOF
-if { (eval echo configure:5008: \"$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
@@ -5024,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:5028: 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 5034 "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
@@ -5041,7 +5074,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:5045: \"$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
@@ -5070,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:5074: checking for connect" >&5
+echo "configure:5107: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 5077 "configure"
+#line 5110 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -5096,7 +5129,7 @@
; return 0; }
EOF
-if { (eval echo configure:5100: \"$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
@@ -5116,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:5120: 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 5126 "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
@@ -5133,7 +5166,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:5137: \"$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
@@ -5156,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:5160: checking for remove" >&5
+echo "configure:5193: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 5163 "configure"
+#line 5196 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -5182,7 +5215,7 @@
; return 0; }
EOF
-if { (eval echo configure:5186: \"$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
@@ -5202,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:5206: 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 5212 "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
@@ -5219,7 +5252,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:5223: \"$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
@@ -5242,10 +5275,10 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5246: checking for shmat" >&5
+echo "configure:5279: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 5249 "configure"
+#line 5282 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -5268,7 +5301,7 @@
; return 0; }
EOF
-if { (eval echo configure:5272: \"$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
@@ -5288,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:5292: 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 5298 "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
@@ -5305,7 +5338,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:5309: \"$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
@@ -5337,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:5341: 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 5347 "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
@@ -5354,7 +5387,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:5358: \"$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
@@ -5394,12 +5427,12 @@
LIBS=""
echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:5398: 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 5403 "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
@@ -5410,7 +5443,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:5414: \"$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
@@ -5421,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 5425 "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
@@ -5432,7 +5465,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:5436: \"$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
@@ -5458,10 +5491,10 @@
# Note: -lxdr -liberty -lws2_32 is for MinGW
echo $ac_n "checking for xdrmem_create""... $ac_c" 1>&6
-echo "configure:5462: checking for xdrmem_create" >&5
+echo "configure:5495: checking for xdrmem_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 5465 "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. */
@@ -5484,7 +5517,7 @@
; return 0; }
EOF
-if { (eval echo configure:5488: \"$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
@@ -5502,13 +5535,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
-echo "configure:5506: 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 5512 "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
@@ -5519,7 +5552,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5523: \"$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
@@ -5538,13 +5571,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
-echo "configure:5542: 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 5548 "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
@@ -5555,7 +5588,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5559: \"$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
@@ -5574,13 +5607,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
-echo "configure:5578: 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 5584 "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
@@ -5591,7 +5624,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5595: \"$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
@@ -5610,13 +5643,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lxdr""... $ac_c" 1>&6
-echo "configure:5614: 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 5620 "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
@@ -5627,7 +5660,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:5631: \"$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
@@ -5661,10 +5694,10 @@
for ac_func in asprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5665: checking for $ac_func" >&5
+echo "configure:5698: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5668 "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. */
@@ -5687,7 +5720,7 @@
; return 0; }
EOF
-if { (eval echo configure:5691: \"$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
@@ -5714,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:5718: checking for atan" >&5
+echo "configure:5751: checking for atan" >&5
cat > conftest.$ac_ext <<EOF
-#line 5721 "configure"
+#line 5754 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atan(); below. */
@@ -5740,7 +5773,7 @@
; return 0; }
EOF
-if { (eval echo configure:5744: \"$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
@@ -5758,13 +5791,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:5762: 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 5768 "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
@@ -5775,7 +5808,7 @@
atan()
; return 0; }
EOF
-if { (eval echo configure:5779: \"$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
@@ -5802,10 +5835,10 @@
echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:5806: checking for dlsym" >&5
+echo "configure:5839: checking for dlsym" >&5
cat > conftest.$ac_ext <<EOF
-#line 5809 "configure"
+#line 5842 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym(); below. */
@@ -5828,7 +5861,7 @@
; return 0; }
EOF
-if { (eval echo configure:5832: \"$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
@@ -5846,13 +5879,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:5850: 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 5856 "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
@@ -5863,7 +5896,7 @@
dlsym()
; return 0; }
EOF
-if { (eval echo configure:5867: \"$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
@@ -5890,10 +5923,10 @@
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:5894: checking for iconv" >&5
+echo "configure:5927: checking for iconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 5897 "configure"
+#line 5930 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -5916,7 +5949,7 @@
; return 0; }
EOF
-if { (eval echo configure:5920: \"$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
@@ -5934,13 +5967,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:5938: 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 5944 "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
@@ -5951,7 +5984,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:5955: \"$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
@@ -5970,13 +6003,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:5974: 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 5980 "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
@@ -5987,7 +6020,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:5991: \"$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
@@ -6006,10 +6039,10 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:6010: checking for libiconv" >&5
+echo "configure:6043: checking for libiconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 6013 "configure"
+#line 6046 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -6032,7 +6065,7 @@
; return 0; }
EOF
-if { (eval echo configure:6036: \"$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
@@ -6050,13 +6083,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:6054: 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 6060 "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
@@ -6067,7 +6100,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:6071: \"$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
@@ -6086,13 +6119,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6090: 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 6096 "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
@@ -6103,7 +6136,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:6107: \"$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
@@ -6140,10 +6173,10 @@
have_socket=1
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:6144: checking for socket" >&5
+echo "configure:6177: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 6147 "configure"
+#line 6180 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -6166,7 +6199,7 @@
; return 0; }
EOF
-if { (eval echo configure:6170: \"$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
@@ -6184,13 +6217,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6188: 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 6194 "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
@@ -6201,7 +6234,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:6205: \"$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
@@ -6249,7 +6282,7 @@
echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:6253: 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; }
@@ -6275,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:6279: checking for $ac_hdr" >&5
+echo "configure:6312: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6282 "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:6287: \"$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*
@@ -6317,7 +6350,7 @@
echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:6321: 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; }
@@ -6342,13 +6375,13 @@
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:6346: 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 6352 "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
@@ -6359,7 +6392,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:6363: \"$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
@@ -6407,7 +6440,7 @@
echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
-echo "configure:6411: 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; }
@@ -6433,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:6437: checking for $ac_hdr" >&5
+echo "configure:6470: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6440 "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:6445: \"$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*
@@ -6478,7 +6511,7 @@
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:6482: 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
@@ -6486,7 +6519,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6490 "configure"
+#line 6523 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6498,7 +6531,7 @@
}
EOF
-if { (eval echo configure:6502: \"$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
@@ -6523,7 +6556,7 @@
echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:6527: 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; }
@@ -6548,13 +6581,13 @@
echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:6552: 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 6558 "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
@@ -6565,7 +6598,7 @@
pj_get_def()
; return 0; }
EOF
-if { (eval echo configure:6569: \"$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
@@ -6599,7 +6632,7 @@
echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
-echo "configure:6603: 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; }
@@ -6623,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:6627: 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:6634: 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; }
@@ -6662,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:6666: checking for $ac_word" >&5
+echo "configure:6699: checking for $ac_word" >&5
case "$NAD2BIN" in
/*)
@@ -6702,7 +6735,7 @@
echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:6706: checking whether to use Readline" >&5
+echo "configure:6739: checking whether to use Readline" >&5
echo "$ac_t"""$with_readline"" 1>&6
case "$with_readline" in
"no") USE_READLINE= ;;
@@ -6723,7 +6756,7 @@
echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:6727: checking for location of Readline includes" >&5
+echo "configure:6760: 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; }
@@ -6749,15 +6782,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6753: checking for $ac_hdr" >&5
+echo "configure:6786: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6756 "configure"
+#line 6789 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6794: \"$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*
@@ -6793,15 +6826,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6797: checking for $ac_hdr" >&5
+echo "configure:6830: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6800 "configure"
+#line 6833 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6838: \"$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*
@@ -6835,7 +6868,7 @@
echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:6839: checking for location of Readline library" >&5
+echo "configure:6872: 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; }
@@ -6860,13 +6893,13 @@
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:6864: checking for readline in -lreadline" >&5
+echo "configure:6897: 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 6870 "configure"
+#line 6903 "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
@@ -6877,7 +6910,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:6881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6914: \"$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
@@ -6912,13 +6945,13 @@
echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:6916: checking for add_history in -lhistory" >&5
+echo "configure:6949: 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 6922 "configure"
+#line 6955 "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
@@ -6929,7 +6962,7 @@
add_history()
; return 0; }
EOF
-if { (eval echo configure:6933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6966: \"$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
@@ -6972,7 +7005,7 @@
echo $ac_n "checking whether to use JPEG""... $ac_c" 1>&6
-echo "configure:6976: checking whether to use JPEG" >&5
+echo "configure:7009: checking whether to use JPEG" >&5
echo "$ac_t"""$with_jpeg"" 1>&6
case "$with_jpeg" in
"no") USE_JPEG= ;;
@@ -6992,7 +7025,7 @@
echo $ac_n "checking for location of JPEG includes""... $ac_c" 1>&6
-echo "configure:6996: checking for location of JPEG includes" >&5
+echo "configure:7029: 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; }
@@ -7018,15 +7051,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7022: checking for $ac_hdr" >&5
+echo "configure:7055: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7025 "configure"
+#line 7058 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7063: \"$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*
@@ -7060,7 +7093,7 @@
echo $ac_n "checking for location of JPEG library""... $ac_c" 1>&6
-echo "configure:7064: checking for location of JPEG library" >&5
+echo "configure:7097: 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; }
@@ -7087,13 +7120,13 @@
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7091: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7124: 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 7097 "configure"
+#line 7130 "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
@@ -7104,7 +7137,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:7108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7141: \"$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
@@ -7123,13 +7156,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7127: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7160: 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 7133 "configure"
+#line 7166 "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
@@ -7140,7 +7173,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:7144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7177: \"$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
@@ -7189,7 +7222,7 @@
# GDAL option
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:7193: checking whether to use GDAL" >&5
+echo "configure:7226: checking whether to use GDAL" >&5
if test "`basename xx/$with_gdal`" = "gdal-config" ; then
GDAL_CONFIG="$with_gdal"
@@ -7202,7 +7235,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:7206: checking for $ac_word" >&5
+echo "configure:7239: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -7262,14 +7295,14 @@
LIBS="$LIBS $GDAL_LIBS"
CFLAGS="$CFLAGS $GDAL_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 7266 "configure"
+#line 7299 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:7273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -7278,14 +7311,14 @@
LIBS="$LIBS $GDAL_DEP_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7282 "configure"
+#line 7315 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:7289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7322: \"$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
@@ -7313,7 +7346,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:7317: checking whether to use TIFF" >&5
+echo "configure:7350: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -7333,7 +7366,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:7337: checking for location of TIFF includes" >&5
+echo "configure:7370: 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; }
@@ -7359,15 +7392,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7363: checking for $ac_hdr" >&5
+echo "configure:7396: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7366 "configure"
+#line 7399 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7404: \"$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*
@@ -7401,7 +7434,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:7405: checking for location of TIFF library" >&5
+echo "configure:7438: 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; }
@@ -7432,13 +7465,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7436: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7469: 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 7442 "configure"
+#line 7475 "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
@@ -7449,7 +7482,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7486: \"$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
@@ -7468,13 +7501,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7472: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7505: 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 7478 "configure"
+#line 7511 "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
@@ -7485,7 +7518,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7522: \"$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
@@ -7504,13 +7537,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7508: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7541: 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 7514 "configure"
+#line 7547 "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
@@ -7521,7 +7554,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7558: \"$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
@@ -7540,13 +7573,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7544: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7577: 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 7550 "configure"
+#line 7583 "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
@@ -7557,7 +7590,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7594: \"$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
@@ -7576,13 +7609,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7580: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7613: 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 7586 "configure"
+#line 7619 "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
@@ -7593,7 +7626,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7630: \"$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
@@ -7612,13 +7645,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7616: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7649: 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 7622 "configure"
+#line 7655 "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
@@ -7629,7 +7662,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7666: \"$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
@@ -7648,13 +7681,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7652: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7685: 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 7658 "configure"
+#line 7691 "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
@@ -7665,7 +7698,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7702: \"$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
@@ -7684,13 +7717,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7688: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7721: 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 7694 "configure"
+#line 7727 "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
@@ -7701,7 +7734,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7738: \"$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
@@ -7799,7 +7832,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:7803: checking whether to use PNG" >&5
+echo "configure:7836: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -7818,7 +7851,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:7822: checking for location of PNG includes" >&5
+echo "configure:7855: 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; }
@@ -7844,15 +7877,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7848: checking for $ac_hdr" >&5
+echo "configure:7881: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7851 "configure"
+#line 7884 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7889: \"$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*
@@ -7886,7 +7919,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:7890: checking for location of PNG library" >&5
+echo "configure:7923: 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; }
@@ -7911,13 +7944,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7915: checking for png_read_image in -lpng" >&5
+echo "configure:7948: 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 7921 "configure"
+#line 7954 "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
@@ -7928,7 +7961,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:7932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7965: \"$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
@@ -7970,7 +8003,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:7974: checking whether to use Tcl/Tk" >&5
+echo "configure:8007: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -7990,7 +8023,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:7994: checking for location of Tcl/Tk includes" >&5
+echo "configure:8027: 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; }
@@ -8016,15 +8049,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8020: checking for $ac_hdr" >&5
+echo "configure:8053: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8023 "configure"
+#line 8056 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8061: \"$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*
@@ -8061,15 +8094,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8065: checking for $ac_hdr" >&5
+echo "configure:8098: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8068 "configure"
+#line 8101 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8106: \"$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*
@@ -8103,7 +8136,7 @@
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:8107: checking Tcl version" >&5
+echo "configure:8140: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -8111,7 +8144,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8115 "configure"
+#line 8148 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8123,7 +8156,7 @@
}
EOF
-if { (eval echo configure:8127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8160: \"$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
@@ -8141,7 +8174,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:8145: checking Tk version" >&5
+echo "configure:8178: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -8149,7 +8182,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8153 "configure"
+#line 8186 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8161,7 +8194,7 @@
}
EOF
-if { (eval echo configure:8165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8198: \"$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
@@ -8190,7 +8223,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:8194: checking for location of Tcl/Tk library" >&5
+echo "configure:8227: 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; }
@@ -8220,13 +8253,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8224: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8257: 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 8230 "configure"
+#line 8263 "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
@@ -8237,7 +8270,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8274: \"$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
@@ -8256,13 +8289,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8260: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8293: 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 8266 "configure"
+#line 8299 "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
@@ -8273,7 +8306,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8310: \"$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
@@ -8300,13 +8333,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8304: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8337: 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 8310 "configure"
+#line 8343 "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
@@ -8317,7 +8350,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8354: \"$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
@@ -8336,13 +8369,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8340: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8373: 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 8346 "configure"
+#line 8379 "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
@@ -8353,7 +8386,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8390: \"$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
@@ -8380,13 +8413,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8384: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8417: 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 8390 "configure"
+#line 8423 "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
@@ -8397,7 +8430,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8434: \"$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
@@ -8416,13 +8449,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8420: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8453: 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 8426 "configure"
+#line 8459 "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
@@ -8433,7 +8466,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8470: \"$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
@@ -8511,13 +8544,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8515: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8548: 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 8521 "configure"
+#line 8554 "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
@@ -8528,7 +8561,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8565: \"$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
@@ -8547,13 +8580,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8551: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8584: 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 8557 "configure"
+#line 8590 "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
@@ -8564,7 +8597,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8601: \"$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
@@ -8591,13 +8624,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8595: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:8628: 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 8601 "configure"
+#line 8634 "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
@@ -8608,7 +8641,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8645: \"$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
@@ -8627,13 +8660,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8631: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:8664: 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 8637 "configure"
+#line 8670 "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
@@ -8644,7 +8677,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8681: \"$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
@@ -8671,13 +8704,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8675: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:8708: 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 8681 "configure"
+#line 8714 "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
@@ -8688,7 +8721,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8725: \"$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
@@ -8707,13 +8740,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8711: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:8744: 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 8717 "configure"
+#line 8750 "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
@@ -8724,7 +8757,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8761: \"$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,7 +8849,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:8820: checking whether to use PostgreSQL" >&5
+echo "configure:8853: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -8843,7 +8876,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:8847: checking for location of PostgreSQL includes" >&5
+echo "configure:8880: 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; }
@@ -8869,15 +8902,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8873: checking for $ac_hdr" >&5
+echo "configure:8906: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8876 "configure"
+#line 8909 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8914: \"$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*
@@ -8915,7 +8948,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:8919: checking for location of PostgreSQL library" >&5
+echo "configure:8952: 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; }
@@ -8944,13 +8977,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:8948: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8981: 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 8954 "configure"
+#line 8987 "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
@@ -8961,7 +8994,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:8965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8998: \"$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
@@ -8980,13 +9013,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:8984: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9017: 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 8990 "configure"
+#line 9023 "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
@@ -8997,7 +9030,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9034: \"$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
@@ -9016,13 +9049,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9020: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9053: 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 9026 "configure"
+#line 9059 "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
@@ -9033,7 +9066,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9070: \"$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
@@ -9052,13 +9085,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9056: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9089: 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 9062 "configure"
+#line 9095 "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
@@ -9069,7 +9102,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9106: \"$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
@@ -9126,13 +9159,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9130: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9163: 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 9136 "configure"
+#line 9169 "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
@@ -9143,7 +9176,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9180: \"$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
@@ -9165,13 +9198,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9169: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9202: 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 9175 "configure"
+#line 9208 "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
@@ -9182,7 +9215,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9219: \"$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
@@ -9225,7 +9258,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:9229: checking whether to use MySQL" >&5
+echo "configure:9262: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -9245,7 +9278,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:9249: checking for location of MySQL includes" >&5
+echo "configure:9282: 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; }
@@ -9271,15 +9304,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9275: checking for $ac_hdr" >&5
+echo "configure:9308: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9278 "configure"
+#line 9311 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9316: \"$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*
@@ -9316,7 +9349,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:9320: checking for location of MySQL library" >&5
+echo "configure:9353: 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; }
@@ -9347,13 +9380,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9351: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9384: 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 9357 "configure"
+#line 9390 "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
@@ -9364,7 +9397,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9401: \"$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
@@ -9383,13 +9416,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9387: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9420: 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 9393 "configure"
+#line 9426 "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
@@ -9400,7 +9433,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9437: \"$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
@@ -9419,13 +9452,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9423: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9456: 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 9429 "configure"
+#line 9462 "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
@@ -9436,7 +9469,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9473: \"$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
@@ -9455,13 +9488,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9459: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9492: 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 9465 "configure"
+#line 9498 "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
@@ -9472,7 +9505,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9509: \"$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
@@ -9491,13 +9524,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9495: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9528: 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 9501 "configure"
+#line 9534 "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
@@ -9508,7 +9541,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9545: \"$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
@@ -9527,13 +9560,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9531: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9564: 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 9537 "configure"
+#line 9570 "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
@@ -9544,7 +9577,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9581: \"$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
@@ -9563,13 +9596,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9567: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9600: 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 9573 "configure"
+#line 9606 "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
@@ -9580,7 +9613,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9617: \"$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
@@ -9599,13 +9632,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9603: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9636: 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 9609 "configure"
+#line 9642 "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
@@ -9616,7 +9649,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9653: \"$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
@@ -9706,7 +9739,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:9710: checking for $ac_word" >&5
+echo "configure:9743: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -9747,10 +9780,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:9751: checking for mysql_server_init" >&5
+echo "configure:9784: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 9754 "configure"
+#line 9787 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -9773,7 +9806,7 @@
; return 0; }
EOF
-if { (eval echo configure:9777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9810: \"$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
@@ -9811,7 +9844,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:9815: checking whether to use SQLite" >&5
+echo "configure:9848: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -9831,7 +9864,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:9835: checking for location of SQLite includes" >&5
+echo "configure:9868: 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; }
@@ -9857,15 +9890,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9861: checking for $ac_hdr" >&5
+echo "configure:9894: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9864 "configure"
+#line 9897 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9902: \"$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*
@@ -9908,7 +9941,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:9912: checking for location of SQLite library" >&5
+echo "configure:9945: 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; }
@@ -9935,13 +9968,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9939: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9972: 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 9945 "configure"
+#line 9978 "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
@@ -9952,7 +9985,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:9956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9989: \"$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
@@ -9971,13 +10004,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9975: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10008: 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 9981 "configure"
+#line 10014 "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
@@ -9988,7 +10021,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:9992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10025: \"$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
@@ -10041,7 +10074,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10045: checking whether to use FFMPEG" >&5
+echo "configure:10078: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -10061,7 +10094,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10065: checking for location of FFMPEG includes" >&5
+echo "configure:10098: 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; }
@@ -10087,15 +10120,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10091: checking for $ac_hdr" >&5
+echo "configure:10124: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10094 "configure"
+#line 10127 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10132: \"$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*
@@ -10131,15 +10164,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10135: checking for $ac_hdr" >&5
+echo "configure:10168: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10138 "configure"
+#line 10171 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10176: \"$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*
@@ -10175,15 +10208,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10179: checking for $ac_hdr" >&5
+echo "configure:10212: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10182 "configure"
+#line 10215 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10220: \"$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*
@@ -10226,7 +10259,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10230: checking for location of FFMPEG library" >&5
+echo "configure:10263: 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; }
@@ -10253,13 +10286,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10257: checking for av_free in -lavutil" >&5
+echo "configure:10290: 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 10263 "configure"
+#line 10296 "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
@@ -10270,7 +10303,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10307: \"$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
@@ -10289,13 +10322,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10293: checking for av_free in -lavutil" >&5
+echo "configure:10326: 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 10299 "configure"
+#line 10332 "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
@@ -10306,7 +10339,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10343: \"$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
@@ -10351,13 +10384,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10355: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10388: 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 10361 "configure"
+#line 10394 "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
@@ -10368,7 +10401,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10405: \"$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
@@ -10387,13 +10420,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10391: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10424: 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 10397 "configure"
+#line 10430 "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
@@ -10404,7 +10437,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10441: \"$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
@@ -10449,13 +10482,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10453: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10486: 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 10459 "configure"
+#line 10492 "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
@@ -10466,7 +10499,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10503: \"$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
@@ -10485,13 +10518,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10489: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10522: 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 10495 "configure"
+#line 10528 "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
@@ -10502,7 +10535,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10539: \"$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
@@ -10562,7 +10595,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:10566: checking whether to use OpenGL" >&5
+echo "configure:10599: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -10596,7 +10629,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10600: checking for location of OpenGL includes" >&5
+echo "configure:10633: 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; }
@@ -10622,15 +10655,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10626: checking for $ac_hdr" >&5
+echo "configure:10659: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10629 "configure"
+#line 10662 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10667: \"$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*
@@ -10664,7 +10697,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10668: checking for location of OpenGL library" >&5
+echo "configure:10701: 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; }
@@ -10693,13 +10726,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10697: checking for glBegin in -lGL" >&5
+echo "configure:10730: 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 10703 "configure"
+#line 10736 "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
@@ -10710,7 +10743,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10747: \"$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
@@ -10729,13 +10762,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10733: checking for glBegin in -lGL" >&5
+echo "configure:10766: 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 10739 "configure"
+#line 10772 "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
@@ -10746,7 +10779,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10783: \"$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
@@ -10765,13 +10798,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10769: checking for glBegin in -lGL" >&5
+echo "configure:10802: 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 10775 "configure"
+#line 10808 "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
@@ -10782,7 +10815,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10819: \"$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
@@ -10801,13 +10834,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10805: checking for glBegin in -lGL" >&5
+echo "configure:10838: 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 10811 "configure"
+#line 10844 "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
@@ -10818,7 +10851,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10855: \"$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
@@ -10880,13 +10913,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:10884: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:10917: 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 10890 "configure"
+#line 10923 "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
@@ -10897,7 +10930,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:10901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10934: \"$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
@@ -10916,13 +10949,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:10920: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:10953: 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 10926 "configure"
+#line 10959 "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
@@ -10933,7 +10966,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:10937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10970: \"$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
@@ -10980,10 +11013,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:10984: checking for glXCreatePbuffer" >&5
+echo "configure:11017: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 10987 "configure"
+#line 11020 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -11006,7 +11039,7 @@
; return 0; }
EOF
-if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11043: \"$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
@@ -11043,10 +11076,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11047: checking for glXCreateGLXPixmap" >&5
+echo "configure:11080: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 11050 "configure"
+#line 11083 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -11069,7 +11102,7 @@
; return 0; }
EOF
-if { (eval echo configure:11073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11106: \"$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
@@ -11112,7 +11145,7 @@
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:11116: checking for location of OpenGL framework" >&5
+echo "configure:11149: 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; }
@@ -11136,15 +11169,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11140: checking for $ac_hdr" >&5
+echo "configure:11173: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11143 "configure"
+#line 11176 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11181: \"$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*
@@ -11180,10 +11213,10 @@
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11184: checking for glBegin" >&5
+echo "configure:11217: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 11187 "configure"
+#line 11220 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -11206,7 +11239,7 @@
; return 0; }
EOF
-if { (eval echo configure:11210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11243: \"$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
@@ -11243,10 +11276,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11247: checking for gluBeginCurve" >&5
+echo "configure:11280: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 11250 "configure"
+#line 11283 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -11269,7 +11302,7 @@
; return 0; }
EOF
-if { (eval echo configure:11273: \"$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_gluBeginCurve=yes"
else
@@ -11317,7 +11350,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11321: checking for location of OpenGL includes" >&5
+echo "configure:11354: 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; }
@@ -11343,15 +11376,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11347: checking for $ac_hdr" >&5
+echo "configure:11380: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11350 "configure"
+#line 11383 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11388: \"$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*
@@ -11385,7 +11418,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11389: checking for location of OpenGL library" >&5
+echo "configure:11422: 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; }
@@ -11410,18 +11443,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11414: checking for OpenGL library" >&5
+echo "configure:11447: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 11418 "configure"
+#line 11451 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:11425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11445,18 +11478,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11449: checking for GLU library" >&5
+echo "configure:11482: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 11453 "configure"
+#line 11486 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:11460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11505,7 +11538,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11509: checking whether to use ODBC" >&5
+echo "configure:11542: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -11524,7 +11557,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11528: checking for location of ODBC includes" >&5
+echo "configure:11561: 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; }
@@ -11550,15 +11583,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11554: checking for $ac_hdr" >&5
+echo "configure:11587: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11557 "configure"
+#line 11590 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11595: \"$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*
@@ -11592,7 +11625,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:11596: checking for location of ODBC library" >&5
+echo "configure:11629: 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; }
@@ -11617,13 +11650,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:11621: checking for SQLConnect in -lodbc" >&5
+echo "configure:11654: 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 11627 "configure"
+#line 11660 "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
@@ -11634,7 +11667,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11671: \"$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
@@ -11659,13 +11692,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:11663: checking for SQLConnect in -liodbc" >&5
+echo "configure:11696: 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 11669 "configure"
+#line 11702 "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
@@ -11676,7 +11709,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11713: \"$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
@@ -11701,11 +11734,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:11705: checking for ODBC library" >&5
+echo "configure:11738: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 11709 "configure"
+#line 11742 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -11713,7 +11746,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:11717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11762,7 +11795,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:11766: checking whether to use FFTW" >&5
+echo "configure:11799: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -11781,7 +11814,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:11785: checking for location of FFTW includes" >&5
+echo "configure:11818: 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; }
@@ -11807,15 +11840,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11811: checking for $ac_hdr" >&5
+echo "configure:11844: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11814 "configure"
+#line 11847 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11852: \"$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*
@@ -11843,15 +11876,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11847: checking for $ac_hdr" >&5
+echo "configure:11880: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11850 "configure"
+#line 11883 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11888: \"$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*
@@ -11879,15 +11912,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11883: checking for $ac_hdr" >&5
+echo "configure:11916: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11886 "configure"
+#line 11919 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11924: \"$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*
@@ -11933,7 +11966,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:11937: checking for location of FFTW library" >&5
+echo "configure:11970: 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; }
@@ -11958,13 +11991,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:11962: checking for fftw_execute in -lfftw3" >&5
+echo "configure:11995: 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 11968 "configure"
+#line 12001 "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
@@ -11975,7 +12008,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:11979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12012: \"$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
@@ -12000,13 +12033,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:12004: checking for fftwnd_one in -lfftw" >&5
+echo "configure:12037: 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 12010 "configure"
+#line 12043 "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
@@ -12017,7 +12050,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12054: \"$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
@@ -12042,13 +12075,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:12046: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:12079: 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 12052 "configure"
+#line 12085 "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
@@ -12059,7 +12092,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12096: \"$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
@@ -12116,7 +12149,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:12120: checking whether to use BLAS" >&5
+echo "configure:12153: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -12137,7 +12170,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:12141: checking for location of BLAS includes" >&5
+echo "configure:12174: 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; }
@@ -12157,7 +12190,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:12161: checking for location of BLAS library" >&5
+echo "configure:12194: 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; }
@@ -12183,15 +12216,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12187: checking for $ac_hdr" >&5
+echo "configure:12220: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12190 "configure"
+#line 12223 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12228: \"$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*
@@ -12226,13 +12259,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12230: checking for dnrm2_ in -lblas" >&5
+echo "configure:12263: 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 12236 "configure"
+#line 12269 "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
@@ -12243,7 +12276,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12280: \"$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
@@ -12262,13 +12295,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12266: checking for dnrm2_ in -lblas" >&5
+echo "configure:12299: 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 12272 "configure"
+#line 12305 "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
@@ -12279,7 +12312,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12316: \"$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
@@ -12323,13 +12356,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:12327: checking for ATL_xerbla in -latlas" >&5
+echo "configure:12360: 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 12333 "configure"
+#line 12366 "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
@@ -12340,7 +12373,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:12344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12377: \"$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
@@ -12355,13 +12388,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:12359: checking for sgemm_ in -lf77blas" >&5
+echo "configure:12392: 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 12365 "configure"
+#line 12398 "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
@@ -12372,7 +12405,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12409: \"$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
@@ -12387,13 +12420,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:12391: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12424: 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 12397 "configure"
+#line 12430 "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
@@ -12404,7 +12437,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:12408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12441: \"$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
@@ -12449,16 +12482,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12453: checking for sgemm in $vlib_flags" >&5
+echo "configure:12486: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 12455 "configure"
+#line 12488 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:12462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12495: \"$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
@@ -12476,13 +12509,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:12480: checking for sgemm_ in -lblas" >&5
+echo "configure:12513: 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 12486 "configure"
+#line 12519 "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
@@ -12493,7 +12526,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12530: \"$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
@@ -12508,13 +12541,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:12512: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12545: 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 12518 "configure"
+#line 12551 "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
@@ -12525,7 +12558,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:12529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12562: \"$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
@@ -12540,13 +12573,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:12544: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12577: 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 12550 "configure"
+#line 12583 "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
@@ -12557,7 +12590,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12594: \"$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
@@ -12591,13 +12624,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:12595: checking for acosp in -lsunmath" >&5
+echo "configure:12628: 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 12601 "configure"
+#line 12634 "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
@@ -12608,7 +12641,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12645: \"$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
@@ -12623,13 +12656,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:12627: checking for sgemm_ in -lsunperf" >&5
+echo "configure:12660: 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 12633 "configure"
+#line 12666 "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
@@ -12640,7 +12673,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12677: \"$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
@@ -12670,13 +12703,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:12674: checking for sgemm_ in -lblas" >&5
+echo "configure:12707: 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 12680 "configure"
+#line 12713 "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
@@ -12687,7 +12720,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12724: \"$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
@@ -12726,7 +12759,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:12730: checking whether to use LAPACK" >&5
+echo "configure:12763: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -12751,7 +12784,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:12755: checking for location of LAPACK includes" >&5
+echo "configure:12788: 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; }
@@ -12771,7 +12804,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:12775: checking for location of LAPACK library" >&5
+echo "configure:12808: 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; }
@@ -12797,15 +12830,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12801: checking for $ac_hdr" >&5
+echo "configure:12834: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12804 "configure"
+#line 12837 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12842: \"$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*
@@ -12837,10 +12870,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:12841: checking for dsegv_" >&5
+echo "configure:12874: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 12844 "configure"
+#line 12877 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -12863,7 +12896,7 @@
; return 0; }
EOF
-if { (eval echo configure:12867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12900: \"$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
@@ -12890,13 +12923,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:12894: checking for desgv_ in -llapack" >&5
+echo "configure:12927: 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 12900 "configure"
+#line 12933 "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
@@ -12907,7 +12940,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:12911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12944: \"$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
@@ -12939,13 +12972,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12943: checking for dgesv_ in -llapack" >&5
+echo "configure:12976: 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 12949 "configure"
+#line 12982 "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
@@ -12956,7 +12989,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12993: \"$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
@@ -12975,13 +13008,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12979: checking for dgesv_ in -llapack" >&5
+echo "configure:13012: 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 12985 "configure"
+#line 13018 "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
@@ -12992,7 +13025,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13029: \"$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
@@ -13048,7 +13081,7 @@
echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:13052: checking whether to use Motif" >&5
+echo "configure:13085: checking whether to use Motif" >&5
echo "$ac_t"""$with_motif"" 1>&6
case "$with_motif" in
"no") USE_MOTIF= ;;
@@ -13067,7 +13100,7 @@
echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:13071: checking for location of Motif includes" >&5
+echo "configure:13104: 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; }
@@ -13093,15 +13126,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13097: checking for $ac_hdr" >&5
+echo "configure:13130: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13100 "configure"
+#line 13133 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13138: \"$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*
@@ -13135,7 +13168,7 @@
echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:13139: checking for location of Motif library" >&5
+echo "configure:13172: 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; }
@@ -13160,13 +13193,13 @@
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:13164: checking for XmStringCreate in -lXm" >&5
+echo "configure:13197: 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 13170 "configure"
+#line 13203 "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
@@ -13177,7 +13210,7 @@
XmStringCreate()
; return 0; }
EOF
-if { (eval echo configure:13181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13214: \"$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
@@ -13218,7 +13251,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:13222: checking whether to use Cairo" >&5
+echo "configure:13255: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -13238,21 +13271,42 @@
CAIROINC=`pkg-config --cflags cairo`
+echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
+echo "configure:13276: 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; }
+ ;;
+esac
+echo "$ac_t""$with_cairo_includes" 1>&6
+
+if test -n "$with_cairo_includes" ; then
+ for dir in $with_cairo_includes; do
+ if test -d "$dir"; then
+ CAIROINC="$CAIROINC -I$dir"
+ else
+ { echo "configure: error: *** cairo includes directory $dir does not exist." 1>&2; exit 1; }
+ fi
+ done
+fi
+
+
+
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CAIROINC $CPPFLAGS"
for ac_hdr in cairo.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13248: checking for $ac_hdr" >&5
+echo "configure:13302: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13251 "configure"
+#line 13305 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13310: \"$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*
@@ -13287,15 +13341,47 @@
CAIROLIB=`pkg-config --libs cairo`
+echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
+echo "configure:13346: 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; }
+ ;;
+esac
+echo "$ac_t""$with_cairo_libs" 1>&6
+
+if test -n "$with_cairo_libs"; then
+ for dir in $with_cairo_libs; do
+ if test -d "$dir"; then
+ CAIROLIB="$CAIROLIB -L$dir"
+ else
+ { echo "configure: error: *** cairo library directory $dir does not exist." 1>&2; exit 1; }
+ fi
+ done
+fi
+
+
+echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
+echo "configure:13366: 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; }
+ ;;
+esac
+echo "$ac_t""$with_cairo_ldflags" 1>&6
+CAIROLIB="$CAIROLIB $with_cairo_ldflags"
+
+
+
ac_save_libs="$LIBS"
ac_save_ldflags="$LDFLAGS"
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:13296: checking for cairo_create" >&5
+echo "configure:13382: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 13299 "configure"
+#line 13385 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -13318,7 +13404,7 @@
; return 0; }
EOF
-if { (eval echo configure:13322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13408: \"$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
@@ -13347,6 +13433,8 @@
LDFLAGS=${ac_save_ldflags}
+CAIROLIB="$CAIROLIB $CAIROLDFLAGS"
+
fi # $USE_CAIRO
@@ -13359,7 +13447,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:13363: checking whether to use FreeType" >&5
+echo "configure:13451: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -13378,7 +13466,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:13382: checking for location of FreeType includes" >&5
+echo "configure:13470: 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; }
@@ -13404,15 +13492,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13408: checking for $ac_hdr" >&5
+echo "configure:13496: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13411 "configure"
+#line 13499 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13504: \"$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*
@@ -13446,7 +13534,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:13450: checking for location of FreeType library" >&5
+echo "configure:13538: 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; }
@@ -13471,13 +13559,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:13475: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:13563: 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 13481 "configure"
+#line 13569 "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
@@ -13488,7 +13576,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:13492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13580: \"$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
@@ -13529,7 +13617,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:13533: checking whether to use NLS" >&5
+echo "configure:13621: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -13549,10 +13637,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:13553: checking for gettext" >&5
+echo "configure:13641: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 13556 "configure"
+#line 13644 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -13575,7 +13663,7 @@
; return 0; }
EOF
-if { (eval echo configure:13579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13667: \"$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
@@ -13593,13 +13681,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:13597: checking for gettext in -lintl" >&5
+echo "configure:13685: 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 13603 "configure"
+#line 13691 "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
@@ -13610,7 +13698,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:13614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13702: \"$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
@@ -13645,7 +13733,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:13649: checking whether to use C++" >&5
+echo "configure:13737: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -13661,7 +13749,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:13665: checking for $ac_word" >&5
+echo "configure:13753: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -13690,7 +13778,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:13694: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:13782: 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.
@@ -13701,12 +13789,12 @@
cat > conftest.$ac_ext << EOF
-#line 13705 "configure"
+#line 13793 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:13710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13798: \"$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
@@ -13732,19 +13820,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:13736: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:13824: 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:13741: checking whether we are using GNU C++" >&5
+echo "configure:13829: 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:13748: \"$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:13836: \"$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
@@ -13762,7 +13850,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:13766: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:13854: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -13803,7 +13891,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:13807: checking whether to use openDWG" >&5
+echo "configure:13895: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -13823,7 +13911,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:13827: checking for location of openDGW includes" >&5
+echo "configure:13915: 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; }
@@ -13849,15 +13937,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13853: checking for $ac_hdr" >&5
+echo "configure:13941: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13856 "configure"
+#line 13944 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13949: \"$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*
@@ -13891,7 +13979,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:13895: checking for location of openDWG library" >&5
+echo "configure:13983: 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; }
@@ -13938,7 +14026,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:13942: checking for special C compiler options needed for large files" >&5
+echo "configure:14030: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -13946,7 +14034,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 13950 "configure"
+#line 14038 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13962,7 +14050,7 @@
; return 0; }
EOF
-if { (eval echo configure:13966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -13971,7 +14059,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 13975 "configure"
+#line 14063 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13987,7 +14075,7 @@
; return 0; }
EOF
-if { (eval echo configure:13991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -14007,11 +14095,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:14011: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:14099: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 14015 "configure"
+#line 14103 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14027,14 +14115,14 @@
; return 0; }
EOF
-if { (eval echo configure:14031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14119: \"$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 14038 "configure"
+#line 14126 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -14052,7 +14140,7 @@
; return 0; }
EOF
-if { (eval echo configure:14056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -14071,11 +14159,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:14075: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:14163: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 14079 "configure"
+#line 14167 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14091,14 +14179,14 @@
; return 0; }
EOF
-if { (eval echo configure:14095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14183: \"$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 14102 "configure"
+#line 14190 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -14116,7 +14204,7 @@
; return 0; }
EOF
-if { (eval echo configure:14120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -14135,25 +14223,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:14139: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14227: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 14143 "configure"
+#line 14231 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14238: \"$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 14157 "configure"
+#line 14245 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -14162,7 +14250,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14183,10 +14271,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:14187: checking if system supports Large Files at all" >&5
+echo "configure:14275: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 14190 "configure"
+#line 14278 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -14218,7 +14306,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:14222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -14247,7 +14335,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:14251: checking whether to use Python" >&5
+echo "configure:14339: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -14267,7 +14355,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:14271: checking for $ac_word" >&5
+echo "configure:14359: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -14312,15 +14400,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14316: checking for $ac_hdr" >&5
+echo "configure:14404: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14319 "configure"
+#line 14407 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14412: \"$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*
@@ -14360,7 +14448,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:14364: checking for $ac_word" >&5
+echo "configure:14452: checking for $ac_word" >&5
case "$SWIG" in
/*)
@@ -14406,7 +14494,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:14410: checking whether to use wxWidgets" >&5
+echo "configure:14498: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -14426,7 +14514,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:14430: checking for $ac_word" >&5
+echo "configure:14518: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -14474,7 +14562,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:14478: checking wxWidgets version" >&5
+echo "configure:14566: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -14497,15 +14585,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14501: checking for $ac_hdr" >&5
+echo "configure:14589: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14504 "configure"
+#line 14592 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14597: \"$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*
@@ -14541,15 +14629,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14545: checking for $ac_hdr" >&5
+echo "configure:14633: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14548 "configure"
+#line 14636 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14641: \"$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*
Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in 2008-08-18 09:14:33 UTC (rev 32853)
+++ grass/trunk/configure.in 2008-08-18 13:38:03 UTC (rev 32854)
@@ -263,6 +263,10 @@
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)
+
LOC_ARG_WITH_INC(freetype, FreeType)
LOC_ARG_WITH_LIB(freetype, FreeType)
@@ -1377,14 +1381,21 @@
CAIROINC=`pkg-config --cflags cairo`
+LOC_CHECK_INC_PATH(cairo,cairo,CAIROINC)
+
LOC_CHECK_INCLUDES(cairo.h,Cairo,$CAIROINC)
# With Cairo library directory
CAIROLIB=`pkg-config --libs cairo`
+LOC_CHECK_LIB_PATH(cairo,cairo,CAIROLIB)
+LOC_CHECK_LDFLAGS(cairo,cairo,CAIROLIB)
+
LOC_CHECK_FUNC(cairo_create,,,,,$CAIROLIB,[:])
+CAIROLIB="$CAIROLIB $CAIROLDFLAGS"
+
fi # $USE_CAIRO
AC_SUBST(CAIROINC)
More information about the grass-commit
mailing list