[GRASS-SVN] r45526 - in grass/branches/develbranch_6: .
general/g.version include/Make lib/init lib/python
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Mar 3 02:44:18 EST 2011
Author: hamish
Date: 2011-03-02 23:44:18 -0800 (Wed, 02 Mar 2011)
New Revision: 45526
Modified:
grass/branches/develbranch_6/configure
grass/branches/develbranch_6/configure.in
grass/branches/develbranch_6/general/g.version/main.c
grass/branches/develbranch_6/include/Make/Grass.make.in
grass/branches/develbranch_6/lib/init/Makefile
grass/branches/develbranch_6/lib/python/core.py
Log:
backport /experimental/ 'svnversion -c' development version tag to VERSION number.
restore (unused) GRASS_VERSION_UPDATE_PKG.
more precise name for shell variable names.
strip pretty text out of shell script output, quote date string.
* Not a candidate for backporting to stable branches.
Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure 2011-03-03 07:42:56 UTC (rev 45525)
+++ grass/branches/develbranch_6/configure 2011-03-03 07:44:18 UTC (rev 45526)
@@ -1290,8 +1290,43 @@
LIB_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
+GRASS_VERSION_SVN=
+# Extract the first word of "svnversion", so it can be a program name with args.
+set dummy svnversion; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1298: checking for $ac_word" >&5
+case "$SVN_VERSION" in
+ /*)
+ ac_cv_path_SVN_VERSION="$SVN_VERSION" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_SVN_VERSION="$SVN_VERSION" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_SVN_VERSION="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_SVN_VERSION" && ac_cv_path_SVN_VERSION="no"
+ ;;
+esac
+SVN_VERSION="$ac_cv_path_SVN_VERSION"
+if test -n "$SVN_VERSION"; then
+ echo "$ac_t""$SVN_VERSION" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+if test "$SVN_VERSION" != "no" ; then
+ GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
+fi
@@ -1299,6 +1334,10 @@
+
+
+
+
# Check for MacOSX App
# Check whether --enable-macosx-app or --disable-macosx-app was given.
@@ -1311,7 +1350,7 @@
echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1315: checking for MacOSX App" >&5
+echo "configure:1354: checking for MacOSX App" >&5
case "$enable_macosx_app" in
yes) MACOSX_APP=1 ;;
no) MACOSX_APP= ;;
@@ -1323,7 +1362,7 @@
# Check for MacOSX archs
echo $ac_n "checking for MacOSX architectures""... $ac_c" 1>&6
-echo "configure:1327: checking for MacOSX architectures" >&5
+echo "configure:1366: checking for MacOSX architectures" >&5
MACOSX_ARCHS=
@@ -1352,7 +1391,7 @@
# Check for MacOSX SDK
echo $ac_n "checking for MacOSX SDK""... $ac_c" 1>&6
-echo "configure:1356: checking for MacOSX SDK" >&5
+echo "configure:1395: checking for MacOSX SDK" >&5
MACOSX_SDK=
@@ -1362,7 +1401,7 @@
ac_safe=`echo "$with_macosx_sdk/SDKSettings.plist" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $with_macosx_sdk/SDKSettings.plist""... $ac_c" 1>&6
-echo "configure:1366: checking for $with_macosx_sdk/SDKSettings.plist" >&5
+echo "configure:1405: checking for $with_macosx_sdk/SDKSettings.plist" >&5
if test "$cross_compiling" = yes; then
{ echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
@@ -1406,7 +1445,7 @@
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1410: checking how to build libraries" >&5
+echo "configure:1449: 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"
@@ -1449,7 +1488,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:1453: checking for $ac_word" >&5
+echo "configure:1492: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -1474,7 +1513,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1478: checking how to run the C preprocessor" >&5
+echo "configure:1517: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1487,13 +1526,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1491 "configure"
+#line 1530 "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:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1536: \"$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
:
@@ -1504,13 +1543,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1508 "configure"
+#line 1547 "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:1514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1553: \"$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
:
@@ -1521,13 +1560,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1525 "configure"
+#line 1564 "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:1531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1570: \"$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
:
@@ -1555,7 +1594,7 @@
# Step 0.a: Enable 64 bit support?
echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
-echo "configure:1559: checking if 64bit support is requested" >&5
+echo "configure:1598: 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"
@@ -1575,7 +1614,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:1579: checking if 64bit Sparc VIS support is requested" >&5
+echo "configure:1618: 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"
@@ -1599,7 +1638,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:1603: checking system version (for dynamic loading)" >&5
+echo "configure:1642: 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
@@ -1625,13 +1664,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:1629: checking for dlopen in -ldl" >&5
+echo "configure:1668: 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 1635 "configure"
+#line 1674 "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
@@ -1642,7 +1681,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:1646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1685: \"$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
@@ -1689,7 +1728,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:1693: checking for $ac_word" >&5
+echo "configure:1732: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -1818,13 +1857,13 @@
# known GMT value.
echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:1822: checking for gettimeofday in -lbsd" >&5
+echo "configure:1861: 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 1828 "configure"
+#line 1867 "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
@@ -1835,7 +1874,7 @@
gettimeofday()
; return 0; }
EOF
-if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1878: \"$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
@@ -1876,13 +1915,13 @@
# is always linked to, for compatibility.
#-----------------------------------------------------------
echo $ac_n "checking for inet_ntoa in -lbind""... $ac_c" 1>&6
-echo "configure:1880: checking for inet_ntoa in -lbind" >&5
+echo "configure:1919: 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 1886 "configure"
+#line 1925 "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
@@ -1893,7 +1932,7 @@
inet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1936: \"$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
@@ -1954,13 +1993,13 @@
SHLIB_SUFFIX=".sl"
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1958: checking for shl_load in -ldld" >&5
+echo "configure:1997: 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 1964 "configure"
+#line 2003 "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
@@ -1971,7 +2010,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:1975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2014: \"$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
@@ -2036,13 +2075,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:2040: checking for shl_load in -ldld" >&5
+echo "configure:2079: 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 2046 "configure"
+#line 2085 "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
@@ -2053,7 +2092,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2096: \"$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
@@ -2175,15 +2214,15 @@
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2179: checking for dld.h" >&5
+echo "configure:2218: checking for dld.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2182 "configure"
+#line 2221 "configure"
#include "confdefs.h"
#include <dld.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2226: \"$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*
@@ -2243,15 +2282,15 @@
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2247: checking for dld.h" >&5
+echo "configure:2286: checking for dld.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2250 "configure"
+#line 2289 "configure"
#include "confdefs.h"
#include <dld.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2294: \"$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*
@@ -2348,9 +2387,9 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2352: checking for ELF" >&5
+echo "configure:2391: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 2354 "configure"
+#line 2393 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -2380,15 +2419,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:2384: checking for dlfcn.h" >&5
+echo "configure:2423: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2387 "configure"
+#line 2426 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2431: \"$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*
@@ -2412,9 +2451,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:2416: checking for ELF" >&5
+echo "configure:2455: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 2418 "configure"
+#line 2457 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -2738,17 +2777,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:2742: checking for ld accepts -Bexport flag" >&5
+echo "configure:2781: checking for ld accepts -Bexport flag" >&5
LDFLAGS="${LDFLAGS} -Wl,-Bexport"
cat > conftest.$ac_ext <<EOF
-#line 2745 "configure"
+#line 2784 "configure"
#include "confdefs.h"
int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
found=yes
else
@@ -3573,7 +3612,7 @@
# Done checking fortran
echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:3577: checking for additional include dirs" >&5
+echo "configure:3616: 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; }
@@ -3596,7 +3635,7 @@
# With libs option
echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:3600: checking for additional library dirs" >&5
+echo "configure:3639: 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; }
@@ -3630,7 +3669,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:3634: checking for a BSD compatible install" >&5
+echo "configure:3673: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
@@ -3683,7 +3722,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:3687: checking for $ac_word" >&5
+echo "configure:3726: checking for $ac_word" >&5
if test -n "$LEX"; then
ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -3714,13 +3753,13 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3718: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3757: 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 3724 "configure"
+#line 3763 "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
@@ -3731,7 +3770,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3774: \"$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
@@ -3756,7 +3795,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:3760: checking for $ac_word" >&5
+echo "configure:3799: checking for $ac_word" >&5
case "$LEXPATH" in
/*)
@@ -3796,7 +3835,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:3800: checking for $ac_word" >&5
+echo "configure:3839: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3827,7 +3866,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:3831: checking for $ac_word" >&5
+echo "configure:3870: checking for $ac_word" >&5
case "$YACCPATH" in
/*)
@@ -3865,7 +3904,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:3869: checking for $ac_word" >&5
+echo "configure:3908: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3894,7 +3933,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:3898: checking for $ac_word" >&5
+echo "configure:3937: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -3925,7 +3964,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:3929: checking for $ac_word" >&5
+echo "configure:3968: checking for $ac_word" >&5
if test -n "$ENV"; then
ac_cv_prog_ENV="$ENV" # Let the user override the test.
@@ -3954,7 +3993,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:3958: checking for $ac_word" >&5
+echo "configure:3997: checking for $ac_word" >&5
case "$PERL" in
/*)
@@ -3985,10 +4024,10 @@
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3989: checking for ANSI C header files" >&5
+echo "configure:4028: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3992 "configure"
+#line 4031 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3996,7 +4035,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4039: \"$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*
@@ -4013,7 +4052,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 4017 "configure"
+#line 4056 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -4031,7 +4070,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 4035 "configure"
+#line 4074 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -4052,7 +4091,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 4056 "configure"
+#line 4095 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4063,7 +4102,7 @@
exit (0); }
EOF
-if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -4090,15 +4129,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4094: checking for $ac_hdr" >&5
+echo "configure:4133: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4097 "configure"
+#line 4136 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4141: \"$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*
@@ -4127,15 +4166,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4131: checking for $ac_hdr" >&5
+echo "configure:4170: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4134 "configure"
+#line 4173 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4178: \"$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*
@@ -4164,15 +4203,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4168: checking for $ac_hdr" >&5
+echo "configure:4207: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4171 "configure"
+#line 4210 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4215: \"$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*
@@ -4201,15 +4240,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4205: checking for $ac_hdr" >&5
+echo "configure:4244: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4208 "configure"
+#line 4247 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4252: \"$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*
@@ -4238,15 +4277,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4242: checking for $ac_hdr" >&5
+echo "configure:4281: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 4245 "configure"
+#line 4284 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4289: \"$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*
@@ -4272,10 +4311,10 @@
done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4276: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4315: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
+#line 4318 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -4284,7 +4323,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:4288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -4304,10 +4343,10 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4308: checking for off_t" >&5
+echo "configure:4347: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4311 "configure"
+#line 4350 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -4334,10 +4373,10 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4338: checking for uid_t in sys/types.h" >&5
+echo "configure:4377: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4341 "configure"
+#line 4380 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -4365,10 +4404,10 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4369: checking return type of signal handlers" >&5
+echo "configure:4408: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 4372 "configure"
+#line 4411 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -4385,7 +4424,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:4389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -4403,10 +4442,10 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4407: checking for Cygwin environment" >&5
+echo "configure:4446: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 4410 "configure"
+#line 4449 "configure"
#include "confdefs.h"
int main() {
@@ -4417,7 +4456,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:4421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -4435,10 +4474,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:4439: checking for $ac_func" >&5
+echo "configure:4478: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4442 "configure"
+#line 4481 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4461,7 +4500,7 @@
; return 0; }
EOF
-if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4504: \"$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
@@ -4487,10 +4526,10 @@
for ac_func in seteuid setpriority setreuid setruid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4491: checking for $ac_func" >&5
+echo "configure:4530: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4494 "configure"
+#line 4533 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4513,7 +4552,7 @@
; return 0; }
EOF
-if { (eval echo configure:4517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4556: \"$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
@@ -4539,10 +4578,10 @@
for ac_func in drand48
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4543: checking for $ac_func" >&5
+echo "configure:4582: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4546 "configure"
+#line 4585 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4565,7 +4604,7 @@
; return 0; }
EOF
-if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4608: \"$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
@@ -4591,10 +4630,10 @@
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4595: checking for $ac_func" >&5
+echo "configure:4634: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4598 "configure"
+#line 4637 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4617,7 +4656,7 @@
; return 0; }
EOF
-if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4660: \"$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
@@ -4643,10 +4682,10 @@
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4647: checking for $ac_func" >&5
+echo "configure:4686: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4650 "configure"
+#line 4689 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4669,7 +4708,7 @@
; return 0; }
EOF
-if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4712: \"$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
@@ -4694,13 +4733,13 @@
if test "$cross_compiling" != "yes" ; then
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:4698: checking whether setpgrp takes no argument" >&5
+echo "configure:4737: 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 4704 "configure"
+#line 4743 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -4720,7 +4759,7 @@
}
EOF
-if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4763: \"$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
@@ -4748,16 +4787,16 @@
fi
echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:4752: checking for long long int" >&5
+echo "configure:4791: checking for long long int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4754 "configure"
+#line 4793 "configure"
#include "confdefs.h"
int main() {
long long int x;
; return 0; }
EOF
-if { (eval echo configure:4761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -4777,7 +4816,7 @@
rm -f conftest*
echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:4781: checking for W11" >&5
+echo "configure:4820: 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; } ;;
@@ -4805,7 +4844,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:4809: checking for X" >&5
+echo "configure:4848: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -4865,12 +4904,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 4869 "configure"
+#line 4908 "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:4874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4913: \"$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*
@@ -4939,14 +4978,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4943 "configure"
+#line 4982 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4989: \"$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.
@@ -5051,17 +5090,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:5055: checking whether -R must be followed by a space" >&5
+echo "configure:5094: 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 5058 "configure"
+#line 5097 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -5077,14 +5116,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 5081 "configure"
+#line 5120 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:5088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -5116,13 +5155,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:5120: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5159: 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 5126 "configure"
+#line 5165 "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 +5172,7 @@
dnet_ntoa()
; 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:5176: \"$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
@@ -5154,13 +5193,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:5158: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5197: 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 5164 "configure"
+#line 5203 "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
@@ -5171,7 +5210,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5214: \"$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
@@ -5199,10 +5238,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:5203: checking for gethostbyname" >&5
+echo "configure:5242: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 5206 "configure"
+#line 5245 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -5225,7 +5264,7 @@
; return 0; }
EOF
-if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5268: \"$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
@@ -5245,13 +5284,13 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5249: checking for gethostbyname in -lnsl" >&5
+echo "configure:5288: 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 5255 "configure"
+#line 5294 "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
@@ -5262,7 +5301,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:5266: \"$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_lib_$ac_lib_var=yes"
else
@@ -5291,10 +5330,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:5295: checking for connect" >&5
+echo "configure:5334: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 5298 "configure"
+#line 5337 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -5317,7 +5356,7 @@
; return 0; }
EOF
-if { (eval echo configure:5321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5360: \"$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
@@ -5337,13 +5376,13 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:5341: checking for connect in -lsocket" >&5
+echo "configure:5380: 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 5347 "configure"
+#line 5386 "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 +5393,7 @@
connect()
; 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:5397: \"$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
@@ -5377,10 +5416,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:5381: checking for remove" >&5
+echo "configure:5420: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 5384 "configure"
+#line 5423 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -5403,7 +5442,7 @@
; return 0; }
EOF
-if { (eval echo configure:5407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5446: \"$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
@@ -5423,13 +5462,13 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5427: checking for remove in -lposix" >&5
+echo "configure:5466: 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 5433 "configure"
+#line 5472 "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
@@ -5440,7 +5479,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:5444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5483: \"$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
@@ -5463,10 +5502,10 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5467: checking for shmat" >&5
+echo "configure:5506: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 5470 "configure"
+#line 5509 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -5489,7 +5528,7 @@
; return 0; }
EOF
-if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5532: \"$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
@@ -5509,13 +5548,13 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5513: checking for shmat in -lipc" >&5
+echo "configure:5552: 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 5519 "configure"
+#line 5558 "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
@@ -5526,7 +5565,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:5530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5569: \"$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
@@ -5558,13 +5597,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:5562: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:5601: 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 5568 "configure"
+#line 5607 "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
@@ -5575,7 +5614,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:5579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5618: \"$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
@@ -5613,7 +5652,7 @@
echo $ac_n "checking whether to use Curses""... $ac_c" 1>&6
-echo "configure:5617: checking whether to use Curses" >&5
+echo "configure:5656: checking whether to use Curses" >&5
echo "$ac_t"""$with_curses"" 1>&6
case "$with_curses" in
"no") USE_CURSES= ;;
@@ -5632,15 +5671,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5636: checking for $ac_hdr" >&5
+echo "configure:5675: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5639 "configure"
+#line 5678 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5683: \"$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*
@@ -5671,10 +5710,10 @@
echo $ac_n "checking curses.h WINDOW structure component""... $ac_c" 1>&6
-echo "configure:5675: checking curses.h WINDOW structure component" >&5
+echo "configure:5714: checking curses.h WINDOW structure component" >&5
CURSES_MAXY=NONE
cat > conftest.$ac_ext <<EOF
-#line 5678 "configure"
+#line 5717 "configure"
#include "confdefs.h"
#include <curses.h>
@@ -5683,7 +5722,7 @@
WINDOW w; w.maxy = 0;
; return 0; }
EOF
-if { (eval echo configure:5687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
CURSES_MAXY=maxy
else
@@ -5692,7 +5731,7 @@
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 5696 "configure"
+#line 5735 "configure"
#include "confdefs.h"
#include <curses.h>
@@ -5701,7 +5740,7 @@
WINDOW w; w._maxy = 0;
; return 0; }
EOF
-if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
CURSES_MAXY=_maxy
else
@@ -5717,13 +5756,13 @@
echo "$ac_t""$CURSES_MAXY" 1>&6
echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:5721: checking for initscr in -lncurses" >&5
+echo "configure:5760: checking for initscr in -lncurses" >&5
ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5727 "configure"
+#line 5766 "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
@@ -5734,7 +5773,7 @@
initscr()
; return 0; }
EOF
-if { (eval echo configure:5738: \"$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_lib_$ac_lib_var=yes"
else
@@ -5753,13 +5792,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:5757: checking for initscr in -lcurses" >&5
+echo "configure:5796: checking for initscr in -lcurses" >&5
ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5763 "configure"
+#line 5802 "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
@@ -5770,7 +5809,7 @@
initscr()
; return 0; }
EOF
-if { (eval echo configure:5774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5813: \"$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
@@ -5799,13 +5838,13 @@
echo $ac_n "checking for keypad in -lncurses""... $ac_c" 1>&6
-echo "configure:5803: checking for keypad in -lncurses" >&5
+echo "configure:5842: checking for keypad in -lncurses" >&5
ac_lib_var=`echo ncurses'_'keypad | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5809 "configure"
+#line 5848 "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
@@ -5816,7 +5855,7 @@
keypad()
; return 0; }
EOF
-if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5859: \"$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
@@ -5838,13 +5877,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for keypad in -lcurses""... $ac_c" 1>&6
-echo "configure:5842: checking for keypad in -lcurses" >&5
+echo "configure:5881: checking for keypad in -lcurses" >&5
ac_lib_var=`echo curses'_'keypad | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5848 "configure"
+#line 5887 "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
@@ -5855,7 +5894,7 @@
keypad()
; return 0; }
EOF
-if { (eval echo configure:5859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5898: \"$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
@@ -5885,13 +5924,13 @@
fi # $USE_CURSES
echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6
-echo "configure:5889: checking for gtty in -lcompat" >&5
+echo "configure:5928: checking for gtty in -lcompat" >&5
ac_lib_var=`echo compat'_'gtty | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lcompat $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5895 "configure"
+#line 5934 "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
@@ -5902,7 +5941,7 @@
gtty()
; return 0; }
EOF
-if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5945: \"$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
@@ -5921,13 +5960,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gtty in -lbsd-compat""... $ac_c" 1>&6
-echo "configure:5925: checking for gtty in -lbsd-compat" >&5
+echo "configure:5964: checking for gtty in -lbsd-compat" >&5
ac_lib_var=`echo bsd-compat'_'gtty | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lbsd-compat $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5931 "configure"
+#line 5970 "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
@@ -5938,7 +5977,7 @@
gtty()
; return 0; }
EOF
-if { (eval echo configure:5942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5957,13 +5996,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gtty in -lbsd""... $ac_c" 1>&6
-echo "configure:5961: checking for gtty in -lbsd" >&5
+echo "configure:6000: checking for gtty in -lbsd" >&5
ac_lib_var=`echo bsd'_'gtty | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5967 "configure"
+#line 6006 "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
@@ -5974,7 +6013,7 @@
gtty()
; return 0; }
EOF
-if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6017: \"$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
@@ -6008,12 +6047,12 @@
LIBS=""
echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:6012: checking for library containing cuserid" >&5
+echo "configure:6051: checking for library containing cuserid" >&5
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_cuserid="no"
cat > conftest.$ac_ext <<EOF
-#line 6017 "configure"
+#line 6056 "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
@@ -6024,7 +6063,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6067: \"$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
@@ -6035,7 +6074,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 6039 "configure"
+#line 6078 "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
@@ -6046,7 +6085,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6089: \"$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
@@ -6072,10 +6111,10 @@
# Note: -lxdr -liberty -lws2_32 is for MinGW
echo $ac_n "checking for xdrmem_create""... $ac_c" 1>&6
-echo "configure:6076: checking for xdrmem_create" >&5
+echo "configure:6115: checking for xdrmem_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 6079 "configure"
+#line 6118 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char xdrmem_create(); below. */
@@ -6098,7 +6137,7 @@
; return 0; }
EOF
-if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6141: \"$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
@@ -6116,13 +6155,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
-echo "configure:6120: checking for xdrmem_create in -lsun" >&5
+echo "configure:6159: 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 6126 "configure"
+#line 6165 "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
@@ -6133,7 +6172,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:6137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6176: \"$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
@@ -6152,13 +6191,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
-echo "configure:6156: checking for xdrmem_create in -lnsl" >&5
+echo "configure:6195: 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 6162 "configure"
+#line 6201 "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
@@ -6169,7 +6208,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6212: \"$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
@@ -6188,13 +6227,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
-echo "configure:6192: checking for xdrmem_create in -lrpclib" >&5
+echo "configure:6231: 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 6198 "configure"
+#line 6237 "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
@@ -6205,7 +6244,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:6209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6248: \"$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
@@ -6224,13 +6263,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lxdr""... $ac_c" 1>&6
-echo "configure:6228: checking for xdrmem_create in -lxdr" >&5
+echo "configure:6267: 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 6234 "configure"
+#line 6273 "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
@@ -6241,7 +6280,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6284: \"$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
@@ -6275,10 +6314,10 @@
for ac_func in asprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6279: checking for $ac_func" >&5
+echo "configure:6318: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 6282 "configure"
+#line 6321 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6301,7 +6340,7 @@
; return 0; }
EOF
-if { (eval echo configure:6305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6344: \"$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
@@ -6328,10 +6367,10 @@
# Test if mathlib needs -lm flag or is included with libc
echo $ac_n "checking for atan""... $ac_c" 1>&6
-echo "configure:6332: checking for atan" >&5
+echo "configure:6371: checking for atan" >&5
cat > conftest.$ac_ext <<EOF
-#line 6335 "configure"
+#line 6374 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atan(); below. */
@@ -6354,7 +6393,7 @@
; return 0; }
EOF
-if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6397: \"$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
@@ -6372,13 +6411,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:6376: checking for atan in -lm" >&5
+echo "configure:6415: 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 6382 "configure"
+#line 6421 "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
@@ -6389,7 +6428,7 @@
atan()
; return 0; }
EOF
-if { (eval echo configure:6393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6432: \"$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
@@ -6416,10 +6455,10 @@
echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:6420: checking for dlsym" >&5
+echo "configure:6459: checking for dlsym" >&5
cat > conftest.$ac_ext <<EOF
-#line 6423 "configure"
+#line 6462 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym(); below. */
@@ -6442,7 +6481,7 @@
; return 0; }
EOF
-if { (eval echo configure:6446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6485: \"$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
@@ -6460,13 +6499,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:6464: checking for dlsym in -ldl" >&5
+echo "configure:6503: 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 6470 "configure"
+#line 6509 "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
@@ -6477,7 +6516,7 @@
dlsym()
; return 0; }
EOF
-if { (eval echo configure:6481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6520: \"$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
@@ -6504,10 +6543,10 @@
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:6508: checking for iconv" >&5
+echo "configure:6547: checking for iconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 6511 "configure"
+#line 6550 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -6530,7 +6569,7 @@
; return 0; }
EOF
-if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6573: \"$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
@@ -6548,13 +6587,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:6552: checking for iconv in -liconv" >&5
+echo "configure:6591: 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 6558 "configure"
+#line 6597 "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 +6604,7 @@
iconv()
; 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:6608: \"$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
@@ -6584,13 +6623,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6588: checking for iconv in -lgiconv" >&5
+echo "configure:6627: 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 6594 "configure"
+#line 6633 "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
@@ -6601,7 +6640,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6644: \"$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
@@ -6620,10 +6659,10 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:6624: checking for libiconv" >&5
+echo "configure:6663: checking for libiconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 6627 "configure"
+#line 6666 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -6646,7 +6685,7 @@
; return 0; }
EOF
-if { (eval echo configure:6650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6689: \"$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
@@ -6664,13 +6703,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:6668: checking for libiconv in -liconv" >&5
+echo "configure:6707: 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 6674 "configure"
+#line 6713 "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
@@ -6681,7 +6720,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6724: \"$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
@@ -6700,13 +6739,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6704: checking for libiconv in -lgiconv" >&5
+echo "configure:6743: 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 6710 "configure"
+#line 6749 "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
@@ -6717,7 +6756,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6760: \"$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
@@ -6754,10 +6793,10 @@
have_socket=1
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:6758: checking for socket" >&5
+echo "configure:6797: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 6761 "configure"
+#line 6800 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -6780,7 +6819,7 @@
; return 0; }
EOF
-if { (eval echo configure:6784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6823: \"$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
@@ -6798,13 +6837,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6802: checking for socket in -lsocket" >&5
+echo "configure:6841: 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 6808 "configure"
+#line 6847 "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
@@ -6815,7 +6854,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:6819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6858: \"$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
@@ -6863,7 +6902,7 @@
echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:6867: checking for location of zlib includes" >&5
+echo "configure:6906: 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; }
@@ -6889,15 +6928,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6893: checking for $ac_hdr" >&5
+echo "configure:6932: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6896 "configure"
+#line 6935 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6940: \"$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*
@@ -6931,7 +6970,7 @@
echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:6935: checking for location of zlib library" >&5
+echo "configure:6974: 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; }
@@ -6956,13 +6995,13 @@
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:6960: checking for deflate in -lz" >&5
+echo "configure:6999: 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 6966 "configure"
+#line 7005 "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
@@ -6973,7 +7012,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:6977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7016: \"$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
@@ -7021,7 +7060,7 @@
echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
-echo "configure:7025: checking for location of External PROJ.4 includes" >&5
+echo "configure:7064: 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; }
@@ -7047,15 +7086,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7051: checking for $ac_hdr" >&5
+echo "configure:7090: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7054 "configure"
+#line 7093 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7098: \"$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*
@@ -7092,7 +7131,7 @@
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:7096: checking External PROJ.4 version" >&5
+echo "configure:7135: checking External PROJ.4 version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -7100,7 +7139,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7104 "configure"
+#line 7143 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7112,7 +7151,7 @@
}
EOF
-if { (eval echo configure:7116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7155: \"$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
@@ -7137,7 +7176,7 @@
echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:7141: checking for location of External PROJ.4 library" >&5
+echo "configure:7180: 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; }
@@ -7162,13 +7201,13 @@
echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:7166: checking for pj_get_def in -lproj" >&5
+echo "configure:7205: 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 7172 "configure"
+#line 7211 "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
@@ -7179,7 +7218,7 @@
pj_get_def()
; return 0; }
EOF
-if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7222: \"$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
@@ -7213,7 +7252,7 @@
echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
-echo "configure:7217: checking for location of External PROJ.4 data files" >&5
+echo "configure:7256: 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; }
@@ -7237,14 +7276,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:7241: checking for epsg" >&5
+echo "configure:7280: 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:7248: checking for $PROJSHARE/epsg" >&5
+echo "configure:7287: 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; }
@@ -7276,7 +7315,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:7280: checking for $ac_word" >&5
+echo "configure:7319: checking for $ac_word" >&5
case "$NAD2BIN" in
/*)
@@ -7316,7 +7355,7 @@
echo $ac_n "checking whether to use regex""... $ac_c" 1>&6
-echo "configure:7320: checking whether to use regex" >&5
+echo "configure:7359: checking whether to use regex" >&5
echo "$ac_t"""$with_regex"" 1>&6
case "$with_regex" in
"no") USE_REGEX= ;;
@@ -7336,7 +7375,7 @@
echo $ac_n "checking for location of regex includes""... $ac_c" 1>&6
-echo "configure:7340: checking for location of regex includes" >&5
+echo "configure:7379: checking for location of regex includes" >&5
case "$with_regex_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-regex-includes." 1>&2; exit 1; }
@@ -7362,15 +7401,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7366: checking for $ac_hdr" >&5
+echo "configure:7405: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7369 "configure"
+#line 7408 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7413: \"$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*
@@ -7404,7 +7443,7 @@
echo $ac_n "checking for location of regex library""... $ac_c" 1>&6
-echo "configure:7408: checking for location of regex library" >&5
+echo "configure:7447: checking for location of regex library" >&5
case "$with_regex_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-regex-libs." 1>&2; exit 1; }
@@ -7429,10 +7468,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:7433: checking for regcomp" >&5
+echo "configure:7472: checking for regcomp" >&5
cat > conftest.$ac_ext <<EOF
-#line 7436 "configure"
+#line 7475 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -7455,7 +7494,7 @@
; return 0; }
EOF
-if { (eval echo configure:7459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp=yes"
else
@@ -7482,13 +7521,13 @@
echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
-echo "configure:7486: checking for regcomp in -lregex" >&5
+echo "configure:7525: checking for regcomp in -lregex" >&5
ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lregex $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7492 "configure"
+#line 7531 "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
@@ -7499,7 +7538,7 @@
regcomp()
; return 0; }
EOF
-if { (eval echo configure:7503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7542: \"$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
@@ -7549,7 +7588,7 @@
echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:7553: checking whether to use Readline" >&5
+echo "configure:7592: checking whether to use Readline" >&5
echo "$ac_t"""$with_readline"" 1>&6
case "$with_readline" in
"no") USE_READLINE= ;;
@@ -7570,7 +7609,7 @@
echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:7574: checking for location of Readline includes" >&5
+echo "configure:7613: 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; }
@@ -7596,15 +7635,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7600: checking for $ac_hdr" >&5
+echo "configure:7639: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7603 "configure"
+#line 7642 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7647: \"$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*
@@ -7640,15 +7679,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7644: checking for $ac_hdr" >&5
+echo "configure:7683: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7647 "configure"
+#line 7686 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7691: \"$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*
@@ -7682,7 +7721,7 @@
echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:7686: checking for location of Readline library" >&5
+echo "configure:7725: 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; }
@@ -7707,13 +7746,13 @@
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:7711: checking for readline in -lreadline" >&5
+echo "configure:7750: 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 7717 "configure"
+#line 7756 "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
@@ -7724,7 +7763,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7767: \"$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
@@ -7759,13 +7798,13 @@
echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:7763: checking for add_history in -lhistory" >&5
+echo "configure:7802: 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 7769 "configure"
+#line 7808 "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
@@ -7776,7 +7815,7 @@
add_history()
; return 0; }
EOF
-if { (eval echo configure:7780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7819: \"$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
@@ -7819,7 +7858,7 @@
echo $ac_n "checking whether to use JPEG""... $ac_c" 1>&6
-echo "configure:7823: checking whether to use JPEG" >&5
+echo "configure:7862: checking whether to use JPEG" >&5
echo "$ac_t"""$with_jpeg"" 1>&6
case "$with_jpeg" in
"no") USE_JPEG= ;;
@@ -7839,7 +7878,7 @@
echo $ac_n "checking for location of JPEG includes""... $ac_c" 1>&6
-echo "configure:7843: checking for location of JPEG includes" >&5
+echo "configure:7882: 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; }
@@ -7865,15 +7904,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7869: checking for $ac_hdr" >&5
+echo "configure:7908: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7872 "configure"
+#line 7911 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7916: \"$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*
@@ -7907,7 +7946,7 @@
echo $ac_n "checking for location of JPEG library""... $ac_c" 1>&6
-echo "configure:7911: checking for location of JPEG library" >&5
+echo "configure:7950: 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; }
@@ -7934,13 +7973,13 @@
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7938: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7977: 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 7944 "configure"
+#line 7983 "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
@@ -7951,7 +7990,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:7955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7994: \"$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,13 +8009,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7974: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:8013: 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 7980 "configure"
+#line 8019 "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
@@ -7987,7 +8026,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:7991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8030: \"$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
@@ -8036,7 +8075,7 @@
# GDAL option
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:8040: checking whether to use GDAL" >&5
+echo "configure:8079: checking whether to use GDAL" >&5
GDAL_LIBS=
GDAL_CFLAGS=
@@ -8054,7 +8093,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:8058: checking for $ac_word" >&5
+echo "configure:8097: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -8109,14 +8148,14 @@
LIBS="$LIBS $GDAL_LIBS"
CFLAGS="$CFLAGS $GDAL_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 8113 "configure"
+#line 8152 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:8120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -8125,14 +8164,14 @@
LIBS="$LIBS $GDAL_DEP_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8129 "configure"
+#line 8168 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:8136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8175: \"$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
@@ -8164,7 +8203,7 @@
# GEOS option
echo $ac_n "checking whether to use GEOS""... $ac_c" 1>&6
-echo "configure:8168: checking whether to use GEOS" >&5
+echo "configure:8207: checking whether to use GEOS" >&5
GEOS_LIBS=
GGEOS_CFLAGS=
@@ -8182,7 +8221,7 @@
# Extract the first word of "geos-config", so it can be a program name with args.
set dummy geos-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8186: checking for $ac_word" >&5
+echo "configure:8225: checking for $ac_word" >&5
case "$GEOS_CONFIG" in
/*)
@@ -8230,15 +8269,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8234: checking for $ac_hdr" >&5
+echo "configure:8273: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8237 "configure"
+#line 8276 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8281: \"$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*
@@ -8274,13 +8313,13 @@
echo $ac_n "checking for initGEOS in -lgeos_c_i""... $ac_c" 1>&6
-echo "configure:8278: checking for initGEOS in -lgeos_c_i" >&5
+echo "configure:8317: checking for initGEOS in -lgeos_c_i" >&5
ac_lib_var=`echo geos_c_i'_'initGEOS | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgeos_c_i $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8284 "configure"
+#line 8323 "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
@@ -8291,7 +8330,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8334: \"$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
@@ -8327,13 +8366,13 @@
echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6
-echo "configure:8331: checking for initGEOS in -lgeos_c" >&5
+echo "configure:8370: checking for initGEOS in -lgeos_c" >&5
ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgeos_c $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8337 "configure"
+#line 8376 "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
@@ -8344,7 +8383,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:8348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8387: \"$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
@@ -8388,7 +8427,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:8392: checking whether to use TIFF" >&5
+echo "configure:8431: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -8408,7 +8447,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:8412: checking for location of TIFF includes" >&5
+echo "configure:8451: 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; }
@@ -8434,15 +8473,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8438: checking for $ac_hdr" >&5
+echo "configure:8477: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8441 "configure"
+#line 8480 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8485: \"$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*
@@ -8476,7 +8515,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:8480: checking for location of TIFF library" >&5
+echo "configure:8519: 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; }
@@ -8507,13 +8546,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8511: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8550: 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 8517 "configure"
+#line 8556 "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
@@ -8524,7 +8563,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8567: \"$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
@@ -8543,13 +8582,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8547: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8586: 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 8553 "configure"
+#line 8592 "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
@@ -8560,7 +8599,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8603: \"$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
@@ -8579,13 +8618,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8583: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8622: 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 8589 "configure"
+#line 8628 "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
@@ -8596,7 +8635,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8639: \"$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
@@ -8615,13 +8654,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8619: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8658: 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 8625 "configure"
+#line 8664 "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
@@ -8632,7 +8671,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8675: \"$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
@@ -8651,13 +8690,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8655: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8694: 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 8661 "configure"
+#line 8700 "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
@@ -8668,7 +8707,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8711: \"$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
@@ -8687,13 +8726,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8691: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8730: 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 8697 "configure"
+#line 8736 "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
@@ -8704,7 +8743,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8747: \"$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
@@ -8723,13 +8762,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8727: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8766: 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 8733 "configure"
+#line 8772 "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
@@ -8740,7 +8779,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8783: \"$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
@@ -8759,13 +8798,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8763: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8802: 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 8769 "configure"
+#line 8808 "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
@@ -8776,7 +8815,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8819: \"$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
@@ -8874,7 +8913,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:8878: checking whether to use PNG" >&5
+echo "configure:8917: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -8893,7 +8932,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:8897: checking for location of PNG includes" >&5
+echo "configure:8936: 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; }
@@ -8919,15 +8958,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8923: checking for $ac_hdr" >&5
+echo "configure:8962: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8926 "configure"
+#line 8965 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8970: \"$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*
@@ -8961,7 +9000,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:8965: checking for location of PNG library" >&5
+echo "configure:9004: 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; }
@@ -8986,13 +9025,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8990: checking for png_read_image in -lpng" >&5
+echo "configure:9029: 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 8996 "configure"
+#line 9035 "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
@@ -9003,7 +9042,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:9007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9046: \"$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
@@ -9045,7 +9084,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:9049: checking whether to use PostgreSQL" >&5
+echo "configure:9088: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -9072,7 +9111,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:9076: checking for location of PostgreSQL includes" >&5
+echo "configure:9115: 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; }
@@ -9098,15 +9137,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9102: checking for $ac_hdr" >&5
+echo "configure:9141: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9105 "configure"
+#line 9144 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9149: \"$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*
@@ -9144,7 +9183,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:9148: checking for location of PostgreSQL library" >&5
+echo "configure:9187: 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; }
@@ -9173,13 +9212,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9177: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9216: 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 9183 "configure"
+#line 9222 "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
@@ -9190,7 +9229,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9233: \"$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
@@ -9209,13 +9248,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9213: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9252: 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 9219 "configure"
+#line 9258 "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
@@ -9226,7 +9265,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9269: \"$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
@@ -9245,13 +9284,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9249: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9288: 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 9255 "configure"
+#line 9294 "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
@@ -9262,7 +9301,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9305: \"$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
@@ -9281,13 +9320,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9285: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9324: 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 9291 "configure"
+#line 9330 "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
@@ -9298,7 +9337,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9341: \"$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
@@ -9355,13 +9394,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9359: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9398: 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 9365 "configure"
+#line 9404 "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
@@ -9372,7 +9411,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9415: \"$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
@@ -9394,13 +9433,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9398: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9437: 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 9404 "configure"
+#line 9443 "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
@@ -9411,7 +9450,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9454: \"$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
@@ -9454,7 +9493,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:9458: checking whether to use MySQL" >&5
+echo "configure:9497: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -9474,7 +9513,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:9478: checking for location of MySQL includes" >&5
+echo "configure:9517: 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; }
@@ -9500,15 +9539,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9504: checking for $ac_hdr" >&5
+echo "configure:9543: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9507 "configure"
+#line 9546 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9551: \"$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*
@@ -9545,7 +9584,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:9549: checking for location of MySQL library" >&5
+echo "configure:9588: 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; }
@@ -9576,13 +9615,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9580: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9619: 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 9586 "configure"
+#line 9625 "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
@@ -9593,7 +9632,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9636: \"$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
@@ -9612,13 +9651,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9616: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9655: 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 9622 "configure"
+#line 9661 "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
@@ -9629,7 +9668,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9672: \"$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
@@ -9648,13 +9687,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9652: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9691: 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 9658 "configure"
+#line 9697 "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
@@ -9665,7 +9704,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9708: \"$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
@@ -9684,13 +9723,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9688: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9727: 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 9694 "configure"
+#line 9733 "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
@@ -9701,7 +9740,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9744: \"$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
@@ -9720,13 +9759,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9724: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9763: 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 9730 "configure"
+#line 9769 "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
@@ -9737,7 +9776,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9780: \"$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
@@ -9756,13 +9795,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9760: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9799: 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 9766 "configure"
+#line 9805 "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
@@ -9773,7 +9812,7 @@
mysql_query()
; 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:9816: \"$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
@@ -9792,13 +9831,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9796: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9835: 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 9802 "configure"
+#line 9841 "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
@@ -9809,7 +9848,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9852: \"$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
@@ -9828,13 +9867,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9832: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9871: 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 9838 "configure"
+#line 9877 "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
@@ -9845,7 +9884,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9888: \"$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
@@ -9935,7 +9974,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:9939: checking for $ac_word" >&5
+echo "configure:9978: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -9976,10 +10015,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:9980: checking for mysql_server_init" >&5
+echo "configure:10019: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 9983 "configure"
+#line 10022 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -10002,7 +10041,7 @@
; return 0; }
EOF
-if { (eval echo configure:10006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10045: \"$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
@@ -10040,7 +10079,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:10044: checking whether to use SQLite" >&5
+echo "configure:10083: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -10060,7 +10099,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:10064: checking for location of SQLite includes" >&5
+echo "configure:10103: 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; }
@@ -10086,15 +10125,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10090: checking for $ac_hdr" >&5
+echo "configure:10129: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10093 "configure"
+#line 10132 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10137: \"$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*
@@ -10137,7 +10176,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:10141: checking for location of SQLite library" >&5
+echo "configure:10180: 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; }
@@ -10166,13 +10205,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10170: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10209: 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 10176 "configure"
+#line 10215 "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
@@ -10183,7 +10222,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10226: \"$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
@@ -10202,13 +10241,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10206: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10245: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10212 "configure"
+#line 10251 "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
@@ -10219,7 +10258,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10262: \"$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
@@ -10238,13 +10277,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10242: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10281: 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 10248 "configure"
+#line 10287 "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
@@ -10255,7 +10294,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10298: \"$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
@@ -10274,13 +10313,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10278: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10317: checking for sqlite3_open in -lsqlite3" >&5
ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsqlite3 $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10284 "configure"
+#line 10323 "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
@@ -10291,7 +10330,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10334: \"$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
@@ -10360,7 +10399,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10364: checking whether to use FFMPEG" >&5
+echo "configure:10403: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -10380,7 +10419,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10384: checking for location of FFMPEG includes" >&5
+echo "configure:10423: 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; }
@@ -10406,15 +10445,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10410: checking for $ac_hdr" >&5
+echo "configure:10449: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10413 "configure"
+#line 10452 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10457: \"$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*
@@ -10450,15 +10489,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10454: checking for $ac_hdr" >&5
+echo "configure:10493: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10457 "configure"
+#line 10496 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10501: \"$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*
@@ -10494,15 +10533,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10498: checking for $ac_hdr" >&5
+echo "configure:10537: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10501 "configure"
+#line 10540 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10545: \"$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*
@@ -10545,7 +10584,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10549: checking for location of FFMPEG library" >&5
+echo "configure:10588: 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; }
@@ -10572,13 +10611,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10576: checking for av_free in -lavutil" >&5
+echo "configure:10615: 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 10582 "configure"
+#line 10621 "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
@@ -10589,7 +10628,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10632: \"$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
@@ -10608,13 +10647,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10612: checking for av_free in -lavutil" >&5
+echo "configure:10651: 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 10618 "configure"
+#line 10657 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10625,7 +10664,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10670,13 +10709,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10674: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10713: 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 10680 "configure"
+#line 10719 "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
@@ -10687,7 +10726,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10730: \"$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
@@ -10706,13 +10745,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10710: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10749: 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 10716 "configure"
+#line 10755 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10723,7 +10762,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10768,13 +10807,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10772: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10811: 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 10778 "configure"
+#line 10817 "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
@@ -10785,7 +10824,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10828: \"$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
@@ -10804,13 +10843,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10808: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10847: 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 10814 "configure"
+#line 10853 "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
@@ -10821,7 +10860,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10864: \"$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,7 +10919,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:10884: checking whether to use OpenGL" >&5
+echo "configure:10923: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -10914,7 +10953,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10918: checking for location of OpenGL includes" >&5
+echo "configure:10957: 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; }
@@ -10940,15 +10979,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10944: checking for $ac_hdr" >&5
+echo "configure:10983: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10947 "configure"
+#line 10986 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10991: \"$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*
@@ -10982,7 +11021,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10986: checking for location of OpenGL library" >&5
+echo "configure:11025: 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; }
@@ -11011,13 +11050,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11015: checking for glBegin in -lGL" >&5
+echo "configure:11054: 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 11021 "configure"
+#line 11060 "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
@@ -11028,7 +11067,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11071: \"$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
@@ -11047,13 +11086,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11051: checking for glBegin in -lGL" >&5
+echo "configure:11090: 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 11057 "configure"
+#line 11096 "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
@@ -11064,7 +11103,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11107: \"$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
@@ -11083,13 +11122,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11087: checking for glBegin in -lGL" >&5
+echo "configure:11126: 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 11093 "configure"
+#line 11132 "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
@@ -11100,7 +11139,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11143: \"$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
@@ -11119,13 +11158,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11123: checking for glBegin in -lGL" >&5
+echo "configure:11162: 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 11129 "configure"
+#line 11168 "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
@@ -11136,7 +11175,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11179: \"$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
@@ -11198,13 +11237,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11202: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11241: 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 11208 "configure"
+#line 11247 "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
@@ -11215,7 +11254,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11258: \"$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
@@ -11234,13 +11273,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11238: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11277: 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 11244 "configure"
+#line 11283 "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
@@ -11251,7 +11290,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11294: \"$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
@@ -11295,10 +11334,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $OPENGLLIB"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:11299: checking for glXCreatePbuffer" >&5
+echo "configure:11338: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 11302 "configure"
+#line 11341 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -11321,7 +11360,7 @@
; return 0; }
EOF
-if { (eval echo configure:11325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11364: \"$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
@@ -11343,10 +11382,10 @@
fi
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11347: checking for glXCreateGLXPixmap" >&5
+echo "configure:11386: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 11350 "configure"
+#line 11389 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -11369,7 +11408,7 @@
; return 0; }
EOF
-if { (eval echo configure:11373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11412: \"$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
@@ -11408,7 +11447,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11412: checking for location of OpenGL includes" >&5
+echo "configure:11451: 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; }
@@ -11434,15 +11473,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11438: checking for $ac_hdr" >&5
+echo "configure:11477: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11441 "configure"
+#line 11480 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11485: \"$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*
@@ -11477,10 +11516,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$with_opengl_libs $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11481: checking for glBegin" >&5
+echo "configure:11520: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 11484 "configure"
+#line 11523 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -11503,7 +11542,7 @@
; return 0; }
EOF
-if { (eval echo configure:11507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11546: \"$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
@@ -11518,10 +11557,10 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11522: checking for gluBeginCurve" >&5
+echo "configure:11561: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 11525 "configure"
+#line 11564 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -11544,7 +11583,7 @@
; return 0; }
EOF
-if { (eval echo configure:11548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11587: \"$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
@@ -11588,7 +11627,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11592: checking for location of OpenGL includes" >&5
+echo "configure:11631: 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; }
@@ -11614,15 +11653,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11618: checking for $ac_hdr" >&5
+echo "configure:11657: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11621 "configure"
+#line 11660 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11665: \"$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*
@@ -11656,7 +11695,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11660: checking for location of OpenGL library" >&5
+echo "configure:11699: 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; }
@@ -11681,18 +11720,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11685: checking for OpenGL library" >&5
+echo "configure:11724: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 11689 "configure"
+#line 11728 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:11696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11716,18 +11755,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11720: checking for GLU library" >&5
+echo "configure:11759: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 11724 "configure"
+#line 11763 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:11731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11776,7 +11815,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:11780: checking whether to use Tcl/Tk" >&5
+echo "configure:11819: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -11796,7 +11835,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:11800: checking for location of Tcl/Tk includes" >&5
+echo "configure:11839: 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; }
@@ -11822,15 +11861,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11826: checking for $ac_hdr" >&5
+echo "configure:11865: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11829 "configure"
+#line 11868 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11873: \"$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*
@@ -11867,15 +11906,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11871: checking for $ac_hdr" >&5
+echo "configure:11910: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11874 "configure"
+#line 11913 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11918: \"$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*
@@ -11908,7 +11947,7 @@
# Tcl/Tk version checks
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:11912: checking Tcl version" >&5
+echo "configure:11951: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -11916,7 +11955,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11920 "configure"
+#line 11959 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11928,7 +11967,7 @@
}
EOF
-if { (eval echo configure:11932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11971: \"$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
@@ -11946,7 +11985,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:11950: checking Tk version" >&5
+echo "configure:11989: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -11954,7 +11993,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11958 "configure"
+#line 11997 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11966,7 +12005,7 @@
}
EOF
-if { (eval echo configure:11970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12009: \"$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
@@ -11997,7 +12036,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:12001: checking for location of Tcl/Tk library" >&5
+echo "configure:12040: 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; }
@@ -12037,13 +12076,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:12041: checking for Tcl_Init in -ltcl" >&5
+echo "configure:12080: 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 12047 "configure"
+#line 12086 "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
@@ -12054,7 +12093,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12097: \"$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
@@ -12073,13 +12112,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:12077: checking for Tcl_Init in -ltcl" >&5
+echo "configure:12116: 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 12083 "configure"
+#line 12122 "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
@@ -12090,7 +12129,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12133: \"$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
@@ -12117,13 +12156,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12121: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:12160: 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 12127 "configure"
+#line 12166 "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
@@ -12134,7 +12173,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12177: \"$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
@@ -12153,13 +12192,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12157: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:12196: 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 12163 "configure"
+#line 12202 "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
@@ -12170,7 +12209,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12213: \"$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
@@ -12197,13 +12236,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12201: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:12240: 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 12207 "configure"
+#line 12246 "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
@@ -12214,7 +12253,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12257: \"$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
@@ -12233,13 +12272,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12237: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:12276: 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 12243 "configure"
+#line 12282 "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
@@ -12250,7 +12289,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12293: \"$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
@@ -12328,13 +12367,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:12332: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:12371: 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 12338 "configure"
+#line 12377 "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
@@ -12345,7 +12384,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12388: \"$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
@@ -12364,13 +12403,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:12368: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:12407: 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 12374 "configure"
+#line 12413 "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
@@ -12381,7 +12420,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12424: \"$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
@@ -12408,13 +12447,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12412: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:12451: 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 12418 "configure"
+#line 12457 "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
@@ -12425,7 +12464,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12468: \"$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
@@ -12444,13 +12483,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12448: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:12487: 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 12454 "configure"
+#line 12493 "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
@@ -12461,7 +12500,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12504: \"$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
@@ -12488,13 +12527,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12492: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:12531: 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 12498 "configure"
+#line 12537 "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
@@ -12505,7 +12544,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12548: \"$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
@@ -12524,13 +12563,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12528: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:12567: 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 12534 "configure"
+#line 12573 "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
@@ -12541,7 +12580,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12584: \"$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
@@ -12631,13 +12670,13 @@
do
# add only if in MACOSX_ARCHS
echo $ac_n "checking for Tcl_Init in -l$tlib""... $ac_c" 1>&6
-echo "configure:12635: checking for Tcl_Init in -l$tlib" >&5
+echo "configure:12674: checking for Tcl_Init in -l$tlib" >&5
ac_lib_var=`echo $tlib'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-l$tlib -arch $a $MACOSX_SDK $TCLTKLIBPATH $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12641 "configure"
+#line 12680 "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
@@ -12648,7 +12687,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12691: \"$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
@@ -12697,7 +12736,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:12701: checking whether to use ODBC" >&5
+echo "configure:12740: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -12716,7 +12755,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:12720: checking for location of ODBC includes" >&5
+echo "configure:12759: 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; }
@@ -12742,15 +12781,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12746: checking for $ac_hdr" >&5
+echo "configure:12785: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12749 "configure"
+#line 12788 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12793: \"$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*
@@ -12784,7 +12823,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:12788: checking for location of ODBC library" >&5
+echo "configure:12827: 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; }
@@ -12809,13 +12848,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:12813: checking for SQLConnect in -lodbc" >&5
+echo "configure:12852: 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 12819 "configure"
+#line 12858 "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
@@ -12826,7 +12865,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12869: \"$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
@@ -12851,13 +12890,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:12855: checking for SQLConnect in -liodbc" >&5
+echo "configure:12894: 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 12861 "configure"
+#line 12900 "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
@@ -12868,7 +12907,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12911: \"$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
@@ -12893,11 +12932,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:12897: checking for ODBC library" >&5
+echo "configure:12936: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 12901 "configure"
+#line 12940 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -12905,7 +12944,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:12909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -12954,7 +12993,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:12958: checking whether to use FFTW" >&5
+echo "configure:12997: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -12973,7 +13012,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:12977: checking for location of FFTW includes" >&5
+echo "configure:13016: 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; }
@@ -12999,15 +13038,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13003: checking for $ac_hdr" >&5
+echo "configure:13042: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13006 "configure"
+#line 13045 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13050: \"$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*
@@ -13035,15 +13074,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13039: checking for $ac_hdr" >&5
+echo "configure:13078: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13042 "configure"
+#line 13081 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13086: \"$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*
@@ -13071,15 +13110,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13075: checking for $ac_hdr" >&5
+echo "configure:13114: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13078 "configure"
+#line 13117 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13122: \"$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*
@@ -13125,7 +13164,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:13129: checking for location of FFTW library" >&5
+echo "configure:13168: 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; }
@@ -13150,13 +13189,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:13154: checking for fftw_execute in -lfftw3" >&5
+echo "configure:13193: 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 13160 "configure"
+#line 13199 "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
@@ -13167,7 +13206,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:13171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13210: \"$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
@@ -13192,13 +13231,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:13196: checking for fftwnd_one in -lfftw" >&5
+echo "configure:13235: 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 13202 "configure"
+#line 13241 "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
@@ -13209,7 +13248,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:13213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13252: \"$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
@@ -13234,13 +13273,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:13238: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:13277: 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 13244 "configure"
+#line 13283 "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
@@ -13251,7 +13290,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:13255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13294: \"$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
@@ -13308,7 +13347,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:13312: checking whether to use BLAS" >&5
+echo "configure:13351: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -13329,7 +13368,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:13333: checking for location of BLAS includes" >&5
+echo "configure:13372: 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; }
@@ -13349,7 +13388,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:13353: checking for location of BLAS library" >&5
+echo "configure:13392: 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; }
@@ -13375,15 +13414,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13379: checking for $ac_hdr" >&5
+echo "configure:13418: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13382 "configure"
+#line 13421 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13426: \"$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*
@@ -13418,13 +13457,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:13422: checking for dnrm2_ in -lblas" >&5
+echo "configure:13461: 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 13428 "configure"
+#line 13467 "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
@@ -13435,7 +13474,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:13439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13478: \"$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
@@ -13454,13 +13493,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:13458: checking for dnrm2_ in -lblas" >&5
+echo "configure:13497: 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 13464 "configure"
+#line 13503 "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
@@ -13471,7 +13510,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:13475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13514: \"$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
@@ -13515,13 +13554,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:13519: checking for ATL_xerbla in -latlas" >&5
+echo "configure:13558: 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 13525 "configure"
+#line 13564 "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
@@ -13532,7 +13571,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:13536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13575: \"$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
@@ -13547,13 +13586,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:13551: checking for sgemm_ in -lf77blas" >&5
+echo "configure:13590: 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 13557 "configure"
+#line 13596 "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
@@ -13564,7 +13603,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13607: \"$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
@@ -13579,13 +13618,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:13583: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:13622: 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 13589 "configure"
+#line 13628 "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
@@ -13596,7 +13635,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:13600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13639: \"$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
@@ -13642,16 +13681,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:13646: checking for sgemm in $vlib_flags" >&5
+echo "configure:13685: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 13648 "configure"
+#line 13687 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:13655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13694: \"$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
@@ -13669,13 +13708,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:13673: checking for sgemm_ in -lblas" >&5
+echo "configure:13712: 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 13679 "configure"
+#line 13718 "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
@@ -13686,7 +13725,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13729: \"$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
@@ -13701,13 +13740,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:13705: checking for dgemm_ in -ldgemm" >&5
+echo "configure:13744: 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 13711 "configure"
+#line 13750 "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
@@ -13718,7 +13757,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:13722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13761: \"$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
@@ -13733,13 +13772,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:13737: checking for sgemm_ in -lsgemm" >&5
+echo "configure:13776: 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 13743 "configure"
+#line 13782 "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
@@ -13750,7 +13789,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13793: \"$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
@@ -13784,13 +13823,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:13788: checking for acosp in -lsunmath" >&5
+echo "configure:13827: 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 13794 "configure"
+#line 13833 "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
@@ -13801,7 +13840,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:13805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13844: \"$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
@@ -13816,13 +13855,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:13820: checking for sgemm_ in -lsunperf" >&5
+echo "configure:13859: 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 13826 "configure"
+#line 13865 "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
@@ -13833,7 +13872,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13876: \"$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
@@ -13863,13 +13902,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:13867: checking for sgemm_ in -lblas" >&5
+echo "configure:13906: 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 13873 "configure"
+#line 13912 "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
@@ -13880,7 +13919,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13923: \"$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
@@ -13919,7 +13958,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:13923: checking whether to use LAPACK" >&5
+echo "configure:13962: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -13944,7 +13983,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:13948: checking for location of LAPACK includes" >&5
+echo "configure:13987: 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; }
@@ -13964,7 +14003,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:13968: checking for location of LAPACK library" >&5
+echo "configure:14007: 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; }
@@ -13990,15 +14029,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13994: checking for $ac_hdr" >&5
+echo "configure:14033: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13997 "configure"
+#line 14036 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14041: \"$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*
@@ -14030,10 +14069,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:14034: checking for dsegv_" >&5
+echo "configure:14073: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 14037 "configure"
+#line 14076 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -14056,7 +14095,7 @@
; return 0; }
EOF
-if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14099: \"$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
@@ -14083,13 +14122,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:14087: checking for desgv_ in -llapack" >&5
+echo "configure:14126: 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 14093 "configure"
+#line 14132 "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
@@ -14100,7 +14139,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:14104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14143: \"$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
@@ -14132,13 +14171,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:14136: checking for dgesv_ in -llapack" >&5
+echo "configure:14175: 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 14142 "configure"
+#line 14181 "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
@@ -14149,7 +14188,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:14153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14192: \"$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
@@ -14168,13 +14207,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:14172: checking for dgesv_ in -llapack" >&5
+echo "configure:14211: 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 14178 "configure"
+#line 14217 "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
@@ -14185,7 +14224,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:14189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14228: \"$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
@@ -14241,7 +14280,7 @@
echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:14245: checking whether to use Motif" >&5
+echo "configure:14284: checking whether to use Motif" >&5
echo "$ac_t"""$with_motif"" 1>&6
case "$with_motif" in
"no") USE_MOTIF= ;;
@@ -14260,7 +14299,7 @@
echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:14264: checking for location of Motif includes" >&5
+echo "configure:14303: 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; }
@@ -14286,15 +14325,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14290: checking for $ac_hdr" >&5
+echo "configure:14329: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14293 "configure"
+#line 14332 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14337: \"$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*
@@ -14328,7 +14367,7 @@
echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:14332: checking for location of Motif library" >&5
+echo "configure:14371: 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; }
@@ -14353,13 +14392,13 @@
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:14357: checking for XmStringCreate in -lXm" >&5
+echo "configure:14396: 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 14363 "configure"
+#line 14402 "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
@@ -14370,7 +14409,7 @@
XmStringCreate()
; return 0; }
EOF
-if { (eval echo configure:14374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14413: \"$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
@@ -14411,7 +14450,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:14415: checking whether to use Cairo" >&5
+echo "configure:14454: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -14437,7 +14476,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:14441: checking for location of cairo includes" >&5
+echo "configure:14480: 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; }
@@ -14463,15 +14502,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14467: checking for $ac_hdr" >&5
+echo "configure:14506: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14470 "configure"
+#line 14509 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14514: \"$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*
@@ -14507,7 +14546,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:14511: checking for location of cairo library" >&5
+echo "configure:14550: 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; }
@@ -14527,7 +14566,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:14531: checking for cairo linking flags" >&5
+echo "configure:14570: 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; }
@@ -14543,10 +14582,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:14547: checking for cairo_create" >&5
+echo "configure:14586: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 14550 "configure"
+#line 14589 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -14569,7 +14608,7 @@
; return 0; }
EOF
-if { (eval echo configure:14573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14612: \"$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
@@ -14603,10 +14642,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:14607: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:14646: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 14610 "configure"
+#line 14649 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_xlib_surface_create_with_xrender_format(); below. */
@@ -14629,7 +14668,7 @@
; return 0; }
EOF
-if { (eval echo configure:14633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_xlib_surface_create_with_xrender_format=yes"
else
@@ -14671,7 +14710,7 @@
echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
-echo "configure:14675: checking whether to use GLw" >&5
+echo "configure:14714: checking whether to use GLw" >&5
echo "$ac_t"""$with_glw"" 1>&6
case "$with_glw" in
"no") USE_GLW= ;;
@@ -14690,7 +14729,7 @@
echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
-echo "configure:14694: checking for location of GLw includes" >&5
+echo "configure:14733: checking for location of GLw includes" >&5
case "$with_glw_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-glw-includes." 1>&2; exit 1; }
@@ -14716,15 +14755,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14720: checking for $ac_hdr" >&5
+echo "configure:14759: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14723 "configure"
+#line 14762 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14767: \"$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*
@@ -14752,15 +14791,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14756: checking for $ac_hdr" >&5
+echo "configure:14795: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14759 "configure"
+#line 14798 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14803: \"$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*
@@ -14800,7 +14839,7 @@
echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
-echo "configure:14804: checking for location of GLw library" >&5
+echo "configure:14843: checking for location of GLw library" >&5
case "$with_glw_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-glw-libs." 1>&2; exit 1; }
@@ -14825,13 +14864,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14829: checking for GLwCreateMDrawingArea in -lGLw" >&5
+echo "configure:14868: checking for GLwCreateMDrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14835 "configure"
+#line 14874 "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
@@ -14842,7 +14881,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14885: \"$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
@@ -14867,13 +14906,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14871: checking for GLwCreateM1DrawingArea in -lGLw" >&5
+echo "configure:14910: checking for GLwCreateM1DrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14877 "configure"
+#line 14916 "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
@@ -14884,7 +14923,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14927: \"$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
@@ -14909,13 +14948,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14913: checking for GLwCreateM2DrawingArea in -lGLw" >&5
+echo "configure:14952: checking for GLwCreateM2DrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14919 "configure"
+#line 14958 "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
@@ -14926,7 +14965,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14969: \"$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
@@ -14951,13 +14990,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14955: checking for GLwCreateMDrawingArea in -lGLwM" >&5
+echo "configure:14994: checking for GLwCreateMDrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14961 "configure"
+#line 15000 "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
@@ -14968,7 +15007,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15011: \"$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
@@ -14993,13 +15032,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14997: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
+echo "configure:15036: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15003 "configure"
+#line 15042 "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
@@ -15010,7 +15049,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15053: \"$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
@@ -15035,13 +15074,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:15039: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
+echo "configure:15078: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15045 "configure"
+#line 15084 "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
@@ -15052,7 +15091,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15095: \"$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
@@ -15079,13 +15118,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:15083: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:15122: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15089 "configure"
+#line 15128 "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
@@ -15096,7 +15135,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15139: \"$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
@@ -15115,13 +15154,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:15119: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:15158: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15125 "configure"
+#line 15164 "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
@@ -15132,7 +15171,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15175: \"$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
@@ -15159,13 +15198,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:15163: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:15202: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15169 "configure"
+#line 15208 "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
@@ -15176,7 +15215,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15219: \"$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
@@ -15195,13 +15234,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:15199: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:15238: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15205 "configure"
+#line 15244 "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
@@ -15212,7 +15251,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15255: \"$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
@@ -15325,7 +15364,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:15329: checking whether to use FreeType" >&5
+echo "configure:15368: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -15344,7 +15383,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:15348: checking for location of FreeType includes" >&5
+echo "configure:15387: 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; }
@@ -15370,15 +15409,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15374: checking for $ac_hdr" >&5
+echo "configure:15413: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15377 "configure"
+#line 15416 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15421: \"$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*
@@ -15412,7 +15451,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:15416: checking for location of FreeType library" >&5
+echo "configure:15455: 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; }
@@ -15437,13 +15476,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:15441: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:15480: 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 15447 "configure"
+#line 15486 "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
@@ -15454,7 +15493,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:15458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15497: \"$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
@@ -15495,7 +15534,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:15499: checking whether to use NLS" >&5
+echo "configure:15538: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -15515,10 +15554,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:15519: checking for gettext" >&5
+echo "configure:15558: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 15522 "configure"
+#line 15561 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -15541,7 +15580,7 @@
; return 0; }
EOF
-if { (eval echo configure:15545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15584: \"$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
@@ -15559,13 +15598,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:15563: checking for gettext in -lintl" >&5
+echo "configure:15602: 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 15569 "configure"
+#line 15608 "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
@@ -15576,7 +15615,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:15580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15619: \"$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
@@ -15611,7 +15650,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:15615: checking whether to use C++" >&5
+echo "configure:15654: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -15627,7 +15666,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:15631: checking for $ac_word" >&5
+echo "configure:15670: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -15656,7 +15695,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:15660: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:15699: 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.
@@ -15667,12 +15706,12 @@
cat > conftest.$ac_ext << EOF
-#line 15671 "configure"
+#line 15710 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:15676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15715: \"$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
@@ -15698,19 +15737,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:15702: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:15741: 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:15707: checking whether we are using GNU C++" >&5
+echo "configure:15746: 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:15714: \"$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:15753: \"$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
@@ -15728,7 +15767,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:15732: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:15771: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -15769,7 +15808,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:15773: checking whether to use openDWG" >&5
+echo "configure:15812: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -15789,7 +15828,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:15793: checking for location of openDGW includes" >&5
+echo "configure:15832: 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; }
@@ -15815,15 +15854,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15819: checking for $ac_hdr" >&5
+echo "configure:15858: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15822 "configure"
+#line 15861 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15866: \"$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*
@@ -15857,7 +15896,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:15861: checking for location of openDWG library" >&5
+echo "configure:15900: 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; }
@@ -15904,7 +15943,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:15908: checking for special C compiler options needed for large files" >&5
+echo "configure:15947: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -15912,7 +15951,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 15916 "configure"
+#line 15955 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15928,7 +15967,7 @@
; return 0; }
EOF
-if { (eval echo configure:15932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -15937,7 +15976,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 15941 "configure"
+#line 15980 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15953,7 +15992,7 @@
; return 0; }
EOF
-if { (eval echo configure:15957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -15973,11 +16012,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:15977: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:16016: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 15981 "configure"
+#line 16020 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15993,14 +16032,14 @@
; return 0; }
EOF
-if { (eval echo configure:15997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16036: \"$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 16004 "configure"
+#line 16043 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -16018,7 +16057,7 @@
; return 0; }
EOF
-if { (eval echo configure:16022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -16037,11 +16076,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:16041: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:16080: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 16045 "configure"
+#line 16084 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -16057,14 +16096,14 @@
; return 0; }
EOF
-if { (eval echo configure:16061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16100: \"$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 16068 "configure"
+#line 16107 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -16082,7 +16121,7 @@
; return 0; }
EOF
-if { (eval echo configure:16086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -16101,25 +16140,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:16105: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:16144: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 16109 "configure"
+#line 16148 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:16116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16155: \"$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 16123 "configure"
+#line 16162 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -16128,7 +16167,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:16132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -16149,10 +16188,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:16153: checking if system supports Large Files at all" >&5
+echo "configure:16192: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 16156 "configure"
+#line 16195 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -16184,7 +16223,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:16188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -16213,7 +16252,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:16217: checking whether to use Python" >&5
+echo "configure:16256: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -16233,7 +16272,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:16237: checking for $ac_word" >&5
+echo "configure:16276: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -16275,15 +16314,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16279: checking for $ac_hdr" >&5
+echo "configure:16318: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16282 "configure"
+#line 16321 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16326: \"$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*
@@ -16353,7 +16392,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:16357: checking whether to use wxWidgets" >&5
+echo "configure:16396: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -16374,7 +16413,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:16378: checking for $ac_word" >&5
+echo "configure:16417: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -16422,7 +16461,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:16426: checking wxWidgets version" >&5
+echo "configure:16465: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -16445,15 +16484,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16449: checking for $ac_hdr" >&5
+echo "configure:16488: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16452 "configure"
+#line 16491 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16496: \"$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*
@@ -16632,12 +16671,14 @@
s%@ARCH@%$ARCH%g
s%@GISBASE@%$GISBASE%g
s%@GRASS_BIN@%$GRASS_BIN%g
+s%@SVN_VERSION@%$SVN_VERSION%g
s%@GRASS_VERSION_FILE@%$GRASS_VERSION_FILE%g
s%@GRASS_VERSION_MAJOR@%$GRASS_VERSION_MAJOR%g
s%@GRASS_VERSION_MINOR@%$GRASS_VERSION_MINOR%g
s%@GRASS_VERSION_RELEASE@%$GRASS_VERSION_RELEASE%g
s%@GRASS_VERSION_NUMBER@%$GRASS_VERSION_NUMBER%g
s%@GRASS_VERSION_DATE@%$GRASS_VERSION_DATE%g
+s%@GRASS_VERSION_SVN@%$GRASS_VERSION_SVN%g
s%@NAME_VER@%$NAME_VER%g
s%@LIB_VER@%$LIB_VER%g
s%@MACOSX_APP@%$MACOSX_APP%g
Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in 2011-03-03 07:42:56 UTC (rev 45525)
+++ grass/branches/develbranch_6/configure.in 2011-03-03 07:44:18 UTC (rev 45526)
@@ -124,12 +124,19 @@
LIB_VER=`echo ${GRASS_VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
changequote([,])
+GRASS_VERSION_SVN=
+AC_PATH_PROG(SVN_VERSION, svnversion, no)
+if test "$SVN_VERSION" != "no" ; then
+ GRASS_VERSION_SVN=`$SVN_VERSION -c | cut -f2 -d:`
+fi
+
AC_SUBST(GRASS_VERSION_FILE)
AC_SUBST(GRASS_VERSION_MAJOR)
AC_SUBST(GRASS_VERSION_MINOR)
AC_SUBST(GRASS_VERSION_RELEASE)
AC_SUBST(GRASS_VERSION_NUMBER)
AC_SUBST(GRASS_VERSION_DATE)
+AC_SUBST(GRASS_VERSION_SVN)
AC_SUBST(NAME_VER)
AC_SUBST(LIB_VER)
Modified: grass/branches/develbranch_6/general/g.version/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.version/main.c 2011-03-03 07:42:56 UTC (rev 45525)
+++ grass/branches/develbranch_6/general/g.version/main.c 2011-03-03 07:44:18 UTC (rev 45526)
@@ -1,4 +1,3 @@
-
/***************************************************************************
*
* MODULE: g.version
@@ -7,7 +6,7 @@
* Justin Hickey - Thailand - jhickey hpcc.nectec.or.th
* PURPOSE: Output GRASS version number, date and copyright message.
*
-* COPYRIGHT: (C) 2000-2009, 2011 by the GRASS Development Team
+* COPYRIGHT: (C) 2000-2011 by the GRASS Development Team
*
* This program is free software under the GPL (>=v2)
* Read the file COPYING that comes with GRASS for details.
@@ -62,16 +61,18 @@
if (argc > 1 && G_parser(argc, argv))
exit(EXIT_FAILURE);
+
if (shell->answer) {
fprintf(stdout, "version=%s\n", GRASS_VERSION_NUMBER);
+ fprintf(stdout, "revision=%s\n", GRASS_VERSION_SVN);
fprintf(stdout, "date=%s\n", GRASS_VERSION_DATE);
}
else {
- fprintf(stdout, "GRASS %s (%s) %s\n",
- GRASS_VERSION_NUMBER, GRASS_VERSION_DATE,
- GRASS_VERSION_UPDATE_PKG);
+ fprintf(stdout, "GRASS %s%s (%s) %s\n",
+ GRASS_VERSION_NUMBER, GRASS_VERSION_SVN,
+ GRASS_VERSION_DATE, GRASS_VERSION_UPDATE_PKG);
}
-
+
if (copyright->answer) {
fprintf(stdout, "\n");
fputs(COPYING, stdout);
@@ -87,8 +88,8 @@
char **rev_ver = G_tokenize(GIS_H_VERSION, "$");
char **rev_time = G_tokenize(GIS_H_DATE, "$");
if (shell->answer) {
- fprintf(stdout, "gis_revision=%s\n", rev_ver[1]);
- fprintf(stdout, "gis_date=%s\n", rev_time[1]);
+ fprintf(stdout, "libgis_revision=%s\n", strstr(rev_ver[1], " ") + 1);
+ fprintf(stdout, "libgis_date=\"%s\"\n", strstr(rev_time[1], " ") + 1);
}
else {
fprintf(stdout, "%s\n%s\n", rev_ver[1], rev_time[1]);
Modified: grass/branches/develbranch_6/include/Make/Grass.make.in
===================================================================
--- grass/branches/develbranch_6/include/Make/Grass.make.in 2011-03-03 07:42:56 UTC (rev 45525)
+++ grass/branches/develbranch_6/include/Make/Grass.make.in 2011-03-03 07:44:18 UTC (rev 45526)
@@ -71,6 +71,7 @@
GRASS_VERSION_MINOR = @GRASS_VERSION_MINOR@
GRASS_VERSION_RELEASE = @GRASS_VERSION_RELEASE@
GRASS_VERSION_DATE = @GRASS_VERSION_DATE@
+GRASS_VERSION_SVN = @GRASS_VERSION_SVN@
GRASS_VERSION_NUMBER = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE)
GRASS_VERSION_NAME = $(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)$(GRASS_VERSION_RELEASE)
Modified: grass/branches/develbranch_6/lib/init/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/init/Makefile 2011-03-03 07:42:56 UTC (rev 45525)
+++ grass/branches/develbranch_6/lib/init/Makefile 2011-03-03 07:44:18 UTC (rev 45526)
@@ -138,7 +138,11 @@
$(ETC)/VERSIONNUMBER:
rm -f $@
- echo "$(GRASS_VERSION_NUMBER)" > $@
+ @if [ -n "$(GRASS_VERSION_SVN)" ] ; then \
+ echo "$(GRASS_VERSION_NUMBER) r$(GRASS_VERSION_SVN)" > $@ ; \
+ else \
+ echo "$(GRASS_VERSION_NUMBER)" > $@ ; \
+ fi
chmod +r $@
$(ETC)/grass_intro: grass_intro.txt version.sed
Modified: grass/branches/develbranch_6/lib/python/core.py
===================================================================
--- grass/branches/develbranch_6/lib/python/core.py 2011-03-03 07:42:56 UTC (rev 45525)
+++ grass/branches/develbranch_6/lib/python/core.py 2011-03-03 07:44:18 UTC (rev 45526)
@@ -1074,8 +1074,8 @@
@code
version()
- {'date': '2010', 'gis_revision': 'Revision: 38990', 'version': '6.5.svn',
- 'gis_date': 'Date: 2009-09-05 19:01:13 +0200 (Sat, 05 Sep 2009)'}
+ {'date': '2011', 'libgis_revision': '38990', 'version': '6.5.svn',
+ 'libgis_date': '2009-09-05 19:01:13 +0200 (Sat, 05 Sep 2009)'}
@endcode
"""
return parse_command('g.version',
More information about the grass-commit
mailing list