[GRASS-SVN] r33050 - grass/trunk
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Aug 24 15:07:58 EDT 2008
Author: glynn
Date: 2008-08-24 15:07:58 -0400 (Sun, 24 Aug 2008)
New Revision: 33050
Modified:
grass/trunk/configure
grass/trunk/configure.in
Log:
Set language to C++ for libmysqld check
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2008-08-24 16:54:31 UTC (rev 33049)
+++ grass/trunk/configure 2008-08-24 19:07:58 UTC (rev 33050)
@@ -9775,20 +9775,31 @@
fi
if test "$MYSQLD_CONFIG" != "" ; then
+
+ ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
ac_save_libs="$LIBS"
MYSQLDLIB=`"$MYSQLD_CONFIG" --libmysqld-libs`
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:9784: checking for mysql_server_init" >&5
+echo "configure:9792: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 9787 "configure"
+#line 9795 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char mysql_server_init();
@@ -9806,7 +9817,7 @@
; return 0; }
EOF
-if { (eval echo configure:9810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9821: \"$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
@@ -9827,6 +9838,20 @@
fi
LIBS=$ac_save_libs
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
fi
fi # $USE_MYSQL
@@ -9844,7 +9869,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:9848: checking whether to use SQLite" >&5
+echo "configure:9873: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -9864,7 +9889,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:9868: checking for location of SQLite includes" >&5
+echo "configure:9893: 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; }
@@ -9890,15 +9915,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9894: checking for $ac_hdr" >&5
+echo "configure:9919: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9897 "configure"
+#line 9922 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9927: \"$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*
@@ -9941,7 +9966,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:9945: checking for location of SQLite library" >&5
+echo "configure:9970: 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; }
@@ -9968,13 +9993,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:9972: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9997: 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 9978 "configure"
+#line 10003 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9985,7 +10010,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10004,13 +10029,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10008: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10033: 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 10014 "configure"
+#line 10039 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10021,7 +10046,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10074,7 +10099,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10078: checking whether to use FFMPEG" >&5
+echo "configure:10103: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -10094,7 +10119,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10098: checking for location of FFMPEG includes" >&5
+echo "configure:10123: 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; }
@@ -10120,15 +10145,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10124: checking for $ac_hdr" >&5
+echo "configure:10149: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10127 "configure"
+#line 10152 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10157: \"$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*
@@ -10164,15 +10189,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10168: checking for $ac_hdr" >&5
+echo "configure:10193: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10171 "configure"
+#line 10196 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10201: \"$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*
@@ -10208,15 +10233,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10212: checking for $ac_hdr" >&5
+echo "configure:10237: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10215 "configure"
+#line 10240 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10245: \"$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*
@@ -10259,7 +10284,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10263: checking for location of FFMPEG library" >&5
+echo "configure:10288: 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; }
@@ -10286,13 +10311,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10290: checking for av_free in -lavutil" >&5
+echo "configure:10315: 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 10296 "configure"
+#line 10321 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10303,7 +10328,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10322,13 +10347,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10326: checking for av_free in -lavutil" >&5
+echo "configure:10351: 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 10332 "configure"
+#line 10357 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10339,7 +10364,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10384,13 +10409,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10388: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10413: 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 10394 "configure"
+#line 10419 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10401,7 +10426,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10420,13 +10445,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10424: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10449: 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 10430 "configure"
+#line 10455 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10437,7 +10462,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10482,13 +10507,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10486: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10511: 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 10492 "configure"
+#line 10517 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10499,7 +10524,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10518,13 +10543,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10522: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10547: 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 10528 "configure"
+#line 10553 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10535,7 +10560,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10595,7 +10620,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:10599: checking whether to use OpenGL" >&5
+echo "configure:10624: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -10629,7 +10654,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10633: checking for location of OpenGL includes" >&5
+echo "configure:10658: 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; }
@@ -10655,15 +10680,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10659: checking for $ac_hdr" >&5
+echo "configure:10684: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10662 "configure"
+#line 10687 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10692: \"$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*
@@ -10697,7 +10722,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10701: checking for location of OpenGL library" >&5
+echo "configure:10726: 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; }
@@ -10726,13 +10751,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10730: checking for glBegin in -lGL" >&5
+echo "configure:10755: 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 10736 "configure"
+#line 10761 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10743,7 +10768,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10762,13 +10787,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10766: checking for glBegin in -lGL" >&5
+echo "configure:10791: 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 10772 "configure"
+#line 10797 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10779,7 +10804,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10798,13 +10823,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10802: checking for glBegin in -lGL" >&5
+echo "configure:10827: 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 10808 "configure"
+#line 10833 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10815,7 +10840,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10834,13 +10859,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10838: checking for glBegin in -lGL" >&5
+echo "configure:10863: 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 10844 "configure"
+#line 10869 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10851,7 +10876,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10913,13 +10938,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:10917: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:10942: 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 10923 "configure"
+#line 10948 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10930,7 +10955,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:10934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10949,13 +10974,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:10953: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:10978: 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 10959 "configure"
+#line 10984 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10966,7 +10991,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:10970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11013,10 +11038,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:11017: checking for glXCreatePbuffer" >&5
+echo "configure:11042: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 11020 "configure"
+#line 11045 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -11039,7 +11064,7 @@
; return 0; }
EOF
-if { (eval echo configure:11043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11068: \"$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
@@ -11076,10 +11101,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11080: checking for glXCreateGLXPixmap" >&5
+echo "configure:11105: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 11083 "configure"
+#line 11108 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -11102,7 +11127,7 @@
; return 0; }
EOF
-if { (eval echo configure:11106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11131: \"$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
@@ -11145,7 +11170,7 @@
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:11149: checking for location of OpenGL framework" >&5
+echo "configure:11174: 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; }
@@ -11169,15 +11194,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11173: checking for $ac_hdr" >&5
+echo "configure:11198: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11176 "configure"
+#line 11201 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11206: \"$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*
@@ -11213,10 +11238,10 @@
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11217: checking for glBegin" >&5
+echo "configure:11242: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 11220 "configure"
+#line 11245 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -11239,7 +11264,7 @@
; return 0; }
EOF
-if { (eval echo configure:11243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11268: \"$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
@@ -11276,10 +11301,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11280: checking for gluBeginCurve" >&5
+echo "configure:11305: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 11283 "configure"
+#line 11308 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -11302,7 +11327,7 @@
; return 0; }
EOF
-if { (eval echo configure:11306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11331: \"$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
@@ -11350,7 +11375,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11354: checking for location of OpenGL includes" >&5
+echo "configure:11379: 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; }
@@ -11376,15 +11401,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11380: checking for $ac_hdr" >&5
+echo "configure:11405: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11383 "configure"
+#line 11408 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11413: \"$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*
@@ -11418,7 +11443,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11422: checking for location of OpenGL library" >&5
+echo "configure:11447: 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; }
@@ -11443,18 +11468,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11447: checking for OpenGL library" >&5
+echo "configure:11472: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 11451 "configure"
+#line 11476 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:11458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11478,18 +11503,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11482: checking for GLU library" >&5
+echo "configure:11507: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 11486 "configure"
+#line 11511 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:11493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11538,7 +11563,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11542: checking whether to use ODBC" >&5
+echo "configure:11567: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -11557,7 +11582,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11561: checking for location of ODBC includes" >&5
+echo "configure:11586: 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; }
@@ -11583,15 +11608,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11587: checking for $ac_hdr" >&5
+echo "configure:11612: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11590 "configure"
+#line 11615 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11620: \"$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*
@@ -11625,7 +11650,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:11629: checking for location of ODBC library" >&5
+echo "configure:11654: 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; }
@@ -11650,13 +11675,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:11654: checking for SQLConnect in -lodbc" >&5
+echo "configure:11679: 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 11660 "configure"
+#line 11685 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11667,7 +11692,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11692,13 +11717,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:11696: checking for SQLConnect in -liodbc" >&5
+echo "configure:11721: 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 11702 "configure"
+#line 11727 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11709,7 +11734,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11734,11 +11759,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:11738: checking for ODBC library" >&5
+echo "configure:11763: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 11742 "configure"
+#line 11767 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -11746,7 +11771,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:11750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11795,7 +11820,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:11799: checking whether to use FFTW" >&5
+echo "configure:11824: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -11814,7 +11839,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:11818: checking for location of FFTW includes" >&5
+echo "configure:11843: 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; }
@@ -11840,15 +11865,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11844: checking for $ac_hdr" >&5
+echo "configure:11869: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11847 "configure"
+#line 11872 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11877: \"$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*
@@ -11876,15 +11901,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11880: checking for $ac_hdr" >&5
+echo "configure:11905: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11883 "configure"
+#line 11908 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11913: \"$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*
@@ -11912,15 +11937,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11916: checking for $ac_hdr" >&5
+echo "configure:11941: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11919 "configure"
+#line 11944 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11949: \"$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*
@@ -11966,7 +11991,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:11970: checking for location of FFTW library" >&5
+echo "configure:11995: 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; }
@@ -11991,13 +12016,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:11995: checking for fftw_execute in -lfftw3" >&5
+echo "configure:12020: 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 12001 "configure"
+#line 12026 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12008,7 +12033,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:12012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12033,13 +12058,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:12037: checking for fftwnd_one in -lfftw" >&5
+echo "configure:12062: 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 12043 "configure"
+#line 12068 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12050,7 +12075,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12075,13 +12100,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:12079: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:12104: 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 12085 "configure"
+#line 12110 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12092,7 +12117,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12149,7 +12174,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:12153: checking whether to use BLAS" >&5
+echo "configure:12178: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -12170,7 +12195,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:12174: checking for location of BLAS includes" >&5
+echo "configure:12199: 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; }
@@ -12190,7 +12215,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:12194: checking for location of BLAS library" >&5
+echo "configure:12219: 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; }
@@ -12216,15 +12241,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12220: checking for $ac_hdr" >&5
+echo "configure:12245: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12223 "configure"
+#line 12248 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12253: \"$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*
@@ -12259,13 +12284,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12263: checking for dnrm2_ in -lblas" >&5
+echo "configure:12288: 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 12269 "configure"
+#line 12294 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12276,7 +12301,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12295,13 +12320,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12299: checking for dnrm2_ in -lblas" >&5
+echo "configure:12324: 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 12305 "configure"
+#line 12330 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12312,7 +12337,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12356,13 +12381,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:12360: checking for ATL_xerbla in -latlas" >&5
+echo "configure:12385: 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 12366 "configure"
+#line 12391 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12373,7 +12398,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:12377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12388,13 +12413,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:12392: checking for sgemm_ in -lf77blas" >&5
+echo "configure:12417: 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 12398 "configure"
+#line 12423 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12405,7 +12430,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12420,13 +12445,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:12424: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12449: 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 12430 "configure"
+#line 12455 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12437,7 +12462,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:12441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12482,16 +12507,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12486: checking for sgemm in $vlib_flags" >&5
+echo "configure:12511: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 12488 "configure"
+#line 12513 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:12495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12520: \"$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
@@ -12509,13 +12534,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:12513: checking for sgemm_ in -lblas" >&5
+echo "configure:12538: 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 12519 "configure"
+#line 12544 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12526,7 +12551,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12541,13 +12566,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:12545: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12570: 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 12551 "configure"
+#line 12576 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12558,7 +12583,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:12562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12573,13 +12598,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:12577: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12602: 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 12583 "configure"
+#line 12608 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12590,7 +12615,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12624,13 +12649,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:12628: checking for acosp in -lsunmath" >&5
+echo "configure:12653: 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 12634 "configure"
+#line 12659 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12641,7 +12666,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:12645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12656,13 +12681,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:12660: checking for sgemm_ in -lsunperf" >&5
+echo "configure:12685: 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 12666 "configure"
+#line 12691 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12673,7 +12698,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12703,13 +12728,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:12707: checking for sgemm_ in -lblas" >&5
+echo "configure:12732: 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 12713 "configure"
+#line 12738 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12720,7 +12745,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12759,7 +12784,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:12763: checking whether to use LAPACK" >&5
+echo "configure:12788: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -12784,7 +12809,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:12788: checking for location of LAPACK includes" >&5
+echo "configure:12813: 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; }
@@ -12804,7 +12829,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:12808: checking for location of LAPACK library" >&5
+echo "configure:12833: 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; }
@@ -12830,15 +12855,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12834: checking for $ac_hdr" >&5
+echo "configure:12859: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12837 "configure"
+#line 12862 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12867: \"$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*
@@ -12870,10 +12895,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:12874: checking for dsegv_" >&5
+echo "configure:12899: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 12877 "configure"
+#line 12902 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -12896,7 +12921,7 @@
; return 0; }
EOF
-if { (eval echo configure:12900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12925: \"$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
@@ -12923,13 +12948,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:12927: checking for desgv_ in -llapack" >&5
+echo "configure:12952: 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 12933 "configure"
+#line 12958 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12940,7 +12965,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:12944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12972,13 +12997,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12976: checking for dgesv_ in -llapack" >&5
+echo "configure:13001: 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 12982 "configure"
+#line 13007 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12989,7 +13014,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13008,13 +13033,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13012: checking for dgesv_ in -llapack" >&5
+echo "configure:13037: 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 13018 "configure"
+#line 13043 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13025,7 +13050,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:13029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13081,7 +13106,7 @@
echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:13085: checking whether to use Motif" >&5
+echo "configure:13110: checking whether to use Motif" >&5
echo "$ac_t"""$with_motif"" 1>&6
case "$with_motif" in
"no") USE_MOTIF= ;;
@@ -13100,7 +13125,7 @@
echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:13104: checking for location of Motif includes" >&5
+echo "configure:13129: checking for location of Motif includes" >&5
case "$with_motif_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-motif-includes." 1>&2; exit 1; }
@@ -13126,15 +13151,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13130: checking for $ac_hdr" >&5
+echo "configure:13155: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13133 "configure"
+#line 13158 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13163: \"$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*
@@ -13168,7 +13193,7 @@
echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:13172: checking for location of Motif library" >&5
+echo "configure:13197: checking for location of Motif library" >&5
case "$with_motif_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-motif-libs." 1>&2; exit 1; }
@@ -13193,13 +13218,13 @@
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:13197: checking for XmStringCreate in -lXm" >&5
+echo "configure:13222: checking for XmStringCreate in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lXm $X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13203 "configure"
+#line 13228 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13210,7 +13235,7 @@
XmStringCreate()
; return 0; }
EOF
-if { (eval echo configure:13214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13251,7 +13276,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:13255: checking whether to use Cairo" >&5
+echo "configure:13280: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -13272,7 +13297,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:13276: checking for location of cairo includes" >&5
+echo "configure:13301: 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; }
@@ -13298,15 +13323,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13302: checking for $ac_hdr" >&5
+echo "configure:13327: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13305 "configure"
+#line 13330 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13335: \"$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*
@@ -13342,7 +13367,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:13346: checking for location of cairo library" >&5
+echo "configure:13371: 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; }
@@ -13362,7 +13387,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:13366: checking for cairo linking flags" >&5
+echo "configure:13391: 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; }
@@ -13378,10 +13403,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:13382: checking for cairo_create" >&5
+echo "configure:13407: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 13385 "configure"
+#line 13410 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -13404,7 +13429,7 @@
; return 0; }
EOF
-if { (eval echo configure:13408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13433: \"$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
@@ -13447,7 +13472,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:13451: checking whether to use FreeType" >&5
+echo "configure:13476: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -13466,7 +13491,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:13470: checking for location of FreeType includes" >&5
+echo "configure:13495: 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; }
@@ -13492,15 +13517,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13496: checking for $ac_hdr" >&5
+echo "configure:13521: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13499 "configure"
+#line 13524 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13529: \"$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*
@@ -13534,7 +13559,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:13538: checking for location of FreeType library" >&5
+echo "configure:13563: 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; }
@@ -13559,13 +13584,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:13563: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:13588: 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 13569 "configure"
+#line 13594 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13576,7 +13601,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:13580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13617,7 +13642,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:13621: checking whether to use NLS" >&5
+echo "configure:13646: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -13637,10 +13662,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:13641: checking for gettext" >&5
+echo "configure:13666: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 13644 "configure"
+#line 13669 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -13663,7 +13688,7 @@
; return 0; }
EOF
-if { (eval echo configure:13667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13692: \"$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
@@ -13681,13 +13706,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:13685: checking for gettext in -lintl" >&5
+echo "configure:13710: 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 13691 "configure"
+#line 13716 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13698,7 +13723,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:13702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13733,7 +13758,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:13737: checking whether to use C++" >&5
+echo "configure:13762: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -13749,7 +13774,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:13753: checking for $ac_word" >&5
+echo "configure:13778: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -13778,7 +13803,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:13782: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:13807: 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.
@@ -13789,12 +13814,12 @@
cat > conftest.$ac_ext << EOF
-#line 13793 "configure"
+#line 13818 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:13798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13823: \"$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
@@ -13820,19 +13845,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:13824: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:13849: 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:13829: checking whether we are using GNU C++" >&5
+echo "configure:13854: 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:13836: \"$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:13861: \"$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
@@ -13850,7 +13875,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:13854: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:13879: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -13891,7 +13916,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:13895: checking whether to use openDWG" >&5
+echo "configure:13920: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -13911,7 +13936,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:13915: checking for location of openDGW includes" >&5
+echo "configure:13940: 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; }
@@ -13937,15 +13962,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13941: checking for $ac_hdr" >&5
+echo "configure:13966: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13944 "configure"
+#line 13969 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13974: \"$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*
@@ -13979,7 +14004,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:13983: checking for location of openDWG library" >&5
+echo "configure:14008: 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; }
@@ -14026,7 +14051,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:14030: checking for special C compiler options needed for large files" >&5
+echo "configure:14055: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -14034,7 +14059,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 14038 "configure"
+#line 14063 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14050,7 +14075,7 @@
; return 0; }
EOF
-if { (eval echo configure:14054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -14059,7 +14084,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 14063 "configure"
+#line 14088 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14075,7 +14100,7 @@
; return 0; }
EOF
-if { (eval echo configure:14079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -14095,11 +14120,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:14099: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:14124: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 14103 "configure"
+#line 14128 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14115,14 +14140,14 @@
; return 0; }
EOF
-if { (eval echo configure:14119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14126 "configure"
+#line 14151 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -14140,7 +14165,7 @@
; return 0; }
EOF
-if { (eval echo configure:14144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -14159,11 +14184,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:14163: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:14188: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 14167 "configure"
+#line 14192 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14179,14 +14204,14 @@
; return 0; }
EOF
-if { (eval echo configure:14183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14190 "configure"
+#line 14215 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -14204,7 +14229,7 @@
; return 0; }
EOF
-if { (eval echo configure:14208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -14223,25 +14248,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:14227: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14252: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 14231 "configure"
+#line 14256 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14263: \"$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 14245 "configure"
+#line 14270 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -14250,7 +14275,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14271,10 +14296,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:14275: checking if system supports Large Files at all" >&5
+echo "configure:14300: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 14278 "configure"
+#line 14303 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -14306,7 +14331,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:14310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -14335,7 +14360,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:14339: checking whether to use Python" >&5
+echo "configure:14364: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -14355,7 +14380,7 @@
# Extract the first word of "python-config", so it can be a program name with args.
set dummy python-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14359: checking for $ac_word" >&5
+echo "configure:14384: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -14400,15 +14425,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14404: checking for $ac_hdr" >&5
+echo "configure:14429: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14407 "configure"
+#line 14432 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14437: \"$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*
@@ -14448,7 +14473,7 @@
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14452: checking for $ac_word" >&5
+echo "configure:14477: checking for $ac_word" >&5
case "$SWIG" in
/*)
@@ -14494,7 +14519,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:14498: checking whether to use wxWidgets" >&5
+echo "configure:14523: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -14514,7 +14539,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:14518: checking for $ac_word" >&5
+echo "configure:14543: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -14562,7 +14587,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:14566: checking wxWidgets version" >&5
+echo "configure:14591: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -14585,15 +14610,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14589: checking for $ac_hdr" >&5
+echo "configure:14614: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14592 "configure"
+#line 14617 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14622: \"$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*
@@ -14629,15 +14654,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14633: checking for $ac_hdr" >&5
+echo "configure:14658: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14636 "configure"
+#line 14661 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in 2008-08-24 16:54:31 UTC (rev 33049)
+++ grass/trunk/configure.in 2008-08-24 19:07:58 UTC (rev 33050)
@@ -895,6 +895,8 @@
fi
if test "$MYSQLD_CONFIG" != "" ; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
ac_save_libs="$LIBS"
MYSQLDLIB=`"$MYSQLD_CONFIG" --libmysqld-libs`
@@ -902,6 +904,8 @@
AC_CHECK_FUNC(mysql_server_init,,[MYSQLDLIB="";
AC_MSG_WARN([libmysqld not found])] )
LIBS=$ac_save_libs
+ AC_LANG_C
+ AC_LANG_RESTORE
fi
fi # $USE_MYSQL
More information about the grass-commit
mailing list