[GRASS-SVN] r71889 - in grass/trunk: . include include/Make lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 4 10:15:57 PST 2017
Author: mmetz
Date: 2017-12-04 10:15:57 -0800 (Mon, 04 Dec 2017)
New Revision: 71889
Modified:
grass/trunk/configure
grass/trunk/configure.in
grass/trunk/include/Make/Grass.make
grass/trunk/include/Make/Platform.make.in
grass/trunk/include/config.h.in
grass/trunk/lib/gis/Makefile
Log:
add ZSTD (Zstandard) compression to the Make system
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2017-12-04 15:37:44 UTC (rev 71888)
+++ grass/trunk/configure 2017-12-04 18:15:57 UTC (rev 71889)
@@ -69,6 +69,8 @@
ac_help="$ac_help
--with-bzlib support BZIP2 functionality (default: no)"
ac_help="$ac_help
+ --with-zstd support Zstandard functionality (default: no)"
+ac_help="$ac_help
--with-gdal[=path/gdal-config]
enable GDAL/OGR support (gdal-config with path,
e.g. '--with-gdal=/usr/local/bin/gdal-config')"
@@ -112,6 +114,11 @@
ac_help="$ac_help
--with-bzlib-libs=DIRS BZIP2 library files are in DIRS"
ac_help="$ac_help
+ --with-zstd-includes=DIRS
+ ZSTD include files are in DIRS"
+ac_help="$ac_help
+ --with-zstd-libs=DIRS ZSTD library files are in DIRS"
+ac_help="$ac_help
--with-readline-includes=DIRS
Readline include files are in DIRS"
ac_help="$ac_help
@@ -755,7 +762,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:759: checking host system type" >&5
+echo "configure:766: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -778,7 +785,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:782: checking for $ac_word" >&5
+echo "configure:789: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -805,7 +812,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:809: checking for $ac_word" >&5
+echo "configure:816: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -853,7 +860,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:857: checking for $ac_word" >&5
+echo "configure:864: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -882,7 +889,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:886: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:893: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -893,12 +900,12 @@
cat > conftest.$ac_ext << EOF
-#line 897 "configure"
+#line 904 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -924,19 +931,19 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:928: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:935: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:933: checking whether we are using GNU C" >&5
+echo "configure:940: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -954,7 +961,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:958: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:965: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -983,10 +990,10 @@
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:987: checking for Cygwin environment" >&5
+echo "configure:994: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 990 "configure"
+#line 997 "configure"
#include "confdefs.h"
int main() {
@@ -997,7 +1004,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:1001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -1013,17 +1020,17 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1017: checking for mingw32 environment" >&5
+echo "configure:1024: checking for mingw32 environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 1020 "configure"
+#line 1027 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1041,7 +1048,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1045: checking for executable suffix" >&5
+echo "configure:1052: checking for executable suffix" >&5
if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
ac_cv_exeext=.exe
@@ -1060,23 +1067,23 @@
IEEEFLAG=
echo $ac_n "checking for full floating-point support""... $ac_c" 1>&6
-echo "configure:1064: checking for full floating-point support" >&5
+echo "configure:1071: checking for full floating-point support" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
echo $ac_n "checking whether "cc -mieee" works""... $ac_c" 1>&6
-echo "configure:1069: checking whether "cc -mieee" works" >&5
+echo "configure:1076: checking whether "cc -mieee" works" >&5
ac_save_cflags=${CFLAGS}
CFLAGS="$CFLAGS -mieee"
cat > conftest.$ac_ext <<EOF
-#line 1073 "configure"
+#line 1080 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
IEEEFLAG="-mieee"
@@ -1092,7 +1099,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 1096 "configure"
+#line 1103 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1106,7 +1113,7 @@
}
EOF
-if { (eval echo configure:1110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
@@ -1119,14 +1126,14 @@
CFLAGS=-mieee
echo $ac_n "checking for full floating-point support with -mieee""... $ac_c" 1>&6
-echo "configure:1123: checking for full floating-point support with -mieee" >&5
+echo "configure:1130: checking for full floating-point support with -mieee" >&5
if test "$cross_compiling" = yes; then
echo "$ac_t""unknown (cross-compiling)" 1>&6
{ echo "configure: error: *** INTERNAL CONFIGURE ERROR" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1130 "configure"
+#line 1137 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1140,7 +1147,7 @@
}
EOF
-if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6
IEEEFLAG="-mieee"
@@ -1177,7 +1184,7 @@
# Extract the first word of "pwd", so it can be a program name with args.
set dummy pwd; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1181: checking for $ac_word" >&5
+echo "configure:1188: checking for $ac_word" >&5
case "$pwd" in
/*)
@@ -1215,7 +1222,7 @@
fi
echo $ac_n "checking for source directory""... $ac_c" 1>&6
-echo "configure:1219: checking for source directory" >&5
+echo "configure:1226: checking for source directory" >&5
if test -z "$srcdir" ; then
SRCDIR=`$pwd`
@@ -1226,7 +1233,7 @@
echo "$ac_t"""$SRCDIR"" 1>&6
echo $ac_n "checking for build directory""... $ac_c" 1>&6
-echo "configure:1230: checking for build directory" >&5
+echo "configure:1237: checking for build directory" >&5
DSTDIR=`$pwd`
WINDSTDIR=`$winpwd`
@@ -1294,7 +1301,7 @@
# 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
+echo "configure:1305: checking for $ac_word" >&5
case "$SVN_VERSION" in
/*)
@@ -1355,7 +1362,7 @@
echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1359: checking for MacOSX App" >&5
+echo "configure:1366: checking for MacOSX App" >&5
case "$enable_macosx_app" in
yes) MACOSX_APP=1 ;;
no) MACOSX_APP= ;;
@@ -1367,7 +1374,7 @@
# Check for MacOSX archs
echo $ac_n "checking for MacOSX architectures""... $ac_c" 1>&6
-echo "configure:1371: checking for MacOSX architectures" >&5
+echo "configure:1378: checking for MacOSX architectures" >&5
MACOSX_ARCHS=
@@ -1396,7 +1403,7 @@
# Check for MacOSX SDK
echo $ac_n "checking for MacOSX SDK""... $ac_c" 1>&6
-echo "configure:1400: checking for MacOSX SDK" >&5
+echo "configure:1407: checking for MacOSX SDK" >&5
MACOSX_SDK=
@@ -1406,7 +1413,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:1410: checking for $with_macosx_sdk/SDKSettings.plist" >&5
+echo "configure:1417: 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; }
@@ -1450,7 +1457,7 @@
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1454: checking how to build libraries" >&5
+echo "configure:1461: 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"
@@ -1897,6 +1904,16 @@
+# Check whether --with-zstd or --without-zstd was given.
+if test "${with_zstd+set}" = set; then
+ withval="$with_zstd"
+ :
+else
+ with_zstd=no
+fi
+
+
+
# Check whether --with-gdal or --without-gdal was given.
if test "${with_gdal+set}" = set; then
withval="$with_gdal"
@@ -2000,6 +2017,23 @@
+# Check whether --with-zstd-includes or --without-zstd-includes was given.
+if test "${with_zstd_includes+set}" = set; then
+ withval="$with_zstd_includes"
+ :
+fi
+
+
+
+# Check whether --with-zstd-libs or --without-zstd-libs was given.
+if test "${with_zstd_libs+set}" = set; then
+ withval="$with_zstd_libs"
+ :
+fi
+
+
+
+
# Check whether --with-readline-includes or --without-readline-includes was given.
if test "${with_readline_includes+set}" = set; then
withval="$with_readline_includes"
@@ -2356,7 +2390,7 @@
# Done checking fortran
echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:2360: checking for additional include dirs" >&5
+echo "configure:2394: 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; }
@@ -2379,7 +2413,7 @@
# With libs option
echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:2383: checking for additional library dirs" >&5
+echo "configure:2417: 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; }
@@ -2413,7 +2447,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:2417: checking for a BSD compatible install" >&5
+echo "configure:2451: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
@@ -2466,7 +2500,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:2470: checking for $ac_word" >&5
+echo "configure:2504: checking for $ac_word" >&5
if test -n "$LEX"; then
ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -2497,13 +2531,13 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2501: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2535: 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 2507 "configure"
+#line 2541 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2514,7 +2548,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2539,7 +2573,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:2543: checking for $ac_word" >&5
+echo "configure:2577: checking for $ac_word" >&5
case "$LEXPATH" in
/*)
@@ -2579,7 +2613,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:2583: checking for $ac_word" >&5
+echo "configure:2617: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2610,7 +2644,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:2614: checking for $ac_word" >&5
+echo "configure:2648: checking for $ac_word" >&5
case "$YACCPATH" in
/*)
@@ -2648,7 +2682,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:2652: checking for $ac_word" >&5
+echo "configure:2686: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2677,7 +2711,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:2681: checking for $ac_word" >&5
+echo "configure:2715: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -2708,7 +2742,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:2712: checking for $ac_word" >&5
+echo "configure:2746: checking for $ac_word" >&5
if test -n "$ENV"; then
ac_cv_prog_ENV="$ENV" # Let the user override the test.
@@ -2737,7 +2771,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:2741: checking for $ac_word" >&5
+echo "configure:2775: checking for $ac_word" >&5
case "$PERL" in
/*)
@@ -2768,7 +2802,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2772: checking how to run the C preprocessor" >&5
+echo "configure:2806: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2781,13 +2815,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2785 "configure"
+#line 2819 "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:2791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2825: \"$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
:
@@ -2798,13 +2832,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2802 "configure"
+#line 2836 "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:2808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2842: \"$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
:
@@ -2815,13 +2849,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2819 "configure"
+#line 2853 "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:2825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2859: \"$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
:
@@ -2845,10 +2879,10 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2849: checking for ANSI C header files" >&5
+echo "configure:2883: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 2852 "configure"
+#line 2886 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2856,7 +2890,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2894: \"$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*
@@ -2873,7 +2907,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 2877 "configure"
+#line 2911 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2891,7 +2925,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 2895 "configure"
+#line 2929 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2912,7 +2946,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 2916 "configure"
+#line 2950 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2923,7 +2957,7 @@
exit (0); }
EOF
-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2950,15 +2984,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2954: checking for $ac_hdr" >&5
+echo "configure:2988: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 2957 "configure"
+#line 2991 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2996: \"$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*
@@ -2987,15 +3021,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2991: checking for $ac_hdr" >&5
+echo "configure:3025: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 2994 "configure"
+#line 3028 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3033: \"$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*
@@ -3024,15 +3058,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3028: checking for $ac_hdr" >&5
+echo "configure:3062: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3031 "configure"
+#line 3065 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3070: \"$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*
@@ -3061,15 +3095,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3065: checking for $ac_hdr" >&5
+echo "configure:3099: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3068 "configure"
+#line 3102 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3107: \"$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*
@@ -3098,15 +3132,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3102: checking for $ac_hdr" >&5
+echo "configure:3136: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3105 "configure"
+#line 3139 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3144: \"$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*
@@ -3132,10 +3166,10 @@
done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3136: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3170: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3173 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3144,7 +3178,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -3164,10 +3198,10 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3168: checking for off_t" >&5
+echo "configure:3202: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3171 "configure"
+#line 3205 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -3194,10 +3228,10 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3198: checking for uid_t in sys/types.h" >&5
+echo "configure:3232: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3201 "configure"
+#line 3235 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -3225,10 +3259,10 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3229: checking return type of signal handlers" >&5
+echo "configure:3263: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 3232 "configure"
+#line 3266 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3245,7 +3279,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:3249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3263,10 +3297,10 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:3267: checking for Cygwin environment" >&5
+echo "configure:3301: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 3270 "configure"
+#line 3304 "configure"
#include "confdefs.h"
int main() {
@@ -3277,7 +3311,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:3281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -3295,10 +3329,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:3299: checking for $ac_func" >&5
+echo "configure:3333: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3302 "configure"
+#line 3336 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3321,7 +3355,7 @@
; return 0; }
EOF
-if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3359: \"$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
@@ -3347,10 +3381,10 @@
for ac_func in seteuid setpriority setreuid setruid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3351: checking for $ac_func" >&5
+echo "configure:3385: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3354 "configure"
+#line 3388 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3373,7 +3407,7 @@
; return 0; }
EOF
-if { (eval echo configure:3377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3411: \"$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
@@ -3399,10 +3433,10 @@
for ac_func in drand48
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3403: checking for $ac_func" >&5
+echo "configure:3437: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3406 "configure"
+#line 3440 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3425,7 +3459,7 @@
; return 0; }
EOF
-if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3463: \"$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
@@ -3451,10 +3485,10 @@
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3455: checking for $ac_func" >&5
+echo "configure:3489: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3458 "configure"
+#line 3492 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3477,7 +3511,7 @@
; return 0; }
EOF
-if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3515: \"$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
@@ -3503,10 +3537,10 @@
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3507: checking for $ac_func" >&5
+echo "configure:3541: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3510 "configure"
+#line 3544 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3529,7 +3563,7 @@
; return 0; }
EOF
-if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3567: \"$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
@@ -3554,13 +3588,13 @@
if test "$cross_compiling" != "yes" ; then
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3558: checking whether setpgrp takes no argument" >&5
+echo "configure:3592: 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 3564 "configure"
+#line 3598 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -3580,7 +3614,7 @@
}
EOF
-if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3618: \"$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
@@ -3608,16 +3642,16 @@
fi
echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:3612: checking for long long int" >&5
+echo "configure:3646: checking for long long int" >&5
cat > conftest.$ac_ext <<EOF
-#line 3614 "configure"
+#line 3648 "configure"
#include "confdefs.h"
int main() {
long long int x;
; return 0; }
EOF
-if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3637,7 +3671,7 @@
rm -f conftest*
echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:3641: checking for W11" >&5
+echo "configure:3675: 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; } ;;
@@ -3665,7 +3699,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:3669: checking for X" >&5
+echo "configure:3703: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -3725,12 +3759,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 3729 "configure"
+#line 3763 "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:3734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3768: \"$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*
@@ -3799,14 +3833,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3803 "configure"
+#line 3837 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:3810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3844: \"$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.
@@ -3911,17 +3945,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:3915: checking whether -R must be followed by a space" >&5
+echo "configure:3949: 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 3918 "configure"
+#line 3952 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3937,14 +3971,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3941 "configure"
+#line 3975 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3976,13 +4010,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:3980: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4014: 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 3986 "configure"
+#line 4020 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3993,7 +4027,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4014,13 +4048,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:4018: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4052: 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 4024 "configure"
+#line 4058 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4031,7 +4065,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:4035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4059,10 +4093,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:4063: checking for gethostbyname" >&5
+echo "configure:4097: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 4066 "configure"
+#line 4100 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -4085,7 +4119,7 @@
; return 0; }
EOF
-if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4123: \"$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
@@ -4105,13 +4139,13 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4109: checking for gethostbyname in -lnsl" >&5
+echo "configure:4143: 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 4115 "configure"
+#line 4149 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4122,7 +4156,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:4126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4151,10 +4185,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:4155: checking for connect" >&5
+echo "configure:4189: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 4158 "configure"
+#line 4192 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -4177,7 +4211,7 @@
; return 0; }
EOF
-if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4215: \"$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
@@ -4197,13 +4231,13 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4201: checking for connect in -lsocket" >&5
+echo "configure:4235: 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 4207 "configure"
+#line 4241 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4214,7 +4248,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4237,10 +4271,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:4241: checking for remove" >&5
+echo "configure:4275: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 4244 "configure"
+#line 4278 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -4263,7 +4297,7 @@
; return 0; }
EOF
-if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4301: \"$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
@@ -4283,13 +4317,13 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4287: checking for remove in -lposix" >&5
+echo "configure:4321: 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 4293 "configure"
+#line 4327 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4300,7 +4334,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4323,10 +4357,10 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4327: checking for shmat" >&5
+echo "configure:4361: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 4330 "configure"
+#line 4364 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -4349,7 +4383,7 @@
; return 0; }
EOF
-if { (eval echo configure:4353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4387: \"$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
@@ -4369,13 +4403,13 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4373: checking for shmat in -lipc" >&5
+echo "configure:4407: 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 4379 "configure"
+#line 4413 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4386,7 +4420,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:4390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4418,13 +4452,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:4422: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4456: 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 4428 "configure"
+#line 4462 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4435,7 +4469,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4475,12 +4509,12 @@
LIBS=""
echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:4479: checking for library containing cuserid" >&5
+echo "configure:4513: checking for library containing cuserid" >&5
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_cuserid="no"
cat > conftest.$ac_ext <<EOF
-#line 4484 "configure"
+#line 4518 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4491,7 +4525,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:4495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4529: \"$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
@@ -4502,7 +4536,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 4506 "configure"
+#line 4540 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4513,7 +4547,7 @@
cuserid()
; 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:4551: \"$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
@@ -4539,10 +4573,10 @@
for ac_func in asprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4543: checking for $ac_func" >&5
+echo "configure:4577: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4546 "configure"
+#line 4580 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4565,7 +4599,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:4603: \"$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
@@ -4592,10 +4626,10 @@
# Test if mathlib needs -lm flag or is included with libc
echo $ac_n "checking for atan""... $ac_c" 1>&6
-echo "configure:4596: checking for atan" >&5
+echo "configure:4630: checking for atan" >&5
cat > conftest.$ac_ext <<EOF
-#line 4599 "configure"
+#line 4633 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atan(); below. */
@@ -4618,7 +4652,7 @@
; return 0; }
EOF
-if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4656: \"$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
@@ -4636,13 +4670,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:4640: checking for atan in -lm" >&5
+echo "configure:4674: 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 4646 "configure"
+#line 4680 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4653,7 +4687,7 @@
atan()
; return 0; }
EOF
-if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4680,10 +4714,10 @@
echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:4684: checking for dlsym" >&5
+echo "configure:4718: checking for dlsym" >&5
cat > conftest.$ac_ext <<EOF
-#line 4687 "configure"
+#line 4721 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym(); below. */
@@ -4706,7 +4740,7 @@
; return 0; }
EOF
-if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4744: \"$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
@@ -4724,13 +4758,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:4728: checking for dlsym in -ldl" >&5
+echo "configure:4762: 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 4734 "configure"
+#line 4768 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4741,7 +4775,7 @@
dlsym()
; return 0; }
EOF
-if { (eval echo configure:4745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4768,10 +4802,10 @@
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:4772: checking for iconv" >&5
+echo "configure:4806: checking for iconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 4775 "configure"
+#line 4809 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -4794,7 +4828,7 @@
; return 0; }
EOF
-if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4832: \"$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
@@ -4812,13 +4846,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:4816: checking for iconv in -liconv" >&5
+echo "configure:4850: 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 4822 "configure"
+#line 4856 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4829,7 +4863,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:4833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4848,13 +4882,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:4852: checking for iconv in -lgiconv" >&5
+echo "configure:4886: 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 4858 "configure"
+#line 4892 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4865,7 +4899,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4884,10 +4918,10 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:4888: checking for libiconv" >&5
+echo "configure:4922: checking for libiconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 4891 "configure"
+#line 4925 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -4910,7 +4944,7 @@
; return 0; }
EOF
-if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4948: \"$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
@@ -4928,13 +4962,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:4932: checking for libiconv in -liconv" >&5
+echo "configure:4966: 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 4938 "configure"
+#line 4972 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4945,7 +4979,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4964,13 +4998,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:4968: checking for libiconv in -lgiconv" >&5
+echo "configure:5002: 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 4974 "configure"
+#line 5008 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4981,7 +5015,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5018,10 +5052,10 @@
have_socket=1
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:5022: checking for socket" >&5
+echo "configure:5056: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 5025 "configure"
+#line 5059 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -5044,7 +5078,7 @@
; return 0; }
EOF
-if { (eval echo configure:5048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5082: \"$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
@@ -5062,13 +5096,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5066: checking for socket in -lsocket" >&5
+echo "configure:5100: 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 5072 "configure"
+#line 5106 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5079,7 +5113,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:5083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5127,7 +5161,7 @@
echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:5131: checking for location of zlib includes" >&5
+echo "configure:5165: 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; }
@@ -5153,15 +5187,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5157: checking for $ac_hdr" >&5
+echo "configure:5191: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5160 "configure"
+#line 5194 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5199: \"$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*
@@ -5195,7 +5229,7 @@
echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:5199: checking for location of zlib library" >&5
+echo "configure:5233: 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; }
@@ -5220,13 +5254,13 @@
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:5224: checking for deflate in -lz" >&5
+echo "configure:5258: 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 5230 "configure"
+#line 5264 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5237,7 +5271,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:5241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5277,9 +5311,13 @@
# bzip2 support
+BZIP2LIBPATH=
+BZIP2INCPATH=
+BZIP2LIB=
+
echo $ac_n "checking whether to use bzlib""... $ac_c" 1>&6
-echo "configure:5283: checking whether to use bzlib" >&5
+echo "configure:5321: checking whether to use bzlib" >&5
echo "$ac_t"""$with_bzlib"" 1>&6
case "$with_bzlib" in
"no") USE_BZIP2= ;;
@@ -5291,15 +5329,11 @@
if test -n "$USE_BZIP2"; then
-BZLIBLIBPATH=
-BZLIBINCPATH=
-BZLIB=
-
# With bzip2 includes directory
echo $ac_n "checking for location of bzlib includes""... $ac_c" 1>&6
-echo "configure:5303: checking for location of bzlib includes" >&5
+echo "configure:5337: checking for location of bzlib includes" >&5
case "$with_bzlib_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-bzlib-includes." 1>&2; exit 1; }
@@ -5310,7 +5344,7 @@
if test -n "$with_bzlib_includes" ; then
for dir in $with_bzlib_includes; do
if test -d "$dir"; then
- BZLIBINCPATH="$BZLIBINCPATH -I$dir"
+ BZIP2INCPATH="$BZIP2INCPATH -I$dir"
else
{ echo "configure: error: *** bzlib includes directory $dir does not exist." 1>&2; exit 1; }
fi
@@ -5320,20 +5354,20 @@
ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$BZLIBINCPATH $CPPFLAGS"
+CPPFLAGS="$BZIP2INCPATH $CPPFLAGS"
for ac_hdr in bzlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5329: checking for $ac_hdr" >&5
+echo "configure:5363: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5332 "configure"
+#line 5366 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5371: \"$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*
@@ -5367,7 +5401,7 @@
echo $ac_n "checking for location of bzlib library""... $ac_c" 1>&6
-echo "configure:5371: checking for location of bzlib library" >&5
+echo "configure:5405: checking for location of bzlib library" >&5
case "$with_bzlib_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-bzlib-libs." 1>&2; exit 1; }
@@ -5378,7 +5412,7 @@
if test -n "$with_bzlib_libs"; then
for dir in $with_bzlib_libs; do
if test -d "$dir"; then
- BZLIBLIBPATH="$BZLIBLIBPATH -L$dir"
+ BZIP2LIBPATH="$BZIP2LIBPATH -L$dir"
else
{ echo "configure: error: *** bzlib library directory $dir does not exist." 1>&2; exit 1; }
fi
@@ -5388,17 +5422,17 @@
ac_save_ldflags="$LDFLAGS"
-LDFLAGS="$BZLIBLIBPATH $LDFLAGS"
+LDFLAGS="$BZIP2LIBPATH $LDFLAGS"
echo $ac_n "checking for BZ2_bzBuffToBuffCompress in -lbz2""... $ac_c" 1>&6
-echo "configure:5396: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
+echo "configure:5430: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
ac_lib_var=`echo bz2'_'BZ2_bzBuffToBuffCompress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lbz2 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5402 "configure"
+#line 5436 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5409,7 +5443,7 @@
BZ2_bzBuffToBuffCompress()
; return 0; }
EOF
-if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5423,7 +5457,7 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- BZLIB="$BZLIB -lbz2 "
+ BZIP2LIB="$BZIP2LIB -lbz2 "
else
echo "$ac_t""no" 1>&6
@@ -5449,6 +5483,179 @@
# Done checking bzip2
+# zstd support
+
+ZSTDLIBPATH=
+ZSTDINCPATH=
+ZSTDLIB=
+
+
+echo $ac_n "checking whether to use zstd""... $ac_c" 1>&6
+echo "configure:5495: checking whether to use zstd" >&5
+echo "$ac_t"""$with_zstd"" 1>&6
+case "$with_zstd" in
+ "no") USE_ZSTD= ;;
+ "yes") USE_ZSTD="1" ;;
+ *) { echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; } ;;
+esac
+
+
+
+if test -n "$USE_ZSTD"; then
+
+# With zstd includes directory
+
+
+echo $ac_n "checking for location of zstd includes""... $ac_c" 1>&6
+echo "configure:5511: checking for location of zstd includes" >&5
+case "$with_zstd_includes" in
+y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-zstd-includes." 1>&2; exit 1; }
+ ;;
+esac
+echo "$ac_t""$with_zstd_includes" 1>&6
+
+if test -n "$with_zstd_includes" ; then
+ for dir in $with_zstd_includes; do
+ if test -d "$dir"; then
+ ZSTDINCPATH="$ZSTDINCPATH -I$dir"
+ else
+ { echo "configure: error: *** zstd includes directory $dir does not exist." 1>&2; exit 1; }
+ fi
+ done
+fi
+
+
+ac_save_cppflags="$CPPFLAGS"
+CPPFLAGS="$ZSTDINCPATH $CPPFLAGS"
+for ac_hdr in zstd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:5536: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5539 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+{ echo "configure: error: *** Unable to locate zstd includes." 1>&2; exit 1; }
+
+fi
+done
+
+CPPFLAGS=$ac_save_cppflags
+
+
+# With zstd library directory
+
+
+echo $ac_n "checking for location of zstd library""... $ac_c" 1>&6
+echo "configure:5578: checking for location of zstd library" >&5
+case "$with_zstd_libs" in
+y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-zstd-libs." 1>&2; exit 1; }
+ ;;
+esac
+echo "$ac_t""$with_zstd_libs" 1>&6
+
+if test -n "$with_zstd_libs"; then
+ for dir in $with_zstd_libs; do
+ if test -d "$dir"; then
+ ZSTDLIBPATH="$ZSTDLIBPATH -L$dir"
+ else
+ { echo "configure: error: *** zstd library directory $dir does not exist." 1>&2; exit 1; }
+ fi
+ done
+fi
+
+
+
+ac_save_ldflags="$LDFLAGS"
+LDFLAGS="$ZSTDLIBPATH $LDFLAGS"
+
+
+echo $ac_n "checking for ZSTD_compress in -lzstd""... $ac_c" 1>&6
+echo "configure:5603: checking for ZSTD_compress in -lzstd" >&5
+ac_lib_var=`echo zstd'_'ZSTD_compress | sed 'y%./+-%__p_%'`
+
+ac_save_LIBS="$LIBS"
+LIBS="-lzstd $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5609 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char ZSTD_compress();
+
+int main() {
+ZSTD_compress()
+; return 0; }
+EOF
+if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ZSTDLIB="$ZSTDLIB -lzstd "
+else
+ echo "$ac_t""no" 1>&6
+
+LDFLAGS=${ac_save_ldflags}
+
+ { echo "configure: error: *** Unable to locate zstd library." 1>&2; exit 1; }
+
+
+fi
+
+
+
+LDFLAGS=${ac_save_ldflags}
+
+
+#
+
+fi # $USE_ZSTD
+
+
+
+
+
+# Done checking zstd
+
# Mandatory PROJ dependency
PROJINC=
@@ -5459,7 +5666,7 @@
echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
-echo "configure:5463: checking for location of External PROJ.4 includes" >&5
+echo "configure:5670: 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; }
@@ -5485,15 +5692,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5489: checking for $ac_hdr" >&5
+echo "configure:5696: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5492 "configure"
+#line 5699 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5704: \"$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*
@@ -5530,7 +5737,7 @@
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:5534: checking External PROJ.4 version" >&5
+echo "configure:5741: checking External PROJ.4 version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -5538,7 +5745,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5542 "configure"
+#line 5749 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -5550,7 +5757,7 @@
}
EOF
-if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5761: \"$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
@@ -5575,7 +5782,7 @@
echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:5579: checking for location of External PROJ.4 library" >&5
+echo "configure:5786: 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; }
@@ -5600,13 +5807,13 @@
echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:5604: checking for pj_get_def in -lproj" >&5
+echo "configure:5811: 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 5610 "configure"
+#line 5817 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5617,7 +5824,7 @@
pj_get_def()
; return 0; }
EOF
-if { (eval echo configure:5621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5651,7 +5858,7 @@
echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
-echo "configure:5655: checking for location of External PROJ.4 data files" >&5
+echo "configure:5862: 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; }
@@ -5675,14 +5882,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:5679: checking for epsg" >&5
+echo "configure:5886: 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:5686: checking for $PROJSHARE/epsg" >&5
+echo "configure:5893: 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; }
@@ -5714,7 +5921,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:5718: checking for $ac_word" >&5
+echo "configure:5925: checking for $ac_word" >&5
case "$NAD2BIN" in
/*)
@@ -5754,7 +5961,7 @@
echo $ac_n "checking whether to use regex""... $ac_c" 1>&6
-echo "configure:5758: checking whether to use regex" >&5
+echo "configure:5965: checking whether to use regex" >&5
echo "$ac_t"""$with_regex"" 1>&6
case "$with_regex" in
"no") USE_REGEX= ;;
@@ -5774,7 +5981,7 @@
echo $ac_n "checking for location of regex includes""... $ac_c" 1>&6
-echo "configure:5778: checking for location of regex includes" >&5
+echo "configure:5985: 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; }
@@ -5800,15 +6007,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5804: checking for $ac_hdr" >&5
+echo "configure:6011: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5807 "configure"
+#line 6014 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6019: \"$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*
@@ -5842,7 +6049,7 @@
echo $ac_n "checking for location of regex library""... $ac_c" 1>&6
-echo "configure:5846: checking for location of regex library" >&5
+echo "configure:6053: 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; }
@@ -5867,10 +6074,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:5871: checking for regcomp" >&5
+echo "configure:6078: checking for regcomp" >&5
cat > conftest.$ac_ext <<EOF
-#line 5874 "configure"
+#line 6081 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -5893,7 +6100,7 @@
; return 0; }
EOF
-if { (eval echo configure:5897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp=yes"
else
@@ -5920,13 +6127,13 @@
echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
-echo "configure:5924: checking for regcomp in -lregex" >&5
+echo "configure:6131: 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 5930 "configure"
+#line 6137 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5937,7 +6144,7 @@
regcomp()
; return 0; }
EOF
-if { (eval echo configure:5941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5987,7 +6194,7 @@
echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:5991: checking whether to use Readline" >&5
+echo "configure:6198: checking whether to use Readline" >&5
echo "$ac_t"""$with_readline"" 1>&6
case "$with_readline" in
"no") USE_READLINE= ;;
@@ -6008,7 +6215,7 @@
echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:6012: checking for location of Readline includes" >&5
+echo "configure:6219: 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; }
@@ -6034,15 +6241,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6038: checking for $ac_hdr" >&5
+echo "configure:6245: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6041 "configure"
+#line 6248 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6253: \"$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*
@@ -6078,15 +6285,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6082: checking for $ac_hdr" >&5
+echo "configure:6289: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6085 "configure"
+#line 6292 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6297: \"$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*
@@ -6120,7 +6327,7 @@
echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:6124: checking for location of Readline library" >&5
+echo "configure:6331: 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; }
@@ -6145,13 +6352,13 @@
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:6149: checking for readline in -lreadline" >&5
+echo "configure:6356: 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 6155 "configure"
+#line 6362 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6162,7 +6369,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:6166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6197,13 +6404,13 @@
echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:6201: checking for add_history in -lhistory" >&5
+echo "configure:6408: 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 6207 "configure"
+#line 6414 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6214,7 +6421,7 @@
add_history()
; return 0; }
EOF
-if { (eval echo configure:6218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6256,7 +6463,7 @@
# GDAL option
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:6260: checking whether to use GDAL" >&5
+echo "configure:6467: checking whether to use GDAL" >&5
GDAL_LIBS=
GDAL_CFLAGS=
@@ -6274,7 +6481,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:6278: checking for $ac_word" >&5
+echo "configure:6485: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -6329,14 +6536,14 @@
LIBS="$LIBS $GDAL_LIBS"
CFLAGS="$CFLAGS $GDAL_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 6333 "configure"
+#line 6540 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6345,14 +6552,14 @@
LIBS="$LIBS $GDAL_DEP_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6349 "configure"
+#line 6556 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:6356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6563: \"$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
@@ -6384,7 +6591,7 @@
# libLAS option
echo $ac_n "checking whether to use libLAS""... $ac_c" 1>&6
-echo "configure:6388: checking whether to use libLAS" >&5
+echo "configure:6595: checking whether to use libLAS" >&5
LIBLAS_LIBS=
LIBLAS_CFLAGS=
@@ -6401,7 +6608,7 @@
# Extract the first word of "liblas-config", so it can be a program name with args.
set dummy liblas-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6405: checking for $ac_word" >&5
+echo "configure:6612: checking for $ac_word" >&5
case "$LIBLAS_CONFIG" in
/*)
@@ -6454,15 +6661,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6458: checking for $ac_hdr" >&5
+echo "configure:6665: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6461 "configure"
+#line 6668 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6673: \"$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*
@@ -6488,14 +6695,14 @@
done
cat > conftest.$ac_ext <<EOF
-#line 6492 "configure"
+#line 6699 "configure"
#include "confdefs.h"
#include <liblas/capi/liblas.h>
int main() {
LASReader_Create("foo");
; return 0; }
EOF
-if { (eval echo configure:6499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6503,14 +6710,14 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6507 "configure"
+#line 6714 "configure"
#include "confdefs.h"
#include <liblas/capi/liblas.h>
int main() {
LASReader_Create("foo");
; return 0; }
EOF
-if { (eval echo configure:6514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LAS_LIBS="$LAS_LIBS"
else
@@ -6543,7 +6750,7 @@
# PDAL option
echo $ac_n "checking whether to use PDAL""... $ac_c" 1>&6
-echo "configure:6547: checking whether to use PDAL" >&5
+echo "configure:6754: checking whether to use PDAL" >&5
# new and currently used way to switch language to C++
# AC_LANG_PUSH(C++)
@@ -6571,7 +6778,7 @@
# Extract the first word of "pdal-config", so it can be a program name with args.
set dummy pdal-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6575: checking for $ac_word" >&5
+echo "configure:6782: checking for $ac_word" >&5
case "$PDAL_CONFIG" in
/*)
@@ -6621,14 +6828,14 @@
CFLAGS="$CFLAGS $PDAL_CFLAGS"
CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC"
cat > conftest.$ac_ext <<EOF
-#line 6625 "configure"
+#line 6832 "configure"
#include "confdefs.h"
#include <pdal/PointTable.hpp>
int main() {
pdal::PointTable table;
; return 0; }
EOF
-if { (eval echo configure:6632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6636,14 +6843,14 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6640 "configure"
+#line 6847 "configure"
#include "confdefs.h"
#include <pdal/PointTable.hpp>
int main() {
pdal::PointTable table;
; return 0; }
EOF
-if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
PDAL_LIBS="$PDAL_LIBS"
else
@@ -6693,7 +6900,7 @@
# NetCDF option
echo $ac_n "checking whether to use NetCDF""... $ac_c" 1>&6
-echo "configure:6697: checking whether to use NetCDF" >&5
+echo "configure:6904: checking whether to use NetCDF" >&5
NETCDF_LIBS=
NETCDF_CFLAGS=
@@ -6710,7 +6917,7 @@
# Extract the first word of "nc-config", so it can be a program name with args.
set dummy nc-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6714: checking for $ac_word" >&5
+echo "configure:6921: checking for $ac_word" >&5
case "$NETCDF_CONFIG" in
/*)
@@ -6757,14 +6964,14 @@
LIBS="$LIBS $NETCDF_LIBS"
CFLAGS="$CFLAGS $NETCDF_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 6761 "configure"
+#line 6968 "configure"
#include "confdefs.h"
#include <netcdf.h>
int main() {
nc_create("foo", NC_CLOBBER, NULL);
; return 0; }
EOF
-if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6772,14 +6979,14 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6776 "configure"
+#line 6983 "configure"
#include "confdefs.h"
#include <netcdf.h>
int main() {
nc_create("foo", NC_CLOBBER, NULL);
; return 0; }
EOF
-if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
NETCDF_LIBS="$NETCDF_LIBS"
else
@@ -6810,7 +7017,7 @@
# GEOS option
echo $ac_n "checking whether to use GEOS""... $ac_c" 1>&6
-echo "configure:6814: checking whether to use GEOS" >&5
+echo "configure:7021: checking whether to use GEOS" >&5
GEOS_LIBS=
GEOS_CFLAGS=
@@ -6828,7 +7035,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:6832: checking for $ac_word" >&5
+echo "configure:7039: checking for $ac_word" >&5
case "$GEOS_CONFIG" in
/*)
@@ -6876,15 +7083,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6880: checking for $ac_hdr" >&5
+echo "configure:7087: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6883 "configure"
+#line 7090 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7095: \"$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*
@@ -6923,13 +7130,13 @@
echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6
-echo "configure:6927: checking for initGEOS in -lgeos_c" >&5
+echo "configure:7134: 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 6933 "configure"
+#line 7140 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6940,7 +7147,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:6944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6984,7 +7191,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:6988: checking whether to use TIFF" >&5
+echo "configure:7195: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -7004,7 +7211,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:7008: checking for location of TIFF includes" >&5
+echo "configure:7215: 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; }
@@ -7030,15 +7237,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7034: checking for $ac_hdr" >&5
+echo "configure:7241: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7037 "configure"
+#line 7244 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7249: \"$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*
@@ -7072,7 +7279,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:7076: checking for location of TIFF library" >&5
+echo "configure:7283: 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; }
@@ -7103,13 +7310,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7107: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7314: 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 7113 "configure"
+#line 7320 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7120,7 +7327,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7139,13 +7346,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7143: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7350: 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 7149 "configure"
+#line 7356 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7156,7 +7363,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7175,13 +7382,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7179: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7386: 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 7185 "configure"
+#line 7392 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7192,7 +7399,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7211,13 +7418,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7215: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7422: 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 7221 "configure"
+#line 7428 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7228,7 +7435,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7247,13 +7454,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7251: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7458: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7257 "configure"
+#line 7464 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7264,7 +7471,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7283,13 +7490,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7287: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7494: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7293 "configure"
+#line 7500 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7300,7 +7507,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7319,13 +7526,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7323: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7530: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7329 "configure"
+#line 7536 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7336,7 +7543,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7355,13 +7562,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7359: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7566: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff -ljpeg $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7365 "configure"
+#line 7572 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7372,7 +7579,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7470,7 +7677,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:7474: checking whether to use PNG" >&5
+echo "configure:7681: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -7489,7 +7696,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:7493: checking for location of PNG includes" >&5
+echo "configure:7700: 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; }
@@ -7515,15 +7722,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7519: checking for $ac_hdr" >&5
+echo "configure:7726: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7522 "configure"
+#line 7729 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7734: \"$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*
@@ -7557,7 +7764,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:7561: checking for location of PNG library" >&5
+echo "configure:7768: 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; }
@@ -7582,13 +7789,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7586: checking for png_read_image in -lpng" >&5
+echo "configure:7793: 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 7592 "configure"
+#line 7799 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7599,7 +7806,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7641,7 +7848,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:7645: checking whether to use PostgreSQL" >&5
+echo "configure:7852: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -7668,7 +7875,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:7672: checking for location of PostgreSQL includes" >&5
+echo "configure:7879: 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; }
@@ -7694,15 +7901,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7698: checking for $ac_hdr" >&5
+echo "configure:7905: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7701 "configure"
+#line 7908 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7913: \"$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*
@@ -7740,7 +7947,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:7744: checking for location of PostgreSQL library" >&5
+echo "configure:7951: 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; }
@@ -7769,13 +7976,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7773: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7980: 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 7779 "configure"
+#line 7986 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7786,7 +7993,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7805,13 +8012,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7809: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8016: 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 7815 "configure"
+#line 8022 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7822,7 +8029,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7841,13 +8048,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7845: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8052: 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 7851 "configure"
+#line 8058 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7858,7 +8065,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7877,13 +8084,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7881: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8088: 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 7887 "configure"
+#line 8094 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7894,7 +8101,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7951,13 +8158,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:7955: checking for PQcmdTuples in -lpq" >&5
+echo "configure:8162: 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 7961 "configure"
+#line 8168 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7968,7 +8175,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7990,13 +8197,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:7994: checking for PQcmdTuples in -lpq" >&5
+echo "configure:8201: 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 8000 "configure"
+#line 8207 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8007,7 +8214,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:8011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8050,7 +8257,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:8054: checking whether to use MySQL" >&5
+echo "configure:8261: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -8070,7 +8277,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:8074: checking for location of MySQL includes" >&5
+echo "configure:8281: 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; }
@@ -8096,15 +8303,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8100: checking for $ac_hdr" >&5
+echo "configure:8307: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8103 "configure"
+#line 8310 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8315: \"$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*
@@ -8141,7 +8348,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:8145: checking for location of MySQL library" >&5
+echo "configure:8352: 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; }
@@ -8172,13 +8379,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8176: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8383: 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 8182 "configure"
+#line 8389 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8189,7 +8396,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8208,13 +8415,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8212: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8419: 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 8218 "configure"
+#line 8425 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8225,7 +8432,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8244,13 +8451,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8248: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8455: 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 8254 "configure"
+#line 8461 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8261,7 +8468,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8280,13 +8487,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8284: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8491: 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 8290 "configure"
+#line 8497 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8297,7 +8504,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8316,13 +8523,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8320: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8527: 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 8326 "configure"
+#line 8533 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8333,7 +8540,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8352,13 +8559,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8356: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8563: 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 8362 "configure"
+#line 8569 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8369,7 +8576,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8580: \"$ac_link\") 1>&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,13 +8595,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8392: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8599: 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 8398 "configure"
+#line 8605 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8405,7 +8612,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8424,13 +8631,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8428: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8635: 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 8434 "configure"
+#line 8641 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8441,7 +8648,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8531,7 +8738,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:8535: checking for $ac_word" >&5
+echo "configure:8742: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -8580,10 +8787,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:8584: checking for mysql_server_init" >&5
+echo "configure:8791: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 8587 "configure"
+#line 8794 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -8609,7 +8816,7 @@
; return 0; }
EOF
-if { (eval echo configure:8613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8820: \"$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
@@ -8661,7 +8868,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:8665: checking whether to use SQLite" >&5
+echo "configure:8872: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -8681,7 +8888,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:8685: checking for location of SQLite includes" >&5
+echo "configure:8892: 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; }
@@ -8707,15 +8914,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8711: checking for $ac_hdr" >&5
+echo "configure:8918: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8714 "configure"
+#line 8921 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8926: \"$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*
@@ -8758,7 +8965,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:8762: checking for location of SQLite library" >&5
+echo "configure:8969: 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; }
@@ -8787,13 +8994,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8791: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8998: 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 8797 "configure"
+#line 9004 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8804,7 +9011,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8823,13 +9030,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8827: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9034: 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 8833 "configure"
+#line 9040 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8840,7 +9047,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8859,13 +9066,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8863: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9070: 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 8869 "configure"
+#line 9076 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8876,7 +9083,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8895,13 +9102,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8899: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9106: 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 8905 "configure"
+#line 9112 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8912,7 +9119,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8987,7 +9194,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:8991: checking whether to use OpenGL" >&5
+echo "configure:9198: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -9021,7 +9228,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:9025: checking for location of OpenGL includes" >&5
+echo "configure:9232: 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; }
@@ -9047,15 +9254,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9051: checking for $ac_hdr" >&5
+echo "configure:9258: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9054 "configure"
+#line 9261 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9266: \"$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*
@@ -9089,7 +9296,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:9093: checking for location of OpenGL library" >&5
+echo "configure:9300: 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; }
@@ -9118,13 +9325,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9122: checking for glBegin in -lGL" >&5
+echo "configure:9329: 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 9128 "configure"
+#line 9335 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9135,7 +9342,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9154,13 +9361,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9158: checking for glBegin in -lGL" >&5
+echo "configure:9365: 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 9164 "configure"
+#line 9371 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9171,7 +9378,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9190,13 +9397,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9194: checking for glBegin in -lGL" >&5
+echo "configure:9401: 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 9200 "configure"
+#line 9407 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9207,7 +9414,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9226,13 +9433,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9230: checking for glBegin in -lGL" >&5
+echo "configure:9437: 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 9236 "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
@@ -9243,7 +9450,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9247: \"$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
@@ -9305,13 +9512,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9309: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9516: 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 9315 "configure"
+#line 9522 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9322,7 +9529,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:9326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9341,13 +9548,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9345: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9552: 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 9351 "configure"
+#line 9558 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9358,7 +9565,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:9362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9405,10 +9612,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:9409: checking for glXCreatePbuffer" >&5
+echo "configure:9616: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 9412 "configure"
+#line 9619 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -9431,7 +9638,7 @@
; return 0; }
EOF
-if { (eval echo configure:9435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9642: \"$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
@@ -9468,10 +9675,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:9472: checking for glXCreateGLXPixmap" >&5
+echo "configure:9679: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 9475 "configure"
+#line 9682 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -9494,7 +9701,7 @@
; return 0; }
EOF
-if { (eval echo configure:9498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9705: \"$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
@@ -9537,7 +9744,7 @@
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:9541: checking for location of OpenGL framework" >&5
+echo "configure:9748: checking for location of OpenGL framework" >&5
case "$with_opengl_framework" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opengl-framework." 1>&2; exit 1; }
@@ -9561,15 +9768,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9565: checking for $ac_hdr" >&5
+echo "configure:9772: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9568 "configure"
+#line 9775 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9780: \"$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*
@@ -9605,10 +9812,10 @@
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:9609: checking for glBegin" >&5
+echo "configure:9816: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 9612 "configure"
+#line 9819 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -9631,7 +9838,7 @@
; return 0; }
EOF
-if { (eval echo configure:9635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9842: \"$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
@@ -9668,10 +9875,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:9672: checking for gluBeginCurve" >&5
+echo "configure:9879: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 9675 "configure"
+#line 9882 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -9694,7 +9901,7 @@
; return 0; }
EOF
-if { (eval echo configure:9698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9905: \"$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
@@ -9742,7 +9949,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:9746: checking for location of OpenGL includes" >&5
+echo "configure:9953: 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; }
@@ -9768,15 +9975,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9772: checking for $ac_hdr" >&5
+echo "configure:9979: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9775 "configure"
+#line 9982 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9987: \"$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*
@@ -9810,7 +10017,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:9814: checking for location of OpenGL library" >&5
+echo "configure:10021: 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; }
@@ -9835,18 +10042,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:9839: checking for OpenGL library" >&5
+echo "configure:10046: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 9843 "configure"
+#line 10050 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -9870,18 +10077,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:9874: checking for GLU library" >&5
+echo "configure:10081: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 9878 "configure"
+#line 10085 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:9885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -9930,7 +10137,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:9934: checking whether to use ODBC" >&5
+echo "configure:10141: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -9949,7 +10156,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:9953: checking for location of ODBC includes" >&5
+echo "configure:10160: 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; }
@@ -9975,15 +10182,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9979: checking for $ac_hdr" >&5
+echo "configure:10186: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9982 "configure"
+#line 10189 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10194: \"$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*
@@ -10017,7 +10224,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:10021: checking for location of ODBC library" >&5
+echo "configure:10228: 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; }
@@ -10042,13 +10249,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:10046: checking for SQLConnect in -lodbc" >&5
+echo "configure:10253: 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 10052 "configure"
+#line 10259 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10059,7 +10266,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:10063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10084,13 +10291,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:10088: checking for SQLConnect in -liodbc" >&5
+echo "configure:10295: 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 10094 "configure"
+#line 10301 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10101,7 +10308,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:10105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10126,11 +10333,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:10130: checking for ODBC library" >&5
+echo "configure:10337: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 10134 "configure"
+#line 10341 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -10138,7 +10345,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:10142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10187,7 +10394,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:10191: checking whether to use FFTW" >&5
+echo "configure:10398: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -10206,7 +10413,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:10210: checking for location of FFTW includes" >&5
+echo "configure:10417: 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; }
@@ -10232,15 +10439,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10236: checking for $ac_hdr" >&5
+echo "configure:10443: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10239 "configure"
+#line 10446 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10451: \"$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*
@@ -10268,15 +10475,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10272: checking for $ac_hdr" >&5
+echo "configure:10479: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10275 "configure"
+#line 10482 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10487: \"$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*
@@ -10304,15 +10511,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10308: checking for $ac_hdr" >&5
+echo "configure:10515: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10311 "configure"
+#line 10518 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10523: \"$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*
@@ -10358,7 +10565,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:10362: checking for location of FFTW library" >&5
+echo "configure:10569: 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; }
@@ -10383,13 +10590,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:10387: checking for fftw_execute in -lfftw3" >&5
+echo "configure:10594: 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 10393 "configure"
+#line 10600 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10400,7 +10607,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:10404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10425,13 +10632,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:10429: checking for fftwnd_one in -lfftw" >&5
+echo "configure:10636: 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 10435 "configure"
+#line 10642 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10442,7 +10649,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:10446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10467,13 +10674,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:10471: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:10678: 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 10477 "configure"
+#line 10684 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10484,7 +10691,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:10488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10541,7 +10748,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:10545: checking whether to use BLAS" >&5
+echo "configure:10752: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -10562,7 +10769,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:10566: checking for location of BLAS includes" >&5
+echo "configure:10773: 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; }
@@ -10582,7 +10789,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:10586: checking for location of BLAS library" >&5
+echo "configure:10793: 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; }
@@ -10608,15 +10815,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10612: checking for $ac_hdr" >&5
+echo "configure:10819: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10615 "configure"
+#line 10822 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10827: \"$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*
@@ -10651,13 +10858,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:10655: checking for dnrm2_ in -lblas" >&5
+echo "configure:10862: 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 10661 "configure"
+#line 10868 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10668,7 +10875,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:10672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10687,13 +10894,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:10691: checking for dnrm2_ in -lblas" >&5
+echo "configure:10898: 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 10697 "configure"
+#line 10904 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10704,7 +10911,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:10708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10748,13 +10955,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:10752: checking for ATL_xerbla in -latlas" >&5
+echo "configure:10959: 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 10758 "configure"
+#line 10965 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10765,7 +10972,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:10769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10780,13 +10987,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:10784: checking for sgemm_ in -lf77blas" >&5
+echo "configure:10991: 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 10790 "configure"
+#line 10997 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10797,7 +11004,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:10801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10812,13 +11019,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:10816: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:11023: 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 10822 "configure"
+#line 11029 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10829,7 +11036,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:10833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10875,16 +11082,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:10879: checking for sgemm in $vlib_flags" >&5
+echo "configure:11086: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 10881 "configure"
+#line 11088 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:10888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11095: \"$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
@@ -10902,13 +11109,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:10906: checking for sgemm_ in -lblas" >&5
+echo "configure:11113: 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 10912 "configure"
+#line 11119 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10919,7 +11126,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:10923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10934,13 +11141,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:10938: checking for dgemm_ in -ldgemm" >&5
+echo "configure:11145: 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 10944 "configure"
+#line 11151 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10951,7 +11158,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:10955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10966,13 +11173,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:10970: checking for sgemm_ in -lsgemm" >&5
+echo "configure:11177: 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 10976 "configure"
+#line 11183 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10983,7 +11190,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:10987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11017,13 +11224,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:11021: checking for acosp in -lsunmath" >&5
+echo "configure:11228: 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 11027 "configure"
+#line 11234 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11034,7 +11241,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:11038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11049,13 +11256,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:11053: checking for sgemm_ in -lsunperf" >&5
+echo "configure:11260: 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 11059 "configure"
+#line 11266 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11066,7 +11273,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:11070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11096,13 +11303,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:11100: checking for sgemm_ in -lblas" >&5
+echo "configure:11307: 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 11106 "configure"
+#line 11313 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11113,7 +11320,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:11117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11152,7 +11359,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:11156: checking whether to use LAPACK" >&5
+echo "configure:11363: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -11177,7 +11384,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:11181: checking for location of LAPACK includes" >&5
+echo "configure:11388: 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; }
@@ -11197,7 +11404,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:11201: checking for location of LAPACK library" >&5
+echo "configure:11408: 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; }
@@ -11223,15 +11430,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11227: checking for $ac_hdr" >&5
+echo "configure:11434: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11230 "configure"
+#line 11437 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11442: \"$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*
@@ -11263,10 +11470,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:11267: checking for dsegv_" >&5
+echo "configure:11474: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 11270 "configure"
+#line 11477 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -11289,7 +11496,7 @@
; return 0; }
EOF
-if { (eval echo configure:11293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11500: \"$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
@@ -11316,13 +11523,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:11320: checking for desgv_ in -llapack" >&5
+echo "configure:11527: 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 11326 "configure"
+#line 11533 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11333,7 +11540,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:11337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11365,13 +11572,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:11369: checking for dgesv_ in -llapack" >&5
+echo "configure:11576: 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 11375 "configure"
+#line 11582 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11382,7 +11589,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:11386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11401,13 +11608,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:11405: checking for dgesv_ in -llapack" >&5
+echo "configure:11612: 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 11411 "configure"
+#line 11618 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11418,7 +11625,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:11422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11474,7 +11681,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:11478: checking whether to use Cairo" >&5
+echo "configure:11685: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -11506,7 +11713,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:11510: checking for location of cairo includes" >&5
+echo "configure:11717: 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; }
@@ -11532,15 +11739,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11536: checking for $ac_hdr" >&5
+echo "configure:11743: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11539 "configure"
+#line 11746 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11751: \"$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*
@@ -11576,7 +11783,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:11580: checking for location of cairo library" >&5
+echo "configure:11787: 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; }
@@ -11596,7 +11803,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:11600: checking for cairo linking flags" >&5
+echo "configure:11807: 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; }
@@ -11612,10 +11819,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:11616: checking for cairo_create" >&5
+echo "configure:11823: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 11619 "configure"
+#line 11826 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -11638,7 +11845,7 @@
; return 0; }
EOF
-if { (eval echo configure:11642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11849: \"$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
@@ -11672,10 +11879,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:11676: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:11883: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 11679 "configure"
+#line 11886 "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. */
@@ -11698,7 +11905,7 @@
; return 0; }
EOF
-if { (eval echo configure:11702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11909: \"$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
@@ -11731,10 +11938,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_get_xrender_format""... $ac_c" 1>&6
-echo "configure:11735: checking for cairo_xlib_surface_get_xrender_format" >&5
+echo "configure:11942: checking for cairo_xlib_surface_get_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 11738 "configure"
+#line 11945 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_xlib_surface_get_xrender_format(); below. */
@@ -11757,7 +11964,7 @@
; return 0; }
EOF
-if { (eval echo configure:11761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11968: \"$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_get_xrender_format=yes"
else
@@ -11799,7 +12006,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:11803: checking whether to use FreeType" >&5
+echo "configure:12010: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -11818,7 +12025,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:11822: checking for location of FreeType includes" >&5
+echo "configure:12029: 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; }
@@ -11844,15 +12051,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11848: checking for $ac_hdr" >&5
+echo "configure:12055: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11851 "configure"
+#line 12058 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12063: \"$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*
@@ -11886,7 +12093,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:11890: checking for location of FreeType library" >&5
+echo "configure:12097: 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; }
@@ -11911,13 +12118,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:11915: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:12122: 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 11921 "configure"
+#line 12128 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11928,7 +12135,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:11932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11969,7 +12176,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:11973: checking whether to use NLS" >&5
+echo "configure:12180: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -11989,10 +12196,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:11993: checking for gettext" >&5
+echo "configure:12200: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 11996 "configure"
+#line 12203 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -12015,7 +12222,7 @@
; return 0; }
EOF
-if { (eval echo configure:12019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12226: \"$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
@@ -12033,13 +12240,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:12037: checking for gettext in -lintl" >&5
+echo "configure:12244: 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 12043 "configure"
+#line 12250 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12050,7 +12257,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:12054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12085,7 +12292,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:12089: checking whether to use C++" >&5
+echo "configure:12296: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -12101,7 +12308,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:12105: checking for $ac_word" >&5
+echo "configure:12312: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -12130,7 +12337,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:12134: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:12341: 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.
@@ -12141,12 +12348,12 @@
cat > conftest.$ac_ext << EOF
-#line 12145 "configure"
+#line 12352 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:12150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12357: \"$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
@@ -12172,19 +12379,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:12176: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:12383: 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:12181: checking whether we are using GNU C++" >&5
+echo "configure:12388: 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:12188: \"$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:12395: \"$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
@@ -12202,7 +12409,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:12206: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:12413: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -12230,7 +12437,58 @@
fi
fi
+for ac_declaration in \
+ ''\
+ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
+do
+ cat > conftest.$ac_ext <<EOF
+#line 12451 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int main() {
+exit (42);
+; return 0; }
+EOF
+if { (eval echo configure:12459: \"$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*
+ continue
+fi
+rm -f conftest*
+ cat > conftest.$ac_ext <<EOF
+#line 12469 "configure"
+#include "confdefs.h"
+$ac_declaration
+int main() {
+exit (42);
+; return 0; }
+EOF
+if { (eval echo configure:12476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ break
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+if test -n "$ac_declaration"; then
+ echo '#ifdef __cplusplus' >>confdefs.h
+ echo $ac_declaration >>confdefs.h
+ echo '#endif' >>confdefs.h
+fi
+
+
+else
CXX=
CXXFLAGS=
@@ -12243,7 +12501,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:12247: checking whether to use openDWG" >&5
+echo "configure:12505: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -12263,7 +12521,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:12267: checking for location of openDGW includes" >&5
+echo "configure:12525: 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; }
@@ -12289,15 +12547,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12293: checking for $ac_hdr" >&5
+echo "configure:12551: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12296 "configure"
+#line 12554 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12559: \"$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*
@@ -12331,7 +12589,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:12335: checking for location of openDWG library" >&5
+echo "configure:12593: 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; }
@@ -12372,7 +12630,7 @@
echo $ac_n "checking whether to use POSIX threads""... $ac_c" 1>&6
-echo "configure:12376: checking whether to use POSIX threads" >&5
+echo "configure:12634: checking whether to use POSIX threads" >&5
echo "$ac_t"""$with_pthread"" 1>&6
case "$with_pthread" in
"no") USE_PTHREAD= ;;
@@ -12392,7 +12650,7 @@
echo $ac_n "checking for location of POSIX threads includes""... $ac_c" 1>&6
-echo "configure:12396: checking for location of POSIX threads includes" >&5
+echo "configure:12654: checking for location of POSIX threads includes" >&5
case "$with_pthread_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-pthread-includes." 1>&2; exit 1; }
@@ -12418,15 +12676,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12422: checking for $ac_hdr" >&5
+echo "configure:12680: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12425 "configure"
+#line 12683 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12688: \"$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*
@@ -12460,7 +12718,7 @@
echo $ac_n "checking for location of POSIX threads library""... $ac_c" 1>&6
-echo "configure:12464: checking for location of POSIX threads library" >&5
+echo "configure:12722: checking for location of POSIX threads library" >&5
case "$with_pthread_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-pthread-libs." 1>&2; exit 1; }
@@ -12485,10 +12743,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:12489: checking for pthread_create" >&5
+echo "configure:12747: checking for pthread_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 12492 "configure"
+#line 12750 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_create(); below. */
@@ -12511,7 +12769,7 @@
; return 0; }
EOF
-if { (eval echo configure:12515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_create=yes"
else
@@ -12538,13 +12796,13 @@
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:12542: checking for pthread_create in -lpthread" >&5
+echo "configure:12800: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12548 "configure"
+#line 12806 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12555,7 +12813,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:12559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12605,7 +12863,7 @@
echo $ac_n "checking whether to use OpenMP""... $ac_c" 1>&6
-echo "configure:12609: checking whether to use OpenMP" >&5
+echo "configure:12867: checking whether to use OpenMP" >&5
echo "$ac_t"""$with_openmp"" 1>&6
case "$with_openmp" in
"no") USE_OPENMP= ;;
@@ -12626,7 +12884,7 @@
echo $ac_n "checking for location of OpenMP includes""... $ac_c" 1>&6
-echo "configure:12630: checking for location of OpenMP includes" >&5
+echo "configure:12888: checking for location of OpenMP includes" >&5
case "$with_openmp_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-openmp-includes." 1>&2; exit 1; }
@@ -12652,15 +12910,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12656: checking for $ac_hdr" >&5
+echo "configure:12914: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12659 "configure"
+#line 12917 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12922: \"$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*
@@ -12698,7 +12956,7 @@
echo $ac_n "checking for location of OpenMP library""... $ac_c" 1>&6
-echo "configure:12702: checking for location of OpenMP library" >&5
+echo "configure:12960: checking for location of OpenMP library" >&5
case "$with_openmp_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-openmp-libs." 1>&2; exit 1; }
@@ -12723,10 +12981,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for GOMP_parallel_start""... $ac_c" 1>&6
-echo "configure:12727: checking for GOMP_parallel_start" >&5
+echo "configure:12985: checking for GOMP_parallel_start" >&5
cat > conftest.$ac_ext <<EOF
-#line 12730 "configure"
+#line 12988 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char GOMP_parallel_start(); below. */
@@ -12749,7 +13007,7 @@
; return 0; }
EOF
-if { (eval echo configure:12753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_GOMP_parallel_start=yes"
else
@@ -12776,13 +13034,13 @@
echo $ac_n "checking for GOMP_parallel_start in -lgomp""... $ac_c" 1>&6
-echo "configure:12780: checking for GOMP_parallel_start in -lgomp" >&5
+echo "configure:13038: checking for GOMP_parallel_start in -lgomp" >&5
ac_lib_var=`echo gomp'_'GOMP_parallel_start | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgomp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12786 "configure"
+#line 13044 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12793,7 +13051,7 @@
GOMP_parallel_start()
; return 0; }
EOF
-if { (eval echo configure:12797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12866,7 +13124,7 @@
echo $ac_n "checking whether to use OpenCL""... $ac_c" 1>&6
-echo "configure:12870: checking whether to use OpenCL" >&5
+echo "configure:13128: checking whether to use OpenCL" >&5
echo "$ac_t"""$with_opencl"" 1>&6
case "$with_opencl" in
"no") USE_OPENCL= ;;
@@ -12886,7 +13144,7 @@
echo $ac_n "checking for location of OpenCL includes""... $ac_c" 1>&6
-echo "configure:12890: checking for location of OpenCL includes" >&5
+echo "configure:13148: checking for location of OpenCL includes" >&5
case "$with_opencl_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opencl-includes." 1>&2; exit 1; }
@@ -12913,15 +13171,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12917: checking for $ac_hdr" >&5
+echo "configure:13175: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12920 "configure"
+#line 13178 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13183: \"$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*
@@ -12961,10 +13219,10 @@
LIBS="-framework OpenCL $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for clGetPlatformInfo""... $ac_c" 1>&6
-echo "configure:12965: checking for clGetPlatformInfo" >&5
+echo "configure:13223: checking for clGetPlatformInfo" >&5
cat > conftest.$ac_ext <<EOF
-#line 12968 "configure"
+#line 13226 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char clGetPlatformInfo(); below. */
@@ -12987,7 +13245,7 @@
; return 0; }
EOF
-if { (eval echo configure:12991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_clGetPlatformInfo=yes"
else
@@ -13026,15 +13284,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13030: checking for $ac_hdr" >&5
+echo "configure:13288: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13033 "configure"
+#line 13291 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13296: \"$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*
@@ -13067,7 +13325,7 @@
# With OpenCL library directory
echo $ac_n "checking for location of OpenCL library""... $ac_c" 1>&6
-echo "configure:13071: checking for location of OpenCL library" >&5
+echo "configure:13329: checking for location of OpenCL library" >&5
case "$with_opencl_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opencl-libs." 1>&2; exit 1; }
@@ -13091,13 +13349,13 @@
echo $ac_n "checking for clGetPlatformInfo in -lOpenCL""... $ac_c" 1>&6
-echo "configure:13095: checking for clGetPlatformInfo in -lOpenCL" >&5
+echo "configure:13353: checking for clGetPlatformInfo in -lOpenCL" >&5
ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lOpenCL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13101 "configure"
+#line 13359 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13108,7 +13366,7 @@
clGetPlatformInfo()
; return 0; }
EOF
-if { (eval echo configure:13112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13168,7 +13426,7 @@
fi
echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:13172: checking for special C compiler options needed for large files" >&5
+echo "configure:13430: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -13176,7 +13434,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 13180 "configure"
+#line 13438 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13192,7 +13450,7 @@
; return 0; }
EOF
-if { (eval echo configure:13196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -13201,7 +13459,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 13205 "configure"
+#line 13463 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13217,7 +13475,7 @@
; return 0; }
EOF
-if { (eval echo configure:13221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -13244,11 +13502,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:13248: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:13506: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 13252 "configure"
+#line 13510 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13264,14 +13522,14 @@
; return 0; }
EOF
-if { (eval echo configure:13268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13526: \"$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 13275 "configure"
+#line 13533 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -13289,7 +13547,7 @@
; return 0; }
EOF
-if { (eval echo configure:13293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -13315,11 +13573,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:13319: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:13577: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 13323 "configure"
+#line 13581 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13335,14 +13593,14 @@
; return 0; }
EOF
-if { (eval echo configure:13339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13597: \"$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 13346 "configure"
+#line 13604 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -13360,7 +13618,7 @@
; return 0; }
EOF
-if { (eval echo configure:13364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -13386,25 +13644,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13390: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13648: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 13394 "configure"
+#line 13652 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13659: \"$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 13408 "configure"
+#line 13666 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -13413,7 +13671,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -13445,25 +13703,25 @@
ac_save_cflags=${CFLAGS}
CFLAGS="$LFS_CFLAGS ${ac_save_cflags}"
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13449: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13707: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 13453 "configure"
+#line 13711 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13718: \"$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 13467 "configure"
+#line 13725 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -13472,7 +13730,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -13502,18 +13760,18 @@
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
echo $ac_n "checking for fseeko""... $ac_c" 1>&6
-echo "configure:13506: checking for fseeko" >&5
+echo "configure:13764: checking for fseeko" >&5
ac_cv_func_fseeko=no
cat > conftest.$ac_ext <<EOF
-#line 13510 "configure"
+#line 13768 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return fseeko && fseeko (stdin, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:13517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_fseeko=yes
else
@@ -13530,10 +13788,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:13534: checking if system supports Large Files at all" >&5
+echo "configure:13792: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 13537 "configure"
+#line 13795 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -13565,7 +13823,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:13569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -13760,9 +14018,12 @@
s%@ZLIBINCPATH@%$ZLIBINCPATH%g
s%@ZLIBLIBPATH@%$ZLIBLIBPATH%g
s%@ZLIB@%$ZLIB%g
-s%@BZLIBINCPATH@%$BZLIBINCPATH%g
-s%@BZLIBLIBPATH@%$BZLIBLIBPATH%g
-s%@BZLIB@%$BZLIB%g
+s%@BZIP2INCPATH@%$BZIP2INCPATH%g
+s%@BZIP2LIBPATH@%$BZIP2LIBPATH%g
+s%@BZIP2LIB@%$BZIP2LIB%g
+s%@ZSTDINCPATH@%$ZSTDINCPATH%g
+s%@ZSTDLIBPATH@%$ZSTDLIBPATH%g
+s%@ZSTDLIB@%$ZSTDLIB%g
s%@PROJINC@%$PROJINC%g
s%@PROJLIB@%$PROJLIB%g
s%@PROJSHARE@%$PROJSHARE%g
@@ -14198,5 +14459,7 @@
echo " X11 support: `if test -n "${USE_X11}" ; then echo yes ; else echo no ; fi`"
+echo " Zstandard support: `if test -n "${USE_ZSTD}" ; then echo yes ; else echo no ; fi`"
+
echo ""
Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in 2017-12-04 15:37:44 UTC (rev 71888)
+++ grass/trunk/configure.in 2017-12-04 18:15:57 UTC (rev 71889)
@@ -268,6 +268,7 @@
LOC_ARG_WITH(openmp, OpenMP, no)
LOC_ARG_WITH(opencl, OpenCL, no)
LOC_ARG_WITH(bzlib, BZIP2, no)
+LOC_ARG_WITH(zstd, Zstandard, no)
AC_ARG_WITH(gdal,
[ --with-gdal[=path/gdal-config]
@@ -318,6 +319,9 @@
LOC_ARG_WITH_INC(bzlib, BZIP2)
LOC_ARG_WITH_LIB(bzlib, BZIP2)
+LOC_ARG_WITH_INC(zstd, ZSTD)
+LOC_ARG_WITH_LIB(zstd, ZSTD)
+
LOC_ARG_WITH_INC(readline, Readline)
LOC_ARG_WITH_LIB(readline, Readline)
@@ -600,36 +604,67 @@
# bzip2 support
+BZIP2LIBPATH=
+BZIP2INCPATH=
+BZIP2LIB=
+
LOC_CHECK_USE(bzlib,bzlib,USE_BZIP2)
if test -n "$USE_BZIP2"; then
-BZLIBLIBPATH=
-BZLIBINCPATH=
-BZLIB=
-
# With bzip2 includes directory
-LOC_CHECK_INC_PATH(bzlib,bzlib,BZLIBINCPATH)
+LOC_CHECK_INC_PATH(bzlib,bzlib,BZIP2INCPATH)
-LOC_CHECK_INCLUDES(bzlib.h,bzlib,$BZLIBINCPATH)
+LOC_CHECK_INCLUDES(bzlib.h,bzlib,$BZIP2INCPATH)
# With bzip2 library directory
-LOC_CHECK_LIB_PATH(bzlib,bzlib,BZLIBLIBPATH)
+LOC_CHECK_LIB_PATH(bzlib,bzlib,BZIP2LIBPATH)
-LOC_CHECK_LIBS(bz2,BZ2_bzBuffToBuffCompress,bzlib,$BZLIBLIBPATH,BZLIB,,,)
+LOC_CHECK_LIBS(bz2,BZ2_bzBuffToBuffCompress,bzlib,$BZIP2LIBPATH,BZIP2LIB,,,)
#
fi # $USE_BZIP2
-AC_SUBST(BZLIBINCPATH)
-AC_SUBST(BZLIBLIBPATH)
-AC_SUBST(BZLIB)
+AC_SUBST(BZIP2INCPATH)
+AC_SUBST(BZIP2LIBPATH)
+AC_SUBST(BZIP2LIB)
# Done checking bzip2
+# zstd support
+
+ZSTDLIBPATH=
+ZSTDINCPATH=
+ZSTDLIB=
+
+LOC_CHECK_USE(zstd,zstd,USE_ZSTD)
+
+if test -n "$USE_ZSTD"; then
+
+# With zstd includes directory
+
+LOC_CHECK_INC_PATH(zstd,zstd,ZSTDINCPATH)
+LOC_CHECK_INCLUDES(zstd.h,zstd,$ZSTDINCPATH)
+
+# With zstd library directory
+
+LOC_CHECK_LIB_PATH(zstd,zstd,ZSTDLIBPATH)
+
+LOC_CHECK_LIBS(zstd,ZSTD_compress,zstd,$ZSTDLIBPATH,ZSTDLIB,,,)
+
+#
+
+fi # $USE_ZSTD
+
+AC_SUBST(ZSTDINCPATH)
+AC_SUBST(ZSTDLIBPATH)
+AC_SUBST(ZSTDLIB)
+
+# Done checking zstd
+
# Mandatory PROJ dependency
PROJINC=
@@ -1937,4 +1972,5 @@
LOC_MSG_USE(SQLite support,USE_SQLITE)
LOC_MSG_USE(TIFF support,USE_TIFF)
LOC_MSG_USE(X11 support,USE_X11)
+LOC_MSG_USE(Zstandard support,USE_ZSTD)
LOC_MSG()
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2017-12-04 15:37:44 UTC (rev 71888)
+++ grass/trunk/include/Make/Grass.make 2017-12-04 18:15:57 UTC (rev 71889)
@@ -197,7 +197,7 @@
DSPFDEPS = $(GISLIB)
FORMDEPS = $(DBMILIB) $(GISLIB)
RASTER3DDEPS = $(RASTERLIB) $(GISLIB)
-GISDEPS = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(BZLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
+GISDEPS = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(BZIP2LIBPATH) $(BZIP2LIB) $(ZSTDLIBPATH) $(ZSTDLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OMPLIBPATH) $(OMPLIB)
GPDEDEPS = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(OMPLIBPATH) $(OMPLIB) $(MATHLIB)
GPROJDEPS = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
Modified: grass/trunk/include/Make/Platform.make.in
===================================================================
--- grass/trunk/include/Make/Platform.make.in 2017-12-04 15:37:44 UTC (rev 71888)
+++ grass/trunk/include/Make/Platform.make.in 2017-12-04 18:15:57 UTC (rev 71889)
@@ -95,10 +95,15 @@
ZLIBLIBPATH = @ZLIBLIBPATH@
#BZIP2:
-BZLIB = @BZLIB@
-BZLIBINCPATH = @BZLIBINCPATH@
-BZLIBLIBPATH = @BZLIBLIBPATH@
+BZIP2LIB = @BZIP2LIB@
+BZIP2INCPATH = @BZIP2INCPATH@
+BZIP2LIBPATH = @BZIP2LIBPATH@
+#ZSTD:
+ZSTDLIB = @ZSTDLIB@
+ZSTDINCPATH = @ZSTDINCPATH@
+ZSTDLIBPATH = @ZSTDLIBPATH@
+
DBMIEXTRALIB = @DBMIEXTRALIB@
#readline
Modified: grass/trunk/include/config.h.in
===================================================================
--- grass/trunk/include/config.h.in 2017-12-04 15:37:44 UTC (rev 71888)
+++ grass/trunk/include/config.h.in 2017-12-04 18:15:57 UTC (rev 71889)
@@ -41,6 +41,9 @@
/* define if bzlib.h exists */
#undef HAVE_BZLIB_H
+/* define if zstd.h exists */
+#undef HAVE_ZSTD_H
+
/* define if sys/ioctl.h exists */
#undef HAVE_SYS_IOCTL_H
Modified: grass/trunk/lib/gis/Makefile
===================================================================
--- grass/trunk/lib/gis/Makefile 2017-12-04 15:37:44 UTC (rev 71888)
+++ grass/trunk/lib/gis/Makefile 2017-12-04 18:15:57 UTC (rev 71889)
@@ -2,7 +2,7 @@
LIB = GIS
-EXTRA_INC = $(ZLIBINCPATH) $(PTHREADINCPATH) $(REGEXINCPATH)
+EXTRA_INC = $(ZLIBINCPATH) $(BZIP2INCPATH) $(ZSTDINCPATH) $(PTHREADINCPATH) $(REGEXINCPATH)
EXTRA_CFLAGS = -DGRASS_VERSION_DATE=\"'$(GRASS_VERSION_DATE)'\"
PROJSRC = ellipse.table ellipse.table.solar.system datum.table \
More information about the grass-commit
mailing list