[GRASS-SVN] r49652 - in grass/trunk: . include/Make lib/gmath
lib/gmath/test lib/gpde lib/gpde/test
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Dec 11 20:37:38 EST 2011
Author: hamish
Date: 2011-12-11 17:37:38 -0800 (Sun, 11 Dec 2011)
New Revision: 49652
Modified:
grass/trunk/configure
grass/trunk/configure.in
grass/trunk/include/Make/Grass.make
grass/trunk/include/Make/Platform.make.in
grass/trunk/lib/gmath/Makefile
grass/trunk/lib/gmath/test/Makefile
grass/trunk/lib/gpde/Makefile
grass/trunk/lib/gpde/test/Makefile
Log:
add build support for OpenMP (#657)
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/configure 2011-12-12 01:37:38 UTC (rev 49652)
@@ -69,6 +69,8 @@
ac_help="$ac_help
--with-pthread support POSIX threads functionality (default: no)"
ac_help="$ac_help
+ --with-openmp support OpenMP 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')"
@@ -210,6 +212,11 @@
--with-pthread-libs=DIRS
POSIX threads library files are in DIRS"
ac_help="$ac_help
+ --with-openmp-includes=DIRS
+ OpenMP include files are in DIRS"
+ac_help="$ac_help
+ --with-openmp-libs=DIRS OpenMP library files are in DIRS"
+ac_help="$ac_help
--with-x use the X Window System"
ac_help="$ac_help
--enable-largefile enable support for large files (LFS)"
@@ -745,7 +752,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:749: checking host system type" >&5
+echo "configure:756: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -768,7 +775,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:772: checking for $ac_word" >&5
+echo "configure:779: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -795,7 +802,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:799: checking for $ac_word" >&5
+echo "configure:806: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -843,7 +850,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:847: checking for $ac_word" >&5
+echo "configure:854: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -872,7 +879,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:876: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:883: 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.
@@ -883,12 +890,12 @@
cat > conftest.$ac_ext << EOF
-#line 887 "configure"
+#line 894 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:899: \"$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
@@ -914,19 +921,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:918: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:925: 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:923: checking whether we are using GNU C" >&5
+echo "configure:930: 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:930: \"$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:937: \"$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
@@ -944,7 +951,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:948: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:955: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -973,10 +980,10 @@
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:977: checking for Cygwin environment" >&5
+echo "configure:984: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 980 "configure"
+#line 987 "configure"
#include "confdefs.h"
int main() {
@@ -987,7 +994,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -1003,17 +1010,17 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1007: checking for mingw32 environment" >&5
+echo "configure:1014: checking for mingw32 environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 1010 "configure"
+#line 1017 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1031,7 +1038,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1035: checking for executable suffix" >&5
+echo "configure:1042: checking for executable suffix" >&5
if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
ac_cv_exeext=.exe
@@ -1050,23 +1057,23 @@
IEEEFLAG=
echo $ac_n "checking for full floating-point support""... $ac_c" 1>&6
-echo "configure:1054: checking for full floating-point support" >&5
+echo "configure:1061: 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:1059: checking whether "cc -mieee" works" >&5
+echo "configure:1066: checking whether "cc -mieee" works" >&5
ac_save_cflags=${CFLAGS}
CFLAGS="$CFLAGS -mieee"
cat > conftest.$ac_ext <<EOF
-#line 1063 "configure"
+#line 1070 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
IEEEFLAG="-mieee"
@@ -1082,7 +1089,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 1086 "configure"
+#line 1093 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1096,7 +1103,7 @@
}
EOF
-if { (eval echo configure:1100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1107: \"$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
@@ -1109,14 +1116,14 @@
CFLAGS=-mieee
echo $ac_n "checking for full floating-point support with -mieee""... $ac_c" 1>&6
-echo "configure:1113: checking for full floating-point support with -mieee" >&5
+echo "configure:1120: 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 1120 "configure"
+#line 1127 "configure"
#include "confdefs.h"
#include <float.h>
@@ -1130,7 +1137,7 @@
}
EOF
-if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1141: \"$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"
@@ -1167,7 +1174,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:1171: checking for $ac_word" >&5
+echo "configure:1178: checking for $ac_word" >&5
case "$pwd" in
/*)
@@ -1205,7 +1212,7 @@
fi
echo $ac_n "checking for source directory""... $ac_c" 1>&6
-echo "configure:1209: checking for source directory" >&5
+echo "configure:1216: checking for source directory" >&5
if test -z "$srcdir" ; then
SRCDIR=`$pwd`
@@ -1216,7 +1223,7 @@
echo "$ac_t"""$SRCDIR"" 1>&6
echo $ac_n "checking for build directory""... $ac_c" 1>&6
-echo "configure:1220: checking for build directory" >&5
+echo "configure:1227: checking for build directory" >&5
DSTDIR=`$pwd`
WINDSTDIR=`$winpwd`
@@ -1284,7 +1291,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:1288: checking for $ac_word" >&5
+echo "configure:1295: checking for $ac_word" >&5
case "$SVN_VERSION" in
/*)
@@ -1340,7 +1347,7 @@
echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1344: checking for MacOSX App" >&5
+echo "configure:1351: checking for MacOSX App" >&5
case "$enable_macosx_app" in
yes) MACOSX_APP=1 ;;
no) MACOSX_APP= ;;
@@ -1352,7 +1359,7 @@
# Check for MacOSX archs
echo $ac_n "checking for MacOSX architectures""... $ac_c" 1>&6
-echo "configure:1356: checking for MacOSX architectures" >&5
+echo "configure:1363: checking for MacOSX architectures" >&5
MACOSX_ARCHS=
@@ -1381,7 +1388,7 @@
# Check for MacOSX SDK
echo $ac_n "checking for MacOSX SDK""... $ac_c" 1>&6
-echo "configure:1385: checking for MacOSX SDK" >&5
+echo "configure:1392: checking for MacOSX SDK" >&5
MACOSX_SDK=
@@ -1391,7 +1398,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:1395: checking for $with_macosx_sdk/SDKSettings.plist" >&5
+echo "configure:1402: 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; }
@@ -1435,7 +1442,7 @@
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1439: checking how to build libraries" >&5
+echo "configure:1446: 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"
@@ -1813,6 +1820,16 @@
+# Check whether --with-openmp or --without-openmp was given.
+if test "${with_openmp+set}" = set; then
+ withval="$with_openmp"
+ :
+else
+ with_openmp=no
+fi
+
+
+
# Check whether --with-gdal or --without-gdal was given.
if test "${with_gdal+set}" = set; then
withval="$with_gdal"
@@ -2244,6 +2261,23 @@
+
+# Check whether --with-openmp-includes or --without-openmp-includes was given.
+if test "${with_openmp_includes+set}" = set; then
+ withval="$with_openmp_includes"
+ :
+fi
+
+
+
+# Check whether --with-openmp-libs or --without-openmp-libs was given.
+if test "${with_openmp_libs+set}" = set; then
+ withval="$with_openmp_libs"
+ :
+fi
+
+
+
# Put this early on so CPPFLAGS and LDFLAGS have any additional dirs
# With includes option
@@ -2253,7 +2287,7 @@
# Done checking fortran
echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:2257: checking for additional include dirs" >&5
+echo "configure:2291: 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; }
@@ -2276,7 +2310,7 @@
# With libs option
echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:2280: checking for additional library dirs" >&5
+echo "configure:2314: 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; }
@@ -2310,7 +2344,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:2314: checking for a BSD compatible install" >&5
+echo "configure:2348: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
@@ -2363,7 +2397,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:2367: checking for $ac_word" >&5
+echo "configure:2401: checking for $ac_word" >&5
if test -n "$LEX"; then
ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -2394,13 +2428,13 @@
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:2398: checking for yywrap in -l$ac_lib" >&5
+echo "configure:2432: 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 2404 "configure"
+#line 2438 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2411,7 +2445,7 @@
yywrap()
; return 0; }
EOF
-if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2436,7 +2470,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:2440: checking for $ac_word" >&5
+echo "configure:2474: checking for $ac_word" >&5
case "$LEXPATH" in
/*)
@@ -2476,7 +2510,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:2480: checking for $ac_word" >&5
+echo "configure:2514: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2507,7 +2541,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:2511: checking for $ac_word" >&5
+echo "configure:2545: checking for $ac_word" >&5
case "$YACCPATH" in
/*)
@@ -2545,7 +2579,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:2549: checking for $ac_word" >&5
+echo "configure:2583: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2574,7 +2608,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:2578: checking for $ac_word" >&5
+echo "configure:2612: checking for $ac_word" >&5
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -2605,7 +2639,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:2609: checking for $ac_word" >&5
+echo "configure:2643: checking for $ac_word" >&5
if test -n "$ENV"; then
ac_cv_prog_ENV="$ENV" # Let the user override the test.
@@ -2634,7 +2668,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:2638: checking for $ac_word" >&5
+echo "configure:2672: checking for $ac_word" >&5
case "$PERL" in
/*)
@@ -2665,7 +2699,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2669: checking how to run the C preprocessor" >&5
+echo "configure:2703: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2678,13 +2712,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2682 "configure"
+#line 2716 "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:2688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2722: \"$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
:
@@ -2695,13 +2729,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2699 "configure"
+#line 2733 "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:2705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2739: \"$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
:
@@ -2712,13 +2746,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2716 "configure"
+#line 2750 "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:2722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2756: \"$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
:
@@ -2742,10 +2776,10 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2746: checking for ANSI C header files" >&5
+echo "configure:2780: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 2749 "configure"
+#line 2783 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2753,7 +2787,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2791: \"$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*
@@ -2770,7 +2804,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 2774 "configure"
+#line 2808 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2788,7 +2822,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 2792 "configure"
+#line 2826 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2809,7 +2843,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 2813 "configure"
+#line 2847 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2820,7 +2854,7 @@
exit (0); }
EOF
-if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2847,15 +2881,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2851: checking for $ac_hdr" >&5
+echo "configure:2885: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 2854 "configure"
+#line 2888 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2893: \"$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*
@@ -2884,15 +2918,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2888: checking for $ac_hdr" >&5
+echo "configure:2922: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 2891 "configure"
+#line 2925 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2930: \"$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*
@@ -2921,15 +2955,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2925: checking for $ac_hdr" >&5
+echo "configure:2959: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 2928 "configure"
+#line 2962 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2967: \"$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*
@@ -2958,15 +2992,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2962: checking for $ac_hdr" >&5
+echo "configure:2996: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 2965 "configure"
+#line 2999 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3004: \"$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*
@@ -2995,15 +3029,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2999: checking for $ac_hdr" >&5
+echo "configure:3033: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3002 "configure"
+#line 3036 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3041: \"$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*
@@ -3029,10 +3063,10 @@
done
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3033: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3067: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 3036 "configure"
+#line 3070 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3041,7 +3075,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -3061,10 +3095,10 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3065: checking for off_t" >&5
+echo "configure:3099: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 3068 "configure"
+#line 3102 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -3091,10 +3125,10 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3095: checking for uid_t in sys/types.h" >&5
+echo "configure:3129: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3098 "configure"
+#line 3132 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -3122,10 +3156,10 @@
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3126: checking return type of signal handlers" >&5
+echo "configure:3160: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 3129 "configure"
+#line 3163 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3142,7 +3176,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:3146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3160,10 +3194,10 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:3164: checking for Cygwin environment" >&5
+echo "configure:3198: checking for Cygwin environment" >&5
cat > conftest.$ac_ext <<EOF
-#line 3167 "configure"
+#line 3201 "configure"
#include "confdefs.h"
int main() {
@@ -3174,7 +3208,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:3178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -3192,10 +3226,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:3196: checking for $ac_func" >&5
+echo "configure:3230: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3199 "configure"
+#line 3233 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3218,7 +3252,7 @@
; return 0; }
EOF
-if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3256: \"$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
@@ -3244,10 +3278,10 @@
for ac_func in seteuid setpriority setreuid setruid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3248: checking for $ac_func" >&5
+echo "configure:3282: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3251 "configure"
+#line 3285 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3270,7 +3304,7 @@
; return 0; }
EOF
-if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3308: \"$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
@@ -3296,10 +3330,10 @@
for ac_func in drand48
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3300: checking for $ac_func" >&5
+echo "configure:3334: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3303 "configure"
+#line 3337 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3322,7 +3356,7 @@
; return 0; }
EOF
-if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3360: \"$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
@@ -3348,10 +3382,10 @@
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3352: checking for $ac_func" >&5
+echo "configure:3386: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3355 "configure"
+#line 3389 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3374,7 +3408,7 @@
; return 0; }
EOF
-if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3412: \"$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
@@ -3400,10 +3434,10 @@
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3404: checking for $ac_func" >&5
+echo "configure:3438: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 3407 "configure"
+#line 3441 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3426,7 +3460,7 @@
; return 0; }
EOF
-if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3464: \"$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,13 +3485,13 @@
if test "$cross_compiling" != "yes" ; then
echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3455: checking whether setpgrp takes no argument" >&5
+echo "configure:3489: 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 3461 "configure"
+#line 3495 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -3477,7 +3511,7 @@
}
EOF
-if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3515: \"$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
@@ -3505,16 +3539,16 @@
fi
echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:3509: checking for long long int" >&5
+echo "configure:3543: checking for long long int" >&5
cat > conftest.$ac_ext <<EOF
-#line 3511 "configure"
+#line 3545 "configure"
#include "confdefs.h"
int main() {
long long int x;
; return 0; }
EOF
-if { (eval echo configure:3518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3534,7 +3568,7 @@
rm -f conftest*
echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:3538: checking for W11" >&5
+echo "configure:3572: 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; } ;;
@@ -3562,7 +3596,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:3566: checking for X" >&5
+echo "configure:3600: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -3622,12 +3656,12 @@
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
+#line 3660 "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:3631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3665: \"$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*
@@ -3696,14 +3730,14 @@
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3700 "configure"
+#line 3734 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3741: \"$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.
@@ -3808,17 +3842,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:3812: checking whether -R must be followed by a space" >&5
+echo "configure:3846: 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 3815 "configure"
+#line 3849 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3834,14 +3868,14 @@
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3838 "configure"
+#line 3872 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3873,13 +3907,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:3877: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3911: 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 3883 "configure"
+#line 3917 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3890,7 +3924,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3911,13 +3945,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:3915: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3949: 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 3921 "configure"
+#line 3955 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3928,7 +3962,7 @@
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3956,10 +3990,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:3960: checking for gethostbyname" >&5
+echo "configure:3994: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 3963 "configure"
+#line 3997 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3982,7 +4016,7 @@
; return 0; }
EOF
-if { (eval echo configure:3986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4020: \"$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
@@ -4002,13 +4036,13 @@
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4006: checking for gethostbyname in -lnsl" >&5
+echo "configure:4040: 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 4012 "configure"
+#line 4046 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4019,7 +4053,7 @@
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4048,10 +4082,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:4052: checking for connect" >&5
+echo "configure:4086: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 4055 "configure"
+#line 4089 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -4074,7 +4108,7 @@
; return 0; }
EOF
-if { (eval echo configure:4078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4112: \"$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
@@ -4094,13 +4128,13 @@
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4098: checking for connect in -lsocket" >&5
+echo "configure:4132: 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 4104 "configure"
+#line 4138 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4111,7 +4145,7 @@
connect()
; return 0; }
EOF
-if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4134,10 +4168,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:4138: checking for remove" >&5
+echo "configure:4172: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 4141 "configure"
+#line 4175 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -4160,7 +4194,7 @@
; return 0; }
EOF
-if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4198: \"$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
@@ -4180,13 +4214,13 @@
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4184: checking for remove in -lposix" >&5
+echo "configure:4218: 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 4190 "configure"
+#line 4224 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4197,7 +4231,7 @@
remove()
; return 0; }
EOF
-if { (eval echo configure:4201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4220,10 +4254,10 @@
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4224: checking for shmat" >&5
+echo "configure:4258: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 4227 "configure"
+#line 4261 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -4246,7 +4280,7 @@
; return 0; }
EOF
-if { (eval echo configure:4250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4284: \"$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
@@ -4266,13 +4300,13 @@
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4270: checking for shmat in -lipc" >&5
+echo "configure:4304: 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 4276 "configure"
+#line 4310 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4283,7 +4317,7 @@
shmat()
; return 0; }
EOF
-if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4315,13 +4349,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:4319: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4353: 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 4325 "configure"
+#line 4359 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4332,7 +4366,7 @@
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4372,12 +4406,12 @@
LIBS=""
echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:4376: checking for library containing cuserid" >&5
+echo "configure:4410: checking for library containing cuserid" >&5
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_cuserid="no"
cat > conftest.$ac_ext <<EOF
-#line 4381 "configure"
+#line 4415 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4388,7 +4422,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4426: \"$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
@@ -4399,7 +4433,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 4403 "configure"
+#line 4437 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4410,7 +4444,7 @@
cuserid()
; return 0; }
EOF
-if { (eval echo configure:4414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4448: \"$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
@@ -4436,10 +4470,10 @@
# Note: -lxdr -liberty -lws2_32 is for MinGW
echo $ac_n "checking for xdrmem_create""... $ac_c" 1>&6
-echo "configure:4440: checking for xdrmem_create" >&5
+echo "configure:4474: checking for xdrmem_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 4443 "configure"
+#line 4477 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char xdrmem_create(); below. */
@@ -4462,7 +4496,7 @@
; return 0; }
EOF
-if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_xdrmem_create=yes"
else
@@ -4480,13 +4514,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
-echo "configure:4484: checking for xdrmem_create in -lsun" >&5
+echo "configure:4518: checking for xdrmem_create in -lsun" >&5
ac_lib_var=`echo sun'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4490 "configure"
+#line 4524 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4497,7 +4531,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4516,13 +4550,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
-echo "configure:4520: checking for xdrmem_create in -lnsl" >&5
+echo "configure:4554: checking for xdrmem_create in -lnsl" >&5
ac_lib_var=`echo nsl'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4526 "configure"
+#line 4560 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4533,7 +4567,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4552,13 +4586,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
-echo "configure:4556: checking for xdrmem_create in -lrpclib" >&5
+echo "configure:4590: checking for xdrmem_create in -lrpclib" >&5
ac_lib_var=`echo rpclib'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lrpclib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4562 "configure"
+#line 4596 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4569,7 +4603,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4588,13 +4622,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for xdrmem_create in -lxdr""... $ac_c" 1>&6
-echo "configure:4592: checking for xdrmem_create in -lxdr" >&5
+echo "configure:4626: checking for xdrmem_create in -lxdr" >&5
ac_lib_var=`echo xdr'_'xdrmem_create | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lxdr -liberty -lws2_32 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4598 "configure"
+#line 4632 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4605,7 +4639,7 @@
xdrmem_create()
; return 0; }
EOF
-if { (eval echo configure:4609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4639,10 +4673,10 @@
for ac_func in asprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4643: checking for $ac_func" >&5
+echo "configure:4677: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4646 "configure"
+#line 4680 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4665,7 +4699,7 @@
; return 0; }
EOF
-if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4703: \"$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
@@ -4692,10 +4726,10 @@
# Test if mathlib needs -lm flag or is included with libc
echo $ac_n "checking for atan""... $ac_c" 1>&6
-echo "configure:4696: checking for atan" >&5
+echo "configure:4730: checking for atan" >&5
cat > conftest.$ac_ext <<EOF
-#line 4699 "configure"
+#line 4733 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atan(); below. */
@@ -4718,7 +4752,7 @@
; return 0; }
EOF
-if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4756: \"$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
@@ -4736,13 +4770,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:4740: checking for atan in -lm" >&5
+echo "configure:4774: 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 4746 "configure"
+#line 4780 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4753,7 +4787,7 @@
atan()
; return 0; }
EOF
-if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4780,10 +4814,10 @@
echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:4784: checking for dlsym" >&5
+echo "configure:4818: checking for dlsym" >&5
cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4821 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym(); below. */
@@ -4806,7 +4840,7 @@
; return 0; }
EOF
-if { (eval echo configure:4810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4844: \"$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
@@ -4824,13 +4858,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:4828: checking for dlsym in -ldl" >&5
+echo "configure:4862: 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 4834 "configure"
+#line 4868 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4841,7 +4875,7 @@
dlsym()
; return 0; }
EOF
-if { (eval echo configure:4845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4868,10 +4902,10 @@
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:4872: checking for iconv" >&5
+echo "configure:4906: checking for iconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 4875 "configure"
+#line 4909 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv(); below. */
@@ -4894,7 +4928,7 @@
; return 0; }
EOF
-if { (eval echo configure:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4932: \"$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
@@ -4912,13 +4946,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:4916: checking for iconv in -liconv" >&5
+echo "configure:4950: 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 4922 "configure"
+#line 4956 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4929,7 +4963,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:4933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4948,13 +4982,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:4952: checking for iconv in -lgiconv" >&5
+echo "configure:4986: 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 4958 "configure"
+#line 4992 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4965,7 +4999,7 @@
iconv()
; return 0; }
EOF
-if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4984,10 +5018,10 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:4988: checking for libiconv" >&5
+echo "configure:5022: checking for libiconv" >&5
cat > conftest.$ac_ext <<EOF
-#line 4991 "configure"
+#line 5025 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char libiconv(); below. */
@@ -5010,7 +5044,7 @@
; return 0; }
EOF
-if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5048: \"$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
@@ -5028,13 +5062,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:5032: checking for libiconv in -liconv" >&5
+echo "configure:5066: 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 5038 "configure"
+#line 5072 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5045,7 +5079,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:5049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5064,13 +5098,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:5068: checking for libiconv in -lgiconv" >&5
+echo "configure:5102: 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 5074 "configure"
+#line 5108 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5081,7 +5115,7 @@
libiconv()
; return 0; }
EOF
-if { (eval echo configure:5085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5118,10 +5152,10 @@
have_socket=1
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:5122: checking for socket" >&5
+echo "configure:5156: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 5125 "configure"
+#line 5159 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
@@ -5144,7 +5178,7 @@
; return 0; }
EOF
-if { (eval echo configure:5148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5182: \"$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
@@ -5162,13 +5196,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5166: checking for socket in -lsocket" >&5
+echo "configure:5200: 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 5172 "configure"
+#line 5206 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5179,7 +5213,7 @@
socket()
; return 0; }
EOF
-if { (eval echo configure:5183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5227,7 +5261,7 @@
echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:5231: checking for location of zlib includes" >&5
+echo "configure:5265: 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; }
@@ -5253,15 +5287,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5257: checking for $ac_hdr" >&5
+echo "configure:5291: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5260 "configure"
+#line 5294 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5299: \"$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*
@@ -5295,7 +5329,7 @@
echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:5299: checking for location of zlib library" >&5
+echo "configure:5333: 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; }
@@ -5320,13 +5354,13 @@
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:5324: checking for deflate in -lz" >&5
+echo "configure:5358: 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 5330 "configure"
+#line 5364 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5337,7 +5371,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:5341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5385,7 +5419,7 @@
echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
-echo "configure:5389: checking for location of External PROJ.4 includes" >&5
+echo "configure:5423: 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; }
@@ -5411,15 +5445,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5415: checking for $ac_hdr" >&5
+echo "configure:5449: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5418 "configure"
+#line 5452 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5457: \"$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*
@@ -5456,7 +5490,7 @@
else
echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:5460: checking External PROJ.4 version" >&5
+echo "configure:5494: checking External PROJ.4 version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$PROJINC $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -5464,7 +5498,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5468 "configure"
+#line 5502 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -5476,7 +5510,7 @@
}
EOF
-if { (eval echo configure:5480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5514: \"$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
@@ -5501,7 +5535,7 @@
echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:5505: checking for location of External PROJ.4 library" >&5
+echo "configure:5539: 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; }
@@ -5526,13 +5560,13 @@
echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:5530: checking for pj_get_def in -lproj" >&5
+echo "configure:5564: 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 5536 "configure"
+#line 5570 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5543,7 +5577,7 @@
pj_get_def()
; return 0; }
EOF
-if { (eval echo configure:5547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5577,7 +5611,7 @@
echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
-echo "configure:5581: checking for location of External PROJ.4 data files" >&5
+echo "configure:5615: 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; }
@@ -5601,14 +5635,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:5605: checking for epsg" >&5
+echo "configure:5639: 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:5612: checking for $PROJSHARE/epsg" >&5
+echo "configure:5646: 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; }
@@ -5640,7 +5674,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:5644: checking for $ac_word" >&5
+echo "configure:5678: checking for $ac_word" >&5
case "$NAD2BIN" in
/*)
@@ -5680,7 +5714,7 @@
echo $ac_n "checking whether to use regex""... $ac_c" 1>&6
-echo "configure:5684: checking whether to use regex" >&5
+echo "configure:5718: checking whether to use regex" >&5
echo "$ac_t"""$with_regex"" 1>&6
case "$with_regex" in
"no") USE_REGEX= ;;
@@ -5700,7 +5734,7 @@
echo $ac_n "checking for location of regex includes""... $ac_c" 1>&6
-echo "configure:5704: checking for location of regex includes" >&5
+echo "configure:5738: 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; }
@@ -5726,15 +5760,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5730: checking for $ac_hdr" >&5
+echo "configure:5764: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5733 "configure"
+#line 5767 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5772: \"$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*
@@ -5768,7 +5802,7 @@
echo $ac_n "checking for location of regex library""... $ac_c" 1>&6
-echo "configure:5772: checking for location of regex library" >&5
+echo "configure:5806: 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; }
@@ -5793,10 +5827,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:5797: checking for regcomp" >&5
+echo "configure:5831: checking for regcomp" >&5
cat > conftest.$ac_ext <<EOF
-#line 5800 "configure"
+#line 5834 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -5819,7 +5853,7 @@
; return 0; }
EOF
-if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5857: \"$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
@@ -5846,13 +5880,13 @@
echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
-echo "configure:5850: checking for regcomp in -lregex" >&5
+echo "configure:5884: 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 5856 "configure"
+#line 5890 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5863,7 +5897,7 @@
regcomp()
; return 0; }
EOF
-if { (eval echo configure:5867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5913,7 +5947,7 @@
echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:5917: checking whether to use Readline" >&5
+echo "configure:5951: checking whether to use Readline" >&5
echo "$ac_t"""$with_readline"" 1>&6
case "$with_readline" in
"no") USE_READLINE= ;;
@@ -5934,7 +5968,7 @@
echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:5938: checking for location of Readline includes" >&5
+echo "configure:5972: 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; }
@@ -5960,15 +5994,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5964: checking for $ac_hdr" >&5
+echo "configure:5998: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5967 "configure"
+#line 6001 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6006: \"$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*
@@ -6004,15 +6038,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6008: checking for $ac_hdr" >&5
+echo "configure:6042: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6011 "configure"
+#line 6045 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6050: \"$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*
@@ -6046,7 +6080,7 @@
echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:6050: checking for location of Readline library" >&5
+echo "configure:6084: 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; }
@@ -6071,13 +6105,13 @@
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:6075: checking for readline in -lreadline" >&5
+echo "configure:6109: 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 6081 "configure"
+#line 6115 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6088,7 +6122,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:6092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6123,13 +6157,13 @@
echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:6127: checking for add_history in -lhistory" >&5
+echo "configure:6161: 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 6133 "configure"
+#line 6167 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6140,7 +6174,7 @@
add_history()
; return 0; }
EOF
-if { (eval echo configure:6144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6183,7 +6217,7 @@
echo $ac_n "checking whether to use JPEG""... $ac_c" 1>&6
-echo "configure:6187: checking whether to use JPEG" >&5
+echo "configure:6221: checking whether to use JPEG" >&5
echo "$ac_t"""$with_jpeg"" 1>&6
case "$with_jpeg" in
"no") USE_JPEG= ;;
@@ -6203,7 +6237,7 @@
echo $ac_n "checking for location of JPEG includes""... $ac_c" 1>&6
-echo "configure:6207: checking for location of JPEG includes" >&5
+echo "configure:6241: checking for location of JPEG includes" >&5
case "$with_jpeg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-jpeg-includes." 1>&2; exit 1; }
@@ -6229,15 +6263,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6233: checking for $ac_hdr" >&5
+echo "configure:6267: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6236 "configure"
+#line 6270 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6275: \"$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*
@@ -6271,7 +6305,7 @@
echo $ac_n "checking for location of JPEG library""... $ac_c" 1>&6
-echo "configure:6275: checking for location of JPEG library" >&5
+echo "configure:6309: checking for location of JPEG library" >&5
case "$with_jpeg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-jpeg-libs." 1>&2; exit 1; }
@@ -6298,13 +6332,13 @@
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:6302: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:6336: checking for jpeg_start_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6308 "configure"
+#line 6342 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6315,7 +6349,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:6319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6334,13 +6368,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:6338: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:6372: checking for jpeg_start_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6344 "configure"
+#line 6378 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6351,7 +6385,7 @@
jpeg_start_compress()
; return 0; }
EOF
-if { (eval echo configure:6355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6400,7 +6434,7 @@
# GDAL option
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:6404: checking whether to use GDAL" >&5
+echo "configure:6438: checking whether to use GDAL" >&5
GDAL_LIBS=
GDAL_CFLAGS=
@@ -6418,7 +6452,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:6422: checking for $ac_word" >&5
+echo "configure:6456: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -6473,14 +6507,14 @@
LIBS="$LIBS $GDAL_LIBS"
CFLAGS="$CFLAGS $GDAL_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 6477 "configure"
+#line 6511 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:6484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6489,14 +6523,14 @@
LIBS="$LIBS $GDAL_DEP_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6493 "configure"
+#line 6527 "configure"
#include "confdefs.h"
#include <gdal.h>
int main() {
GDALOpen("foo", GA_ReadOnly);
; return 0; }
EOF
-if { (eval echo configure:6500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6534: \"$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
@@ -6528,7 +6562,7 @@
# libLAS option
echo $ac_n "checking whether to use libLAS""... $ac_c" 1>&6
-echo "configure:6532: checking whether to use libLAS" >&5
+echo "configure:6566: checking whether to use libLAS" >&5
LIBLAS_LIBS=
LIBLAS_CFLAGS=
@@ -6545,7 +6579,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:6549: checking for $ac_word" >&5
+echo "configure:6583: checking for $ac_word" >&5
case "$LIBLAS_CONFIG" in
/*)
@@ -6593,14 +6627,14 @@
LIBS="$LIBS $LIBLAS_LIBS"
CFLAGS="$CFLAGS $LIBLAS_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 6597 "configure"
+#line 6631 "configure"
#include "confdefs.h"
#include <liblas/capi/liblas.h>
int main() {
LASReader_Create("foo");
; return 0; }
EOF
-if { (eval echo configure:6604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
:
else
echo "configure: failed program was:" >&5
@@ -6608,14 +6642,14 @@
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6612 "configure"
+#line 6646 "configure"
#include "confdefs.h"
#include <liblas/capi/liblas.h>
int main() {
LASReader_Create("foo");
; return 0; }
EOF
-if { (eval echo configure:6619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LAS_LIBS="$LAS_LIBS"
else
@@ -6647,7 +6681,7 @@
# GEOS option
echo $ac_n "checking whether to use GEOS""... $ac_c" 1>&6
-echo "configure:6651: checking whether to use GEOS" >&5
+echo "configure:6685: checking whether to use GEOS" >&5
GEOS_LIBS=
GGEOS_CFLAGS=
@@ -6665,7 +6699,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:6669: checking for $ac_word" >&5
+echo "configure:6703: checking for $ac_word" >&5
case "$GEOS_CONFIG" in
/*)
@@ -6713,15 +6747,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6717: checking for $ac_hdr" >&5
+echo "configure:6751: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6720 "configure"
+#line 6754 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6759: \"$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*
@@ -6757,13 +6791,13 @@
echo $ac_n "checking for initGEOS in -lgeos_c_i""... $ac_c" 1>&6
-echo "configure:6761: checking for initGEOS in -lgeos_c_i" >&5
+echo "configure:6795: checking for initGEOS in -lgeos_c_i" >&5
ac_lib_var=`echo geos_c_i'_'initGEOS | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lgeos_c_i $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6767 "configure"
+#line 6801 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6774,7 +6808,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6810,13 +6844,13 @@
echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6
-echo "configure:6814: checking for initGEOS in -lgeos_c" >&5
+echo "configure:6848: 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 6820 "configure"
+#line 6854 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6827,7 +6861,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6871,7 +6905,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:6875: checking whether to use TIFF" >&5
+echo "configure:6909: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -6891,7 +6925,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:6895: checking for location of TIFF includes" >&5
+echo "configure:6929: 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; }
@@ -6917,15 +6951,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6921: checking for $ac_hdr" >&5
+echo "configure:6955: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6924 "configure"
+#line 6958 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6963: \"$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*
@@ -6959,7 +6993,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:6963: checking for location of TIFF library" >&5
+echo "configure:6997: 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; }
@@ -6990,13 +7024,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6994: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7028: 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 7000 "configure"
+#line 7034 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7007,7 +7041,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7026,13 +7060,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7030: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7064: 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 7036 "configure"
+#line 7070 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7043,7 +7077,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7062,13 +7096,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7066: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7100: 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 7072 "configure"
+#line 7106 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7079,7 +7113,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7098,13 +7132,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7102: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7136: 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 7108 "configure"
+#line 7142 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7115,7 +7149,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7134,13 +7168,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7138: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7172: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7144 "configure"
+#line 7178 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7151,7 +7185,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7170,13 +7204,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7174: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7208: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7180 "configure"
+#line 7214 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7187,7 +7221,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7206,13 +7240,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7210: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7244: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $ZLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7216 "configure"
+#line 7250 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7223,7 +7257,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7242,13 +7276,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7246: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7280: checking for TIFFOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $ZLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7252 "configure"
+#line 7286 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7259,7 +7293,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7357,7 +7391,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:7361: checking whether to use PNG" >&5
+echo "configure:7395: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -7376,7 +7410,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:7380: checking for location of PNG includes" >&5
+echo "configure:7414: 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; }
@@ -7402,15 +7436,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7406: checking for $ac_hdr" >&5
+echo "configure:7440: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7409 "configure"
+#line 7443 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7448: \"$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*
@@ -7444,7 +7478,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:7448: checking for location of PNG library" >&5
+echo "configure:7482: 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; }
@@ -7469,13 +7503,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7473: checking for png_read_image in -lpng" >&5
+echo "configure:7507: 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 7479 "configure"
+#line 7513 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7486,7 +7520,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7528,7 +7562,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:7532: checking whether to use PostgreSQL" >&5
+echo "configure:7566: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -7555,7 +7589,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:7559: checking for location of PostgreSQL includes" >&5
+echo "configure:7593: 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; }
@@ -7581,15 +7615,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7585: checking for $ac_hdr" >&5
+echo "configure:7619: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7588 "configure"
+#line 7622 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7627: \"$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*
@@ -7627,7 +7661,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:7631: checking for location of PostgreSQL library" >&5
+echo "configure:7665: 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; }
@@ -7656,13 +7690,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7660: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7694: 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 7666 "configure"
+#line 7700 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7673,7 +7707,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7692,13 +7726,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7696: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7730: 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 7702 "configure"
+#line 7736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7709,7 +7743,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7728,13 +7762,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7732: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7766: 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 7738 "configure"
+#line 7772 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7745,7 +7779,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7764,13 +7798,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7768: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7802: 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 7774 "configure"
+#line 7808 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7781,7 +7815,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7838,13 +7872,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:7842: checking for PQcmdTuples in -lpq" >&5
+echo "configure:7876: 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 7848 "configure"
+#line 7882 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7855,7 +7889,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:7859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7893: \"$ac_link\") 1>&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 +7911,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:7881: checking for PQcmdTuples in -lpq" >&5
+echo "configure:7915: 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 7887 "configure"
+#line 7921 "configure"
#include "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 +7928,7 @@
PQcmdTuples()
; 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:7932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7937,7 +7971,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:7941: checking whether to use MySQL" >&5
+echo "configure:7975: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -7957,7 +7991,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:7961: checking for location of MySQL includes" >&5
+echo "configure:7995: 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; }
@@ -7983,15 +8017,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7987: checking for $ac_hdr" >&5
+echo "configure:8021: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7990 "configure"
+#line 8024 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8029: \"$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*
@@ -8028,7 +8062,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:8032: checking for location of MySQL library" >&5
+echo "configure:8066: 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; }
@@ -8059,13 +8093,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8063: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8097: 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 8069 "configure"
+#line 8103 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8076,7 +8110,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8095,13 +8129,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8099: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8133: 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 8105 "configure"
+#line 8139 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8112,7 +8146,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8131,13 +8165,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8135: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8169: 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 8141 "configure"
+#line 8175 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8148,7 +8182,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8167,13 +8201,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8171: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8205: 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 8177 "configure"
+#line 8211 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8184,7 +8218,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8203,13 +8237,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8207: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8241: 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 8213 "configure"
+#line 8247 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8220,7 +8254,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8239,13 +8273,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8243: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8277: 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 8249 "configure"
+#line 8283 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8256,7 +8290,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8275,13 +8309,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8279: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8313: 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 8285 "configure"
+#line 8319 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8292,7 +8326,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8311,13 +8345,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8315: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8349: 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 8321 "configure"
+#line 8355 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8328,7 +8362,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8418,7 +8452,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:8422: checking for $ac_word" >&5
+echo "configure:8456: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -8467,10 +8501,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:8471: checking for mysql_server_init" >&5
+echo "configure:8505: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 8474 "configure"
+#line 8508 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -8496,7 +8530,7 @@
; return 0; }
EOF
-if { (eval echo configure:8500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8534: \"$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
@@ -8548,7 +8582,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:8552: checking whether to use SQLite" >&5
+echo "configure:8586: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -8568,7 +8602,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:8572: checking for location of SQLite includes" >&5
+echo "configure:8606: 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; }
@@ -8594,15 +8628,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8598: checking for $ac_hdr" >&5
+echo "configure:8632: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8601 "configure"
+#line 8635 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8640: \"$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*
@@ -8645,7 +8679,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:8649: checking for location of SQLite library" >&5
+echo "configure:8683: 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; }
@@ -8674,13 +8708,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8678: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8712: 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 8684 "configure"
+#line 8718 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8691,7 +8725,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8710,13 +8744,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8714: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8748: 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 8720 "configure"
+#line 8754 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8727,7 +8761,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8746,13 +8780,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8750: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8784: 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 8756 "configure"
+#line 8790 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8763,7 +8797,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8782,13 +8816,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8786: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8820: 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 8792 "configure"
+#line 8826 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8799,7 +8833,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8868,7 +8902,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:8872: checking whether to use FFMPEG" >&5
+echo "configure:8906: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -8888,7 +8922,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:8892: checking for location of FFMPEG includes" >&5
+echo "configure:8926: checking for location of FFMPEG includes" >&5
case "$with_ffmpeg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-ffmpeg-includes." 1>&2; exit 1; }
@@ -8914,15 +8948,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8918: checking for $ac_hdr" >&5
+echo "configure:8952: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8921 "configure"
+#line 8955 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8960: \"$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*
@@ -8958,15 +8992,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8962: checking for $ac_hdr" >&5
+echo "configure:8996: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8965 "configure"
+#line 8999 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9004: \"$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*
@@ -9002,15 +9036,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9006: checking for $ac_hdr" >&5
+echo "configure:9040: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9009 "configure"
+#line 9043 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9048: \"$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*
@@ -9053,7 +9087,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:9057: checking for location of FFMPEG library" >&5
+echo "configure:9091: checking for location of FFMPEG library" >&5
case "$with_ffmpeg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-ffmpeg-libs." 1>&2; exit 1; }
@@ -9080,13 +9114,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:9084: checking for av_free in -lavutil" >&5
+echo "configure:9118: checking for av_free in -lavutil" >&5
ac_lib_var=`echo avutil'_'av_free | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9090 "configure"
+#line 9124 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9097,7 +9131,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:9101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9116,13 +9150,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:9120: checking for av_free in -lavutil" >&5
+echo "configure:9154: checking for av_free in -lavutil" >&5
ac_lib_var=`echo avutil'_'av_free | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavutil $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9126 "configure"
+#line 9160 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9133,7 +9167,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:9137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9178,13 +9212,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:9182: checking for avcodec_init in -lavcodec" >&5
+echo "configure:9216: checking for avcodec_init in -lavcodec" >&5
ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavcodec $FFMPEGLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9188 "configure"
+#line 9222 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9195,7 +9229,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:9199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9214,13 +9248,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:9218: checking for avcodec_init in -lavcodec" >&5
+echo "configure:9252: checking for avcodec_init in -lavcodec" >&5
ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavcodec $FFMPEGLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9224 "configure"
+#line 9258 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9231,7 +9265,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:9235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9276,13 +9310,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:9280: checking for av_set_parameters in -lavformat" >&5
+echo "configure:9314: checking for av_set_parameters in -lavformat" >&5
ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavformat $FFMPEGLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9286 "configure"
+#line 9320 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9293,7 +9327,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9312,13 +9346,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:9316: checking for av_set_parameters in -lavformat" >&5
+echo "configure:9350: checking for av_set_parameters in -lavformat" >&5
ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9322 "configure"
+#line 9356 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9329,7 +9363,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:9333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9388,7 +9422,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:9392: checking whether to use OpenGL" >&5
+echo "configure:9426: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -9422,7 +9456,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:9426: checking for location of OpenGL includes" >&5
+echo "configure:9460: 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; }
@@ -9448,15 +9482,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9452: checking for $ac_hdr" >&5
+echo "configure:9486: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9455 "configure"
+#line 9489 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9494: \"$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*
@@ -9490,7 +9524,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:9494: checking for location of OpenGL library" >&5
+echo "configure:9528: 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; }
@@ -9519,13 +9553,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9523: checking for glBegin in -lGL" >&5
+echo "configure:9557: 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 9529 "configure"
+#line 9563 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9536,7 +9570,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9555,13 +9589,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9559: checking for glBegin in -lGL" >&5
+echo "configure:9593: 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 9565 "configure"
+#line 9599 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9572,7 +9606,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9591,13 +9625,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9595: checking for glBegin in -lGL" >&5
+echo "configure:9629: 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 9601 "configure"
+#line 9635 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9608,7 +9642,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9627,13 +9661,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9631: checking for glBegin in -lGL" >&5
+echo "configure:9665: 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 9637 "configure"
+#line 9671 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9644,7 +9678,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9706,13 +9740,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9710: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9744: 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 9716 "configure"
+#line 9750 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9723,7 +9757,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9742,13 +9776,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9746: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9780: 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 9752 "configure"
+#line 9786 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9759,7 +9793,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:9763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9806,10 +9840,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:9810: checking for glXCreatePbuffer" >&5
+echo "configure:9844: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 9813 "configure"
+#line 9847 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -9832,7 +9866,7 @@
; return 0; }
EOF
-if { (eval echo configure:9836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9870: \"$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
@@ -9869,10 +9903,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:9873: checking for glXCreateGLXPixmap" >&5
+echo "configure:9907: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 9876 "configure"
+#line 9910 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -9895,7 +9929,7 @@
; return 0; }
EOF
-if { (eval echo configure:9899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9933: \"$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
@@ -9938,7 +9972,7 @@
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:9942: checking for location of OpenGL framework" >&5
+echo "configure:9976: 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; }
@@ -9962,15 +9996,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9966: checking for $ac_hdr" >&5
+echo "configure:10000: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9969 "configure"
+#line 10003 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10008: \"$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*
@@ -10006,10 +10040,10 @@
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:10010: checking for glBegin" >&5
+echo "configure:10044: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 10013 "configure"
+#line 10047 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -10032,7 +10066,7 @@
; return 0; }
EOF
-if { (eval echo configure:10036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10070: \"$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
@@ -10069,10 +10103,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:10073: checking for gluBeginCurve" >&5
+echo "configure:10107: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 10076 "configure"
+#line 10110 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -10095,7 +10129,7 @@
; return 0; }
EOF
-if { (eval echo configure:10099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10133: \"$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
@@ -10143,7 +10177,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10147: checking for location of OpenGL includes" >&5
+echo "configure:10181: 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; }
@@ -10169,15 +10203,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10173: checking for $ac_hdr" >&5
+echo "configure:10207: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10176 "configure"
+#line 10210 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10215: \"$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*
@@ -10211,7 +10245,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10215: checking for location of OpenGL library" >&5
+echo "configure:10249: 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; }
@@ -10236,18 +10270,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:10240: checking for OpenGL library" >&5
+echo "configure:10274: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 10244 "configure"
+#line 10278 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10271,18 +10305,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:10275: checking for GLU library" >&5
+echo "configure:10309: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 10279 "configure"
+#line 10313 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10331,7 +10365,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:10335: checking whether to use Tcl/Tk" >&5
+echo "configure:10369: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -10351,7 +10385,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:10355: checking for location of Tcl/Tk includes" >&5
+echo "configure:10389: checking for location of Tcl/Tk includes" >&5
case "$with_tcltk_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tcltk-includes." 1>&2; exit 1; }
@@ -10377,15 +10411,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10381: checking for $ac_hdr" >&5
+echo "configure:10415: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10384 "configure"
+#line 10418 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10423: \"$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*
@@ -10422,15 +10456,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10426: checking for $ac_hdr" >&5
+echo "configure:10460: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10429 "configure"
+#line 10463 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10468: \"$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*
@@ -10464,7 +10498,7 @@
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:10468: checking Tcl version" >&5
+echo "configure:10502: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -10472,7 +10506,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10476 "configure"
+#line 10510 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10484,7 +10518,7 @@
}
EOF
-if { (eval echo configure:10488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
tcl_ver=`cat conftestdata`
echo "$ac_t""$tcl_ver" 1>&6
@@ -10502,7 +10536,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:10506: checking Tk version" >&5
+echo "configure:10540: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -10510,7 +10544,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10514 "configure"
+#line 10548 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10522,7 +10556,7 @@
}
EOF
-if { (eval echo configure:10526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
tk_ver=`cat conftestdata`
echo "$ac_t""$tk_ver" 1>&6
@@ -10551,7 +10585,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:10555: checking for location of Tcl/Tk library" >&5
+echo "configure:10589: checking for location of Tcl/Tk library" >&5
case "$with_tcltk_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-tcltk-libs." 1>&2; exit 1; }
@@ -10591,13 +10625,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:10595: checking for Tcl_Init in -ltcl" >&5
+echo "configure:10629: checking for Tcl_Init in -ltcl" >&5
ac_lib_var=`echo tcl'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10601 "configure"
+#line 10635 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10608,7 +10642,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10627,13 +10661,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:10631: checking for Tcl_Init in -ltcl" >&5
+echo "configure:10665: checking for Tcl_Init in -ltcl" >&5
ac_lib_var=`echo tcl'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10637 "configure"
+#line 10671 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10644,7 +10678,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10671,13 +10705,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10675: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:10709: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
ac_lib_var=`echo tcl$tcltk_ver'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10681 "configure"
+#line 10715 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10688,7 +10722,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10707,13 +10741,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10711: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:10745: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
ac_lib_var=`echo tcl$tcltk_ver'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10717 "configure"
+#line 10751 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10724,7 +10758,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10751,13 +10785,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:10755: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:10789: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
ac_lib_var=`echo tcl$tcltk_ver2'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver2 $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10761 "configure"
+#line 10795 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10768,7 +10802,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10787,13 +10821,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:10791: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:10825: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
ac_lib_var=`echo tcl$tcltk_ver2'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltcl$tcltk_ver2 $MATHLIB $DLLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10797 "configure"
+#line 10831 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10804,7 +10838,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10882,13 +10916,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:10886: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:10920: checking for Tk_MainWindow in -ltk" >&5
ac_lib_var=`echo tk'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk $TCLLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10892 "configure"
+#line 10926 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10899,7 +10933,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10918,13 +10952,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:10922: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:10956: checking for Tk_MainWindow in -ltk" >&5
ac_lib_var=`echo tk'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10928 "configure"
+#line 10962 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10935,7 +10969,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10962,13 +10996,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10966: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:11000: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
ac_lib_var=`echo tk$tcltk_ver'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver $TCLLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10972 "configure"
+#line 11006 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10979,7 +11013,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10998,13 +11032,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:11002: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:11036: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
ac_lib_var=`echo tk$tcltk_ver'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11008 "configure"
+#line 11042 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11015,7 +11049,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:11019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11042,13 +11076,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:11046: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:11080: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
ac_lib_var=`echo tk$tcltk_ver2'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver2 $TCLLIB $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11052 "configure"
+#line 11086 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11059,7 +11093,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:11063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11078,13 +11112,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:11082: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:11116: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
ac_lib_var=`echo tk$tcltk_ver2'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-ltk$tcltk_ver2 $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11088 "configure"
+#line 11122 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11095,7 +11129,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:11099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11185,13 +11219,13 @@
do
# add only if in MACOSX_ARCHS
echo $ac_n "checking for Tcl_Init in -l$tlib""... $ac_c" 1>&6
-echo "configure:11189: checking for Tcl_Init in -l$tlib" >&5
+echo "configure:11223: checking for Tcl_Init in -l$tlib" >&5
ac_lib_var=`echo $tlib'_'Tcl_Init | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-l$tlib -arch $a $MACOSX_SDK $TCLTKLIBPATH $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11195 "configure"
+#line 11229 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11202,7 +11236,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:11206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11252,7 +11286,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11256: checking whether to use ODBC" >&5
+echo "configure:11290: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -11271,7 +11305,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11275: checking for location of ODBC includes" >&5
+echo "configure:11309: 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; }
@@ -11297,15 +11331,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11301: checking for $ac_hdr" >&5
+echo "configure:11335: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11304 "configure"
+#line 11338 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11343: \"$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*
@@ -11339,7 +11373,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:11343: checking for location of ODBC library" >&5
+echo "configure:11377: 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; }
@@ -11364,13 +11398,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:11368: checking for SQLConnect in -lodbc" >&5
+echo "configure:11402: 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 11374 "configure"
+#line 11408 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11381,7 +11415,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11406,13 +11440,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:11410: checking for SQLConnect in -liodbc" >&5
+echo "configure:11444: 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 11416 "configure"
+#line 11450 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11423,7 +11457,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11448,11 +11482,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:11452: checking for ODBC library" >&5
+echo "configure:11486: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 11456 "configure"
+#line 11490 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -11460,7 +11494,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:11464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11509,7 +11543,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:11513: checking whether to use FFTW" >&5
+echo "configure:11547: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -11528,7 +11562,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:11532: checking for location of FFTW includes" >&5
+echo "configure:11566: 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; }
@@ -11554,15 +11588,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11558: checking for $ac_hdr" >&5
+echo "configure:11592: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11561 "configure"
+#line 11595 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11600: \"$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*
@@ -11590,15 +11624,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11594: checking for $ac_hdr" >&5
+echo "configure:11628: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11597 "configure"
+#line 11631 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11636: \"$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*
@@ -11626,15 +11660,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11630: checking for $ac_hdr" >&5
+echo "configure:11664: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11633 "configure"
+#line 11667 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11672: \"$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*
@@ -11680,7 +11714,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:11684: checking for location of FFTW library" >&5
+echo "configure:11718: 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; }
@@ -11705,13 +11739,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:11709: checking for fftw_execute in -lfftw3" >&5
+echo "configure:11743: 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 11715 "configure"
+#line 11749 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11722,7 +11756,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:11726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11747,13 +11781,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:11751: checking for fftwnd_one in -lfftw" >&5
+echo "configure:11785: 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 11757 "configure"
+#line 11791 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11764,7 +11798,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:11768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11789,13 +11823,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:11793: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:11827: 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 11799 "configure"
+#line 11833 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11806,7 +11840,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11863,7 +11897,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:11867: checking whether to use BLAS" >&5
+echo "configure:11901: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -11884,7 +11918,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:11888: checking for location of BLAS includes" >&5
+echo "configure:11922: 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; }
@@ -11904,7 +11938,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:11908: checking for location of BLAS library" >&5
+echo "configure:11942: 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; }
@@ -11930,15 +11964,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11934: checking for $ac_hdr" >&5
+echo "configure:11968: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11937 "configure"
+#line 11971 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11976: \"$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*
@@ -11973,13 +12007,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:11977: checking for dnrm2_ in -lblas" >&5
+echo "configure:12011: 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 11983 "configure"
+#line 12017 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11990,7 +12024,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:11994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12009,13 +12043,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12013: checking for dnrm2_ in -lblas" >&5
+echo "configure:12047: 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 12019 "configure"
+#line 12053 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12026,7 +12060,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12070,13 +12104,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:12074: checking for ATL_xerbla in -latlas" >&5
+echo "configure:12108: 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 12080 "configure"
+#line 12114 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12087,7 +12121,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:12091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12102,13 +12136,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:12106: checking for sgemm_ in -lf77blas" >&5
+echo "configure:12140: 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 12112 "configure"
+#line 12146 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12119,7 +12153,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12134,13 +12168,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:12138: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12172: 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 12144 "configure"
+#line 12178 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12151,7 +12185,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:12155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12197,16 +12231,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12201: checking for sgemm in $vlib_flags" >&5
+echo "configure:12235: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 12203 "configure"
+#line 12237 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:12210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12244: \"$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
@@ -12224,13 +12258,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:12228: checking for sgemm_ in -lblas" >&5
+echo "configure:12262: 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 12234 "configure"
+#line 12268 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12241,7 +12275,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12256,13 +12290,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:12260: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12294: 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 12266 "configure"
+#line 12300 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12273,7 +12307,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:12277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12288,13 +12322,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:12292: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12326: 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 12298 "configure"
+#line 12332 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12305,7 +12339,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12339,13 +12373,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:12343: checking for acosp in -lsunmath" >&5
+echo "configure:12377: 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 12349 "configure"
+#line 12383 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12356,7 +12390,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:12360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12371,13 +12405,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:12375: checking for sgemm_ in -lsunperf" >&5
+echo "configure:12409: 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 12381 "configure"
+#line 12415 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12388,7 +12422,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12418,13 +12452,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:12422: checking for sgemm_ in -lblas" >&5
+echo "configure:12456: 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 12428 "configure"
+#line 12462 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12435,7 +12469,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12474,7 +12508,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:12478: checking whether to use LAPACK" >&5
+echo "configure:12512: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -12499,7 +12533,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:12503: checking for location of LAPACK includes" >&5
+echo "configure:12537: 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; }
@@ -12519,7 +12553,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:12523: checking for location of LAPACK library" >&5
+echo "configure:12557: 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; }
@@ -12545,15 +12579,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12549: checking for $ac_hdr" >&5
+echo "configure:12583: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12552 "configure"
+#line 12586 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12591: \"$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*
@@ -12585,10 +12619,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:12589: checking for dsegv_" >&5
+echo "configure:12623: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 12592 "configure"
+#line 12626 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -12611,7 +12645,7 @@
; return 0; }
EOF
-if { (eval echo configure:12615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12649: \"$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
@@ -12638,13 +12672,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:12642: checking for desgv_ in -llapack" >&5
+echo "configure:12676: 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 12648 "configure"
+#line 12682 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12655,7 +12689,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:12659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12687,13 +12721,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12691: checking for dgesv_ in -llapack" >&5
+echo "configure:12725: 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 12697 "configure"
+#line 12731 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12704,7 +12738,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12723,13 +12757,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12727: checking for dgesv_ in -llapack" >&5
+echo "configure:12761: 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 12733 "configure"
+#line 12767 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12740,7 +12774,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12796,7 +12830,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:12800: checking whether to use Cairo" >&5
+echo "configure:12834: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -12828,7 +12862,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:12832: checking for location of cairo includes" >&5
+echo "configure:12866: 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; }
@@ -12854,15 +12888,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12858: checking for $ac_hdr" >&5
+echo "configure:12892: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12861 "configure"
+#line 12895 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12900: \"$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*
@@ -12898,7 +12932,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:12902: checking for location of cairo library" >&5
+echo "configure:12936: 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; }
@@ -12918,7 +12952,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:12922: checking for cairo linking flags" >&5
+echo "configure:12956: 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; }
@@ -12934,10 +12968,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:12938: checking for cairo_create" >&5
+echo "configure:12972: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 12941 "configure"
+#line 12975 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -12960,7 +12994,7 @@
; return 0; }
EOF
-if { (eval echo configure:12964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12998: \"$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
@@ -12994,10 +13028,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:12998: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:13032: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 13001 "configure"
+#line 13035 "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. */
@@ -13020,7 +13054,7 @@
; return 0; }
EOF
-if { (eval echo configure:13024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13058: \"$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
@@ -13053,10 +13087,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_get_xrender_format""... $ac_c" 1>&6
-echo "configure:13057: checking for cairo_xlib_surface_get_xrender_format" >&5
+echo "configure:13091: checking for cairo_xlib_surface_get_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 13060 "configure"
+#line 13094 "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. */
@@ -13079,7 +13113,7 @@
; return 0; }
EOF
-if { (eval echo configure:13083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13117: \"$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
@@ -13121,7 +13155,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:13125: checking whether to use FreeType" >&5
+echo "configure:13159: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -13140,7 +13174,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:13144: checking for location of FreeType includes" >&5
+echo "configure:13178: 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; }
@@ -13166,15 +13200,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13170: checking for $ac_hdr" >&5
+echo "configure:13204: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13173 "configure"
+#line 13207 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13212: \"$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*
@@ -13208,7 +13242,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:13212: checking for location of FreeType library" >&5
+echo "configure:13246: 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; }
@@ -13233,13 +13267,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:13237: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:13271: 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 13243 "configure"
+#line 13277 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13250,7 +13284,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:13254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13291,7 +13325,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:13295: checking whether to use NLS" >&5
+echo "configure:13329: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -13311,10 +13345,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:13315: checking for gettext" >&5
+echo "configure:13349: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 13318 "configure"
+#line 13352 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -13337,7 +13371,7 @@
; return 0; }
EOF
-if { (eval echo configure:13341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13375: \"$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
@@ -13355,13 +13389,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:13359: checking for gettext in -lintl" >&5
+echo "configure:13393: 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 13365 "configure"
+#line 13399 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13372,7 +13406,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:13376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13407,7 +13441,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:13411: checking whether to use C++" >&5
+echo "configure:13445: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -13423,7 +13457,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:13427: checking for $ac_word" >&5
+echo "configure:13461: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -13452,7 +13486,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:13456: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:13490: 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.
@@ -13463,12 +13497,12 @@
cat > conftest.$ac_ext << EOF
-#line 13467 "configure"
+#line 13501 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:13472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13506: \"$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
@@ -13494,19 +13528,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:13498: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:13532: 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:13503: checking whether we are using GNU C++" >&5
+echo "configure:13537: 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:13510: \"$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:13544: \"$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
@@ -13524,7 +13558,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:13528: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:13562: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -13565,7 +13599,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:13569: checking whether to use openDWG" >&5
+echo "configure:13603: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -13585,7 +13619,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:13589: checking for location of openDGW includes" >&5
+echo "configure:13623: 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; }
@@ -13611,15 +13645,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13615: checking for $ac_hdr" >&5
+echo "configure:13649: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13618 "configure"
+#line 13652 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13657: \"$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*
@@ -13653,7 +13687,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:13657: checking for location of openDWG library" >&5
+echo "configure:13691: 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; }
@@ -13694,7 +13728,7 @@
echo $ac_n "checking whether to use POSIX threads""... $ac_c" 1>&6
-echo "configure:13698: checking whether to use POSIX threads" >&5
+echo "configure:13732: checking whether to use POSIX threads" >&5
echo "$ac_t"""$with_pthread"" 1>&6
case "$with_pthread" in
"no") USE_PTHREAD= ;;
@@ -13714,7 +13748,7 @@
echo $ac_n "checking for location of POSIX threads includes""... $ac_c" 1>&6
-echo "configure:13718: checking for location of POSIX threads includes" >&5
+echo "configure:13752: 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; }
@@ -13740,15 +13774,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13744: checking for $ac_hdr" >&5
+echo "configure:13778: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13747 "configure"
+#line 13781 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13786: \"$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*
@@ -13782,7 +13816,7 @@
echo $ac_n "checking for location of POSIX threads library""... $ac_c" 1>&6
-echo "configure:13786: checking for location of POSIX threads library" >&5
+echo "configure:13820: 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; }
@@ -13807,10 +13841,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:13811: checking for pthread_create" >&5
+echo "configure:13845: checking for pthread_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 13814 "configure"
+#line 13848 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_create(); below. */
@@ -13833,7 +13867,7 @@
; return 0; }
EOF
-if { (eval echo configure:13837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13871: \"$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
@@ -13860,13 +13894,13 @@
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:13864: checking for pthread_create in -lpthread" >&5
+echo "configure:13898: 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 13870 "configure"
+#line 13904 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13877,7 +13911,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:13881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13923,6 +13957,267 @@
# Done checking pthread
+# Enable OpenMP option
+
+
+echo $ac_n "checking whether to use OpenMP""... $ac_c" 1>&6
+echo "configure:13965: checking whether to use OpenMP" >&5
+echo "$ac_t"""$with_openmp"" 1>&6
+case "$with_openmp" in
+ "no") USE_OPENMP= ;;
+ "yes") USE_OPENMP="1" ;;
+ *) { echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; } ;;
+esac
+
+
+
+OMPINCPATH=
+OMPLIBPATH=
+OMPLIB=
+OMPCFLAGS=
+
+if test -n "$USE_OPENMP"; then
+
+# With OpenMP includes directory
+
+
+echo $ac_n "checking for location of OpenMP includes""... $ac_c" 1>&6
+echo "configure:13986: 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; }
+ ;;
+esac
+echo "$ac_t""$with_openmp_includes" 1>&6
+
+if test -n "$with_openmp_includes" ; then
+ for dir in $with_openmp_includes; do
+ if test -d "$dir"; then
+ OMPINCPATH="$OMPINCPATH -I$dir"
+ else
+ { echo "configure: error: *** OpenMP includes directory $dir does not exist." 1>&2; exit 1; }
+ fi
+ done
+fi
+
+
+
+ac_save_cppflags="$CPPFLAGS"
+CPPFLAGS="$OMPINCPATH $CPPFLAGS"
+for ac_hdr in omp.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:14012: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14015 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:14020: \"$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 OpenMP includes." 1>&2; exit 1; }
+
+fi
+done
+
+CPPFLAGS=$ac_save_cppflags
+
+
+# With OpenMP library directory
+# GCC et al.: -lgomp
+# Solaris cc: -lmtsk
+# AIX xlc: -lxlsmp
+# SGI IRIX 6.5 MIPSpro C/C++: -lmp
+
+
+echo $ac_n "checking for location of OpenMP library""... $ac_c" 1>&6
+echo "configure:14058: checking for location of OpenMP library" >&5
+case "$with_gomp_libs" in
+y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-gomp-libs." 1>&2; exit 1; }
+ ;;
+esac
+echo "$ac_t""$with_gomp_libs" 1>&6
+
+if test -n "$with_gomp_libs"; then
+ for dir in $with_gomp_libs; do
+ if test -d "$dir"; then
+ OMPLIBPATH="$OMPLIBPATH -L$dir"
+ else
+ { echo "configure: error: *** OpenMP library directory $dir does not exist." 1>&2; exit 1; }
+ fi
+ done
+fi
+
+
+
+ac_save_libs="$LIBS"
+ac_save_ldflags="$LDFLAGS"
+LIBS=" $LIBS"
+LDFLAGS=" $LDFLAGS"
+echo $ac_n "checking for GOMP_parallel_start""... $ac_c" 1>&6
+echo "configure:14083: checking for GOMP_parallel_start" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14086 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char GOMP_parallel_start(); below. */
+#include <assert.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 GOMP_parallel_start();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_GOMP_parallel_start) || defined (__stub___GOMP_parallel_start)
+choke me
+#else
+GOMP_parallel_start();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:14109: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_GOMP_parallel_start=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'GOMP_parallel_start`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+
+ OMPLIB="$OMPLIB "
+
+
+else
+ echo "$ac_t""no" 1>&6
+
+
+ac_save_ldflags="$LDFLAGS"
+LDFLAGS="$OMPLIBPATH $LDFLAGS"
+
+
+echo $ac_n "checking for GOMP_parallel_start in -lgomp""... $ac_c" 1>&6
+echo "configure:14136: 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 14142 "configure"
+#include "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 GOMP_parallel_start();
+
+int main() {
+GOMP_parallel_start()
+; return 0; }
+EOF
+if { (eval echo configure:14153: \"$ac_link\") 1>&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
+ OMPLIB="$OMPLIB -lgomp "
+else
+ echo "$ac_t""no" 1>&6
+
+LDFLAGS=${ac_save_ldflags}
+
+ { echo "configure: error: *** Unable to locate OpenMP library." 1>&2; exit 1; }
+
+
+fi
+
+
+
+LDFLAGS=${ac_save_ldflags}
+
+
+
+fi
+
+LIBS=${ac_save_libs}
+LDFLAGS=${ac_save_ldflags}
+
+
+# compiler dependent
+#if test ${CC} = "gcc" ; then
+if test x$GCC = xyes ; then
+ # GNU C compiler (>= 4.2.1)
+ OMPCFLAGS=-fopenmp
+elif test ${CC} = "icc" ; then
+ # Intel compiler
+ OMPCFLAGS=-openmp
+elif test ${CC} = "opencc" ; then
+ # AMD's x86 Open64 compiler
+ OMPCFLAGS=-mp
+elif test ${CC} = "pgcc" ; then
+ # Portland Group's compiler
+ OMPCFLAGS=-mp
+# ... anybody else?
+fi
+
+# try to build a test program with "$CC $OMPCLFAGS" to confirm it works
+#...how?
+#echo "int main() {return 0;}" > test.c
+#$CC $OMPCLFAGS test.c -o test
+
+fi # $USE_OPENMP
+
+
+
+
+
+
+
+# Done checking OpenMP
+
# Enable LFS (from cdr-tools)
# Check whether --enable-largefile or --disable-largefile was given.
if test "${enable_largefile+set}" = set; then
@@ -13933,7 +14228,7 @@
if test "$enable_largefile" = yes; then
echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:13937: checking for special C compiler options needed for large files" >&5
+echo "configure:14232: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -13941,7 +14236,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 13945 "configure"
+#line 14240 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13957,7 +14252,7 @@
; return 0; }
EOF
-if { (eval echo configure:13961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -13966,7 +14261,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 13970 "configure"
+#line 14265 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13982,7 +14277,7 @@
; return 0; }
EOF
-if { (eval echo configure:13986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -14002,11 +14297,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:14006: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:14301: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 14010 "configure"
+#line 14305 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14022,14 +14317,14 @@
; return 0; }
EOF
-if { (eval echo configure:14026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14321: \"$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 14033 "configure"
+#line 14328 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -14047,7 +14342,7 @@
; return 0; }
EOF
-if { (eval echo configure:14051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -14066,11 +14361,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:14070: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:14365: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 14074 "configure"
+#line 14369 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14086,14 +14381,14 @@
; return 0; }
EOF
-if { (eval echo configure:14090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14385: \"$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 14097 "configure"
+#line 14392 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -14111,7 +14406,7 @@
; return 0; }
EOF
-if { (eval echo configure:14115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -14130,25 +14425,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:14134: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14429: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 14138 "configure"
+#line 14433 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14440: \"$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 14152 "configure"
+#line 14447 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -14157,7 +14452,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14178,25 +14473,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:14182: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14477: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 14186 "configure"
+#line 14481 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14488: \"$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 14200 "configure"
+#line 14495 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -14205,7 +14500,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14228,18 +14523,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:14232: checking for fseeko" >&5
+echo "configure:14527: checking for fseeko" >&5
ac_cv_func_fseeko=no
cat > conftest.$ac_ext <<EOF
-#line 14236 "configure"
+#line 14531 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return fseeko && fseeko (stdin, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:14243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_fseeko=yes
else
@@ -14256,10 +14551,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:14260: checking if system supports Large Files at all" >&5
+echo "configure:14555: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 14263 "configure"
+#line 14558 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -14291,7 +14586,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:14295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -14320,7 +14615,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:14324: checking whether to use wxWidgets" >&5
+echo "configure:14619: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -14341,7 +14636,7 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14345: checking for $ac_word" >&5
+echo "configure:14640: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -14389,7 +14684,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:14393: checking wxWidgets version" >&5
+echo "configure:14688: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -14412,15 +14707,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14416: checking for $ac_hdr" >&5
+echo "configure:14711: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14419 "configure"
+#line 14714 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14719: \"$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*
@@ -14753,6 +15048,11 @@
s%@PTHREADLIBPATH@%$PTHREADLIBPATH%g
s%@PTHREADLIB@%$PTHREADLIB%g
s%@USE_PTHREAD@%$USE_PTHREAD%g
+s%@OMPINCPATH@%$OMPINCPATH%g
+s%@OMPLIBPATH@%$OMPLIBPATH%g
+s%@OMPLIB@%$OMPLIB%g
+s%@OMPCFLAGS@%$OMPCFLAGS%g
+s%@USE_OPENMP@%$USE_OPENMP%g
s%@USE_LARGEFILES@%$USE_LARGEFILES%g
s%@WX_CONFIG@%$WX_CONFIG%g
s%@WXVERSION@%$WXVERSION%g
@@ -15086,6 +15386,8 @@
echo " OpenGL support: `if test -n "${USE_OPENGL}" ; then echo yes ; else echo no ; fi`"
+echo " OpenMP support: `if test -n "${USE_OPENMP}" ; then echo yes ; else echo no ; fi`"
+
echo " PNG support: `if test -n "${USE_PNG}" ; then echo yes ; else echo no ; fi`"
echo " PostgreSQL support: `if test -n "${USE_POSTGRES}" ; then echo yes ; else echo no ; fi`"
Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/configure.in 2011-12-12 01:37:38 UTC (rev 49652)
@@ -261,6 +261,7 @@
LOC_ARG_WITH(opendwg, openDWG, no)
LOC_ARG_WITH(regex, regex)
LOC_ARG_WITH(pthread, POSIX threads, no)
+LOC_ARG_WITH(openmp, OpenMP, no)
AC_ARG_WITH(gdal,
[ --with-gdal[=path/gdal-config]
@@ -359,6 +360,9 @@
LOC_ARG_WITH_INC(pthread, POSIX threads)
LOC_ARG_WITH_LIB(pthread, POSIX threads)
+LOC_ARG_WITH_INC(openmp, OpenMP)
+LOC_ARG_WITH_LIB(openmp, OpenMP)
+
# Put this early on so CPPFLAGS and LDFLAGS have any additional dirs
# With includes option
@@ -1780,6 +1784,67 @@
# Done checking pthread
+# Enable OpenMP option
+
+LOC_CHECK_USE(openmp,OpenMP,USE_OPENMP)
+
+OMPINCPATH=
+OMPLIBPATH=
+OMPLIB=
+OMPCFLAGS=
+
+if test -n "$USE_OPENMP"; then
+
+# With OpenMP includes directory
+
+LOC_CHECK_INC_PATH(openmp,OpenMP,OMPINCPATH)
+
+LOC_CHECK_INCLUDES(omp.h,OpenMP,$OMPINCPATH)
+
+# With OpenMP library directory
+# GCC et al.: -lgomp
+# Solaris cc: -lmtsk
+# AIX xlc: -lxlsmp
+# SGI IRIX 6.5 MIPSpro C/C++: -lmp
+
+LOC_CHECK_LIB_PATH(gomp,OpenMP,OMPLIBPATH)
+
+LOC_CHECK_FUNC(GOMP_parallel_start,OpenMP functions,OMPLIB,,,,,[
+LOC_CHECK_LIBS(gomp,GOMP_parallel_start,OpenMP,$OMPLIBPATH,OMPLIB,,,)
+])
+
+# compiler dependent
+#if test ${CC} = "gcc" ; then
+if test x$GCC = xyes ; then
+ # GNU C compiler (>= 4.2.1)
+ OMPCFLAGS=-fopenmp
+elif test ${CC} = "icc" ; then
+ # Intel compiler
+ OMPCFLAGS=-openmp
+elif test ${CC} = "opencc" ; then
+ # AMD's x86 Open64 compiler
+ OMPCFLAGS=-mp
+elif test ${CC} = "pgcc" ; then
+ # Portland Group's compiler
+ OMPCFLAGS=-mp
+# ... anybody else?
+fi
+
+# try to build a test program with "$CC $OMPCLFAGS" to confirm it works
+#...how?
+#echo "int main() {return 0;}" > test.c
+#$CC $OMPCLFAGS test.c -o test
+
+fi # $USE_OPENMP
+
+AC_SUBST(OMPINCPATH)
+AC_SUBST(OMPLIBPATH)
+AC_SUBST(OMPLIB)
+AC_SUBST(OMPCFLAGS)
+AC_SUBST(USE_OPENMP)
+
+# Done checking OpenMP
+
# Enable LFS (from cdr-tools)
dnl Check for large file support
dnl Do this last to make sure that no large file definition
@@ -1951,6 +2016,7 @@
LOC_MSG_USE(ODBC support,USE_ODBC)
LOC_MSG_USE(OGR support,USE_OGR)
LOC_MSG_USE(OpenGL support,USE_OPENGL)
+LOC_MSG_USE(OpenMP support,USE_OPENMP)
LOC_MSG_USE(PNG support,USE_PNG)
LOC_MSG_USE(PostgreSQL support,USE_POSTGRES)
LOC_MSG_USE(Readline support,USE_READLINE)
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/include/Make/Grass.make 2011-12-12 01:37:38 UTC (rev 49652)
@@ -197,8 +197,8 @@
FORMDEPS = $(DBMILIB) $(GISLIB)
RASTER3DDEPS = $(RASTERLIB) $(GISLIB) $(XDRLIB)
GISDEPS = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(INTLLIB) $(REGEXLIBPATH) $(REGEXLIB) $(ICONVLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
-GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB)
-GPDEDEPS = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(MATHLIB)
+GMATHDEPS = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB) $(CCMATHLIB) $(OMPLIBPATH) $(OMPLIB)
+GPDEDEPS = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(OMPLIBPATH) $(OMPLIB) $(MATHLIB)
GPROJDEPS = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
HTMLDRIVERDEPS = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
IMAGERYDEPS = $(GISLIB) $(MATHLIB)
Modified: grass/trunk/include/Make/Platform.make.in
===================================================================
--- grass/trunk/include/Make/Platform.make.in 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/include/Make/Platform.make.in 2011-12-12 01:37:38 UTC (rev 49652)
@@ -241,6 +241,13 @@
PTHREADLIB = @PTHREADLIB@
USE_PTHREAD = @USE_PTHREAD@
+#OpenMP
+OMPINCPATH = @OMPINCPATH@
+OMPLIBPATH = @OMPLIBPATH@
+OMPLIB = @OMPLIB@
+OMPCFLAGS = @OMPCFLAGS@
+USE_OPENMP = @USE_OPENMP@
+
#i18N
HAVE_NLS = @HAVE_NLS@
Modified: grass/trunk/lib/gmath/Makefile
===================================================================
--- grass/trunk/lib/gmath/Makefile 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/lib/gmath/Makefile 2011-12-12 01:37:38 UTC (rev 49652)
@@ -1,8 +1,9 @@
MODULE_TOPDIR = ../..
+EXTRA_LIBS = $(OMPLIB)
+EXTRA_CFLAGS = $(FFTWINC) $(OMPCFLAGS)
+# needed? $(OMPLIBPATH)
-EXTRA_CFLAGS = $(FFTWINC)
-
LIB = GMATH
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/gmath/test/Makefile
===================================================================
--- grass/trunk/lib/gmath/test/Makefile 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/lib/gmath/test/Makefile 2011-12-12 01:37:38 UTC (rev 49652)
@@ -2,8 +2,10 @@
PGM=test.gmath.lib
-LIBES = $(GISLIB) $(GMATHLIB)
+LIBES = $(GISLIB) $(GMATHLIB) $(OMPLIB)
DEPENDENCIES = $(GISDEP) $(GMATHDEP)
+EXTRA_CFLAGS = $(OMPCFLAGS)
+
include $(MODULE_TOPDIR)/include/Make/Module.make
default: cmd
Modified: grass/trunk/lib/gpde/Makefile
===================================================================
--- grass/trunk/lib/gpde/Makefile 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/lib/gpde/Makefile 2011-12-12 01:37:38 UTC (rev 49652)
@@ -1,6 +1,8 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB) $(RASTER3DLIB) $(GMATHLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(RASTERLIB) $(RASTER3DLIB) $(GMATHLIB) $(OMPLIB) $(MATHLIB)
+EXTRA_CFLAGS = $(OMPCFLAGS)
+# needed? $(OMPLIBPATH)
LIB_NAME = $(GPDE_LIBNAME)
Modified: grass/trunk/lib/gpde/test/Makefile
===================================================================
--- grass/trunk/lib/gpde/test/Makefile 2011-12-11 20:12:25 UTC (rev 49651)
+++ grass/trunk/lib/gpde/test/Makefile 2011-12-12 01:37:38 UTC (rev 49652)
@@ -2,8 +2,9 @@
PGM=test.gpde.lib
-LIBES = $(GISLIB) $(RASTER3DLIB) $(GPDELIB) $(GMATHLIB)
+LIBES = $(GISLIB) $(RASTER3DLIB) $(GPDELIB) $(OMPLIB) $(GMATHLIB)
DEPENDENCIES = $(GISDEP) $(RASTER3DDEP) $(GPDEDEP)
+EXTRA_CFLAGS = $(OMPCFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
More information about the grass-commit
mailing list