[GRASS-SVN] r45484 - in grass/trunk: . general/g.region include
lib/db lib/db/dbmi_base lib/db/dbmi_client lib/db/dbmi_driver
lib/g3d lib/proj mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Feb 28 07:04:38 EST 2011
Author: martinl
Date: 2011-02-28 04:04:38 -0800 (Mon, 28 Feb 2011)
New Revision: 45484
Added:
grass/trunk/lib/proj/ftol.c
grass/trunk/mswindows/osgeo4w/gdal-config
grass/trunk/mswindows/osgeo4w/geos-config
Removed:
grass/trunk/mswindows/osgeo4w/gdal-1.6.diff
grass/trunk/mswindows/osgeo4w/gdalplugins.cmd
Modified:
grass/trunk/configure
grass/trunk/configure.in
grass/trunk/general/g.region/printwindow.c
grass/trunk/include/gprojects.h
grass/trunk/include/proto_dbmi.h
grass/trunk/lib/db/dbmi_base/alloc.c
grass/trunk/lib/db/dbmi_base/cursor.c
grass/trunk/lib/db/dbmi_base/dbmscap.c
grass/trunk/lib/db/dbmi_base/dirent.c
grass/trunk/lib/db/dbmi_base/error.c
grass/trunk/lib/db/dbmi_base/handle.c
grass/trunk/lib/db/dbmi_base/index.c
grass/trunk/lib/db/dbmi_base/string.c
grass/trunk/lib/db/dbmi_base/table.c
grass/trunk/lib/db/dbmi_base/value.c
grass/trunk/lib/db/dbmi_client/copy_tab.c
grass/trunk/lib/db/dbmi_client/shutdown.c
grass/trunk/lib/db/dbmi_driver/d_close_cur.c
grass/trunk/lib/db/dbmi_driver/driver_state.c
grass/trunk/lib/db/dbmilib.dox
grass/trunk/lib/g3d/g3dcache.c
grass/trunk/lib/proj/Makefile
grass/trunk/mswindows/osgeo4w/config.h.vc
grass/trunk/mswindows/osgeo4w/package.sh
grass/trunk/mswindows/osgeo4w/postinstall.bat
grass/trunk/mswindows/osgeo4w/preremove.bat
Log:
winGRASS/OSGeo4W updates (see r45429)
Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/configure 2011-02-28 12:04:38 UTC (rev 45484)
@@ -6617,19 +6617,73 @@
CPPFLAGS=$ac_save_cppflags
-
+ if test "$MINGW32" = yes ; then
+
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$GEOS_LIBS $LDFLAGS"
+echo $ac_n "checking for initGEOS in -lgeos_c_i""... $ac_c" 1>&6
+echo "configure:6628: 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 6634 "configure"
+#include "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 initGEOS();
+
+int main() {
+initGEOS()
+; return 0; }
+EOF
+if { (eval echo configure:6645: \"$ac_link\") 1>&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
+ GEOS_LIBS="$GEOS_LIBS -lgeos_c_i "
+else
+ echo "$ac_t""no" 1>&6
+
+LDFLAGS=${ac_save_ldflags}
+
+ { echo "configure: error: *** Unable to locate GEOS library." 1>&2; exit 1; }
+
+
+fi
+
+
+
+LDFLAGS=${ac_save_ldflags}
+
+ else
+
+ac_save_ldflags="$LDFLAGS"
+LDFLAGS="$GEOS_LIBS $LDFLAGS"
+
+
echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6
-echo "configure:6627: checking for initGEOS in -lgeos_c" >&5
+echo "configure:6681: 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 6633 "configure"
+#line 6687 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6640,7 +6694,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6669,6 +6723,7 @@
LDFLAGS=${ac_save_ldflags}
+ fi
cat >> confdefs.h <<\EOF
#define HAVE_GEOS 1
EOF
@@ -6683,7 +6738,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:6687: checking whether to use TIFF" >&5
+echo "configure:6742: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -6703,7 +6758,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:6707: checking for location of TIFF includes" >&5
+echo "configure:6762: 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; }
@@ -6729,15 +6784,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6733: checking for $ac_hdr" >&5
+echo "configure:6788: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 6736 "configure"
+#line 6791 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6796: \"$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*
@@ -6771,7 +6826,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:6775: checking for location of TIFF library" >&5
+echo "configure:6830: 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; }
@@ -6802,13 +6857,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6806: checking for TIFFOpen in -ltiff" >&5
+echo "configure:6861: 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 6812 "configure"
+#line 6867 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6819,7 +6874,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:6823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6838,13 +6893,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6842: checking for TIFFOpen in -ltiff" >&5
+echo "configure:6897: 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 6848 "configure"
+#line 6903 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6855,7 +6910,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:6859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6874,13 +6929,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6878: checking for TIFFOpen in -ltiff" >&5
+echo "configure:6933: 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 6884 "configure"
+#line 6939 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6891,7 +6946,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:6895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6910,13 +6965,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6914: checking for TIFFOpen in -ltiff" >&5
+echo "configure:6969: 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 6920 "configure"
+#line 6975 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6927,7 +6982,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:6931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6946,13 +7001,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6950: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7005: 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 6956 "configure"
+#line 7011 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6963,7 +7018,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6982,13 +7037,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6986: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7041: 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 6992 "configure"
+#line 7047 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6999,7 +7054,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7018,13 +7073,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7022: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7077: 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 7028 "configure"
+#line 7083 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7035,7 +7090,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7054,13 +7109,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7058: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7113: 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 7064 "configure"
+#line 7119 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7071,7 +7126,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7169,7 +7224,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:7173: checking whether to use PNG" >&5
+echo "configure:7228: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -7188,7 +7243,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:7192: checking for location of PNG includes" >&5
+echo "configure:7247: 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; }
@@ -7214,15 +7269,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7218: checking for $ac_hdr" >&5
+echo "configure:7273: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7221 "configure"
+#line 7276 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7281: \"$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*
@@ -7256,7 +7311,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:7260: checking for location of PNG library" >&5
+echo "configure:7315: 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; }
@@ -7281,13 +7336,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7285: checking for png_read_image in -lpng" >&5
+echo "configure:7340: 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 7291 "configure"
+#line 7346 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7298,7 +7353,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:7302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7340,7 +7395,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:7344: checking whether to use PostgreSQL" >&5
+echo "configure:7399: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -7367,7 +7422,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:7371: checking for location of PostgreSQL includes" >&5
+echo "configure:7426: 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; }
@@ -7393,15 +7448,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7397: checking for $ac_hdr" >&5
+echo "configure:7452: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7400 "configure"
+#line 7455 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7460: \"$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*
@@ -7439,7 +7494,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:7443: checking for location of PostgreSQL library" >&5
+echo "configure:7498: 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; }
@@ -7468,13 +7523,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7472: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7527: 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 7478 "configure"
+#line 7533 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7485,7 +7540,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7504,13 +7559,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7508: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7563: 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 7514 "configure"
+#line 7569 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7521,7 +7576,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7540,13 +7595,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7544: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7599: 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 7550 "configure"
+#line 7605 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7557,7 +7612,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7576,13 +7631,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:7580: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:7635: 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 7586 "configure"
+#line 7641 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7593,7 +7648,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:7597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7650,13 +7705,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:7654: checking for PQcmdTuples in -lpq" >&5
+echo "configure:7709: 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 7660 "configure"
+#line 7715 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7667,7 +7722,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:7671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7689,13 +7744,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:7693: checking for PQcmdTuples in -lpq" >&5
+echo "configure:7748: 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 7699 "configure"
+#line 7754 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7706,7 +7761,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:7710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7749,7 +7804,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:7753: checking whether to use MySQL" >&5
+echo "configure:7808: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -7769,7 +7824,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:7773: checking for location of MySQL includes" >&5
+echo "configure:7828: 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; }
@@ -7795,15 +7850,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7799: checking for $ac_hdr" >&5
+echo "configure:7854: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7802 "configure"
+#line 7857 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7862: \"$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*
@@ -7840,7 +7895,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:7844: checking for location of MySQL library" >&5
+echo "configure:7899: 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; }
@@ -7871,13 +7926,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:7875: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:7930: 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 7881 "configure"
+#line 7936 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7888,7 +7943,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:7892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7907,13 +7962,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:7911: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:7966: 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 7917 "configure"
+#line 7972 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7924,7 +7979,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:7928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7943,13 +7998,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:7947: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8002: 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 7953 "configure"
+#line 8008 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7960,7 +8015,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:7964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7979,13 +8034,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:7983: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8038: 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 7989 "configure"
+#line 8044 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7996,7 +8051,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8015,13 +8070,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8019: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8074: 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 8025 "configure"
+#line 8080 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8032,7 +8087,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8051,13 +8106,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8055: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8110: 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 8061 "configure"
+#line 8116 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8068,7 +8123,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8087,13 +8142,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8091: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8146: 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 8097 "configure"
+#line 8152 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8104,7 +8159,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8123,13 +8178,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:8127: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:8182: 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 8133 "configure"
+#line 8188 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8140,7 +8195,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:8144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8230,7 +8285,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:8234: checking for $ac_word" >&5
+echo "configure:8289: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -8279,10 +8334,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:8283: checking for mysql_server_init" >&5
+echo "configure:8338: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 8286 "configure"
+#line 8341 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -8308,7 +8363,7 @@
; return 0; }
EOF
-if { (eval echo configure:8312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8367: \"$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
@@ -8360,7 +8415,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:8364: checking whether to use SQLite" >&5
+echo "configure:8419: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -8380,7 +8435,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:8384: checking for location of SQLite includes" >&5
+echo "configure:8439: 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; }
@@ -8406,15 +8461,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8410: checking for $ac_hdr" >&5
+echo "configure:8465: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8413 "configure"
+#line 8468 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8473: \"$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*
@@ -8457,7 +8512,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:8461: checking for location of SQLite library" >&5
+echo "configure:8516: 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; }
@@ -8486,13 +8541,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8490: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8545: 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 8496 "configure"
+#line 8551 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8503,7 +8558,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8522,13 +8577,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8526: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8581: 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 8532 "configure"
+#line 8587 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8539,7 +8594,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8558,13 +8613,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8562: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8617: 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 8568 "configure"
+#line 8623 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8575,7 +8630,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8594,13 +8649,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:8598: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:8653: 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 8604 "configure"
+#line 8659 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8611,7 +8666,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:8615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8680,7 +8735,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:8684: checking whether to use FFMPEG" >&5
+echo "configure:8739: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -8700,7 +8755,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:8704: checking for location of FFMPEG includes" >&5
+echo "configure:8759: 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; }
@@ -8726,15 +8781,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8730: checking for $ac_hdr" >&5
+echo "configure:8785: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8733 "configure"
+#line 8788 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8793: \"$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*
@@ -8770,15 +8825,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8774: checking for $ac_hdr" >&5
+echo "configure:8829: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8777 "configure"
+#line 8832 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8837: \"$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*
@@ -8814,15 +8869,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8818: checking for $ac_hdr" >&5
+echo "configure:8873: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8821 "configure"
+#line 8876 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8881: \"$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*
@@ -8865,7 +8920,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:8869: checking for location of FFMPEG library" >&5
+echo "configure:8924: 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; }
@@ -8892,13 +8947,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:8896: checking for av_free in -lavutil" >&5
+echo "configure:8951: 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 8902 "configure"
+#line 8957 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8909,7 +8964,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:8913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8928,13 +8983,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:8932: checking for av_free in -lavutil" >&5
+echo "configure:8987: 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 8938 "configure"
+#line 8993 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8945,7 +9000,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:8949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8990,13 +9045,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:8994: checking for avcodec_init in -lavcodec" >&5
+echo "configure:9049: 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 9000 "configure"
+#line 9055 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9007,7 +9062,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:9011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9026,13 +9081,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:9030: checking for avcodec_init in -lavcodec" >&5
+echo "configure:9085: 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 9036 "configure"
+#line 9091 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9043,7 +9098,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:9047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9088,13 +9143,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:9092: checking for av_set_parameters in -lavformat" >&5
+echo "configure:9147: 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 9098 "configure"
+#line 9153 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9105,7 +9160,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:9109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9124,13 +9179,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:9128: checking for av_set_parameters in -lavformat" >&5
+echo "configure:9183: 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 9134 "configure"
+#line 9189 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9141,7 +9196,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:9145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9200,7 +9255,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:9204: checking whether to use OpenGL" >&5
+echo "configure:9259: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -9234,7 +9289,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:9238: checking for location of OpenGL includes" >&5
+echo "configure:9293: 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; }
@@ -9260,15 +9315,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9264: checking for $ac_hdr" >&5
+echo "configure:9319: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9267 "configure"
+#line 9322 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9327: \"$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*
@@ -9302,7 +9357,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:9306: checking for location of OpenGL library" >&5
+echo "configure:9361: 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; }
@@ -9331,13 +9386,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9335: checking for glBegin in -lGL" >&5
+echo "configure:9390: 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 9341 "configure"
+#line 9396 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9348,7 +9403,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9367,13 +9422,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9371: checking for glBegin in -lGL" >&5
+echo "configure:9426: 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 9377 "configure"
+#line 9432 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9384,7 +9439,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9403,13 +9458,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9407: checking for glBegin in -lGL" >&5
+echo "configure:9462: 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 9413 "configure"
+#line 9468 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9420,7 +9475,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9439,13 +9494,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:9443: checking for glBegin in -lGL" >&5
+echo "configure:9498: 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 9449 "configure"
+#line 9504 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9456,7 +9511,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:9460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9518,13 +9573,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9522: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9577: 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 9528 "configure"
+#line 9583 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9535,7 +9590,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:9539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9554,13 +9609,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:9558: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:9613: 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 9564 "configure"
+#line 9619 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9571,7 +9626,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:9575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9618,10 +9673,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:9622: checking for glXCreatePbuffer" >&5
+echo "configure:9677: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 9625 "configure"
+#line 9680 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -9644,7 +9699,7 @@
; 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:9703: \"$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
@@ -9681,10 +9736,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:9685: checking for glXCreateGLXPixmap" >&5
+echo "configure:9740: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 9688 "configure"
+#line 9743 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -9707,7 +9762,7 @@
; return 0; }
EOF
-if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9766: \"$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
@@ -9750,7 +9805,7 @@
echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:9754: checking for location of OpenGL framework" >&5
+echo "configure:9809: 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; }
@@ -9774,15 +9829,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9778: checking for $ac_hdr" >&5
+echo "configure:9833: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9781 "configure"
+#line 9836 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9841: \"$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*
@@ -9818,10 +9873,10 @@
LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:9822: checking for glBegin" >&5
+echo "configure:9877: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 9825 "configure"
+#line 9880 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -9844,7 +9899,7 @@
; return 0; }
EOF
-if { (eval echo configure:9848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9903: \"$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
@@ -9881,10 +9936,10 @@
LIBS=" $OPENGLLIB $LIBS"
LDFLAGS="$OPENGLPATH $LDFLAGS"
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:9885: checking for gluBeginCurve" >&5
+echo "configure:9940: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 9888 "configure"
+#line 9943 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -9907,7 +9962,7 @@
; return 0; }
EOF
-if { (eval echo configure:9911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9966: \"$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
@@ -9955,7 +10010,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:9959: checking for location of OpenGL includes" >&5
+echo "configure:10014: 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; }
@@ -9981,15 +10036,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9985: checking for $ac_hdr" >&5
+echo "configure:10040: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9988 "configure"
+#line 10043 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10048: \"$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*
@@ -10023,7 +10078,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10027: checking for location of OpenGL library" >&5
+echo "configure:10082: 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; }
@@ -10048,18 +10103,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:10052: checking for OpenGL library" >&5
+echo "configure:10107: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 10056 "configure"
+#line 10111 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:10063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10083,18 +10138,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:10087: checking for GLU library" >&5
+echo "configure:10142: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 10091 "configure"
+#line 10146 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:10098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -10143,7 +10198,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:10147: checking whether to use Tcl/Tk" >&5
+echo "configure:10202: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -10163,7 +10218,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:10167: checking for location of Tcl/Tk includes" >&5
+echo "configure:10222: 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; }
@@ -10189,15 +10244,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10193: checking for $ac_hdr" >&5
+echo "configure:10248: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10196 "configure"
+#line 10251 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10256: \"$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*
@@ -10234,15 +10289,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10238: checking for $ac_hdr" >&5
+echo "configure:10293: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10241 "configure"
+#line 10296 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10301: \"$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*
@@ -10276,7 +10331,7 @@
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:10280: checking Tcl version" >&5
+echo "configure:10335: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -10284,7 +10339,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10288 "configure"
+#line 10343 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10296,7 +10351,7 @@
}
EOF
-if { (eval echo configure:10300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10355: \"$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
@@ -10314,7 +10369,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:10318: checking Tk version" >&5
+echo "configure:10373: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -10322,7 +10377,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10326 "configure"
+#line 10381 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10334,7 +10389,7 @@
}
EOF
-if { (eval echo configure:10338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10393: \"$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
@@ -10363,7 +10418,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:10367: checking for location of Tcl/Tk library" >&5
+echo "configure:10422: 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; }
@@ -10403,13 +10458,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:10407: checking for Tcl_Init in -ltcl" >&5
+echo "configure:10462: 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 10413 "configure"
+#line 10468 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10420,7 +10475,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10439,13 +10494,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:10443: checking for Tcl_Init in -ltcl" >&5
+echo "configure:10498: 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 10449 "configure"
+#line 10504 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10456,7 +10511,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10483,13 +10538,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10487: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:10542: 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 10493 "configure"
+#line 10548 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10500,7 +10555,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10519,13 +10574,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10523: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:10578: 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 10529 "configure"
+#line 10584 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10536,7 +10591,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10563,13 +10618,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:10567: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:10622: 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 10573 "configure"
+#line 10628 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10580,7 +10635,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10599,13 +10654,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:10603: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:10658: 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 10609 "configure"
+#line 10664 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10616,7 +10671,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:10620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10694,13 +10749,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:10698: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:10753: 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 10704 "configure"
+#line 10759 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10711,7 +10766,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10730,13 +10785,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:10734: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:10789: 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 10740 "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
@@ -10747,7 +10802,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10751: \"$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
@@ -10774,13 +10829,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10778: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:10833: 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 10784 "configure"
+#line 10839 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10791,7 +10846,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10810,13 +10865,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:10814: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:10869: 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 10820 "configure"
+#line 10875 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10827,7 +10882,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10854,13 +10909,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:10858: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:10913: 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 10864 "configure"
+#line 10919 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10871,7 +10926,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10890,13 +10945,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:10894: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:10949: 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 10900 "configure"
+#line 10955 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10907,7 +10962,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:10911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10997,13 +11052,13 @@
do
# add only if in MACOSX_ARCHS
echo $ac_n "checking for Tcl_Init in -l$tlib""... $ac_c" 1>&6
-echo "configure:11001: checking for Tcl_Init in -l$tlib" >&5
+echo "configure:11056: 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 11007 "configure"
+#line 11062 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11014,7 +11069,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:11018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11064,7 +11119,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11068: checking whether to use ODBC" >&5
+echo "configure:11123: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -11083,7 +11138,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11087: checking for location of ODBC includes" >&5
+echo "configure:11142: 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; }
@@ -11109,15 +11164,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11113: checking for $ac_hdr" >&5
+echo "configure:11168: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11116 "configure"
+#line 11171 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11176: \"$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*
@@ -11151,7 +11206,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:11155: checking for location of ODBC library" >&5
+echo "configure:11210: 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; }
@@ -11176,13 +11231,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:11180: checking for SQLConnect in -lodbc" >&5
+echo "configure:11235: 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 11186 "configure"
+#line 11241 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11193,7 +11248,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11218,13 +11273,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:11222: checking for SQLConnect in -liodbc" >&5
+echo "configure:11277: 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 11228 "configure"
+#line 11283 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11235,7 +11290,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:11239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11260,11 +11315,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:11264: checking for ODBC library" >&5
+echo "configure:11319: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 11268 "configure"
+#line 11323 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -11272,7 +11327,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:11276: \"$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*
echo "$ac_t""found" 1>&6
@@ -11321,7 +11376,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:11325: checking whether to use FFTW" >&5
+echo "configure:11380: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -11340,7 +11395,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:11344: checking for location of FFTW includes" >&5
+echo "configure:11399: 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; }
@@ -11366,15 +11421,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11370: checking for $ac_hdr" >&5
+echo "configure:11425: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11373 "configure"
+#line 11428 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11433: \"$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*
@@ -11402,15 +11457,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11406: checking for $ac_hdr" >&5
+echo "configure:11461: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11409 "configure"
+#line 11464 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11469: \"$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*
@@ -11438,15 +11493,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11442: checking for $ac_hdr" >&5
+echo "configure:11497: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11445 "configure"
+#line 11500 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11505: \"$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*
@@ -11492,7 +11547,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:11496: checking for location of FFTW library" >&5
+echo "configure:11551: 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; }
@@ -11517,13 +11572,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:11521: checking for fftw_execute in -lfftw3" >&5
+echo "configure:11576: 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 11527 "configure"
+#line 11582 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11534,7 +11589,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:11538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11559,13 +11614,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:11563: checking for fftwnd_one in -lfftw" >&5
+echo "configure:11618: 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 11569 "configure"
+#line 11624 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11576,7 +11631,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:11580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11601,13 +11656,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:11605: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:11660: 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 11611 "configure"
+#line 11666 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11618,7 +11673,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:11622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11675,7 +11730,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:11679: checking whether to use BLAS" >&5
+echo "configure:11734: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -11696,7 +11751,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:11700: checking for location of BLAS includes" >&5
+echo "configure:11755: 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; }
@@ -11716,7 +11771,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:11720: checking for location of BLAS library" >&5
+echo "configure:11775: 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; }
@@ -11742,15 +11797,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11746: checking for $ac_hdr" >&5
+echo "configure:11801: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11749 "configure"
+#line 11804 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11809: \"$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*
@@ -11785,13 +11840,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:11789: checking for dnrm2_ in -lblas" >&5
+echo "configure:11844: 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 11795 "configure"
+#line 11850 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11802,7 +11857,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:11806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11821,13 +11876,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:11825: checking for dnrm2_ in -lblas" >&5
+echo "configure:11880: 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 11831 "configure"
+#line 11886 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11838,7 +11893,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:11842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11882,13 +11937,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:11886: checking for ATL_xerbla in -latlas" >&5
+echo "configure:11941: 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 11892 "configure"
+#line 11947 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11899,7 +11954,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:11903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11914,13 +11969,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:11918: checking for sgemm_ in -lf77blas" >&5
+echo "configure:11973: 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 11924 "configure"
+#line 11979 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11931,7 +11986,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:11935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11946,13 +12001,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:11950: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12005: 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 11956 "configure"
+#line 12011 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11963,7 +12018,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:11967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12022: \"$ac_link\") 1>&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,16 +12064,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12013: checking for sgemm in $vlib_flags" >&5
+echo "configure:12068: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 12015 "configure"
+#line 12070 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:12022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12077: \"$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
@@ -12036,13 +12091,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:12040: checking for sgemm_ in -lblas" >&5
+echo "configure:12095: 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 12046 "configure"
+#line 12101 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12053,7 +12108,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12068,13 +12123,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:12072: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12127: 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 12078 "configure"
+#line 12133 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12085,7 +12140,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:12089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12100,13 +12155,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:12104: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12159: 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 12110 "configure"
+#line 12165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12117,7 +12172,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12151,13 +12206,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:12155: checking for acosp in -lsunmath" >&5
+echo "configure:12210: 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 12161 "configure"
+#line 12216 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12168,7 +12223,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:12172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12183,13 +12238,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:12187: checking for sgemm_ in -lsunperf" >&5
+echo "configure:12242: 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 12193 "configure"
+#line 12248 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12200,7 +12255,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12230,13 +12285,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:12234: checking for sgemm_ in -lblas" >&5
+echo "configure:12289: 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 12240 "configure"
+#line 12295 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12247,7 +12302,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12286,7 +12341,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:12290: checking whether to use LAPACK" >&5
+echo "configure:12345: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -12311,7 +12366,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:12315: checking for location of LAPACK includes" >&5
+echo "configure:12370: 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; }
@@ -12331,7 +12386,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:12335: checking for location of LAPACK library" >&5
+echo "configure:12390: 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; }
@@ -12357,15 +12412,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12361: checking for $ac_hdr" >&5
+echo "configure:12416: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12364 "configure"
+#line 12419 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12424: \"$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*
@@ -12397,10 +12452,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:12401: checking for dsegv_" >&5
+echo "configure:12456: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 12404 "configure"
+#line 12459 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -12423,7 +12478,7 @@
; return 0; }
EOF
-if { (eval echo configure:12427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12482: \"$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
@@ -12450,13 +12505,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:12454: checking for desgv_ in -llapack" >&5
+echo "configure:12509: 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 12460 "configure"
+#line 12515 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12467,7 +12522,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:12471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12499,13 +12554,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12503: checking for dgesv_ in -llapack" >&5
+echo "configure:12558: 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 12509 "configure"
+#line 12564 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12516,7 +12571,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12535,13 +12590,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:12539: checking for dgesv_ in -llapack" >&5
+echo "configure:12594: 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 12545 "configure"
+#line 12600 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12552,7 +12607,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:12556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12608,7 +12663,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:12612: checking whether to use Cairo" >&5
+echo "configure:12667: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -12634,7 +12689,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:12638: checking for location of cairo includes" >&5
+echo "configure:12693: 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; }
@@ -12660,15 +12715,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12664: checking for $ac_hdr" >&5
+echo "configure:12719: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12667 "configure"
+#line 12722 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12727: \"$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*
@@ -12704,7 +12759,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:12708: checking for location of cairo library" >&5
+echo "configure:12763: 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; }
@@ -12724,7 +12779,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:12728: checking for cairo linking flags" >&5
+echo "configure:12783: 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; }
@@ -12740,10 +12795,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:12744: checking for cairo_create" >&5
+echo "configure:12799: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 12747 "configure"
+#line 12802 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -12766,7 +12821,7 @@
; return 0; }
EOF
-if { (eval echo configure:12770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12825: \"$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
@@ -12800,10 +12855,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:12804: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:12859: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 12807 "configure"
+#line 12862 "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. */
@@ -12826,7 +12881,7 @@
; return 0; }
EOF
-if { (eval echo configure:12830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12885: \"$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
@@ -12859,10 +12914,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_get_xrender_format""... $ac_c" 1>&6
-echo "configure:12863: checking for cairo_xlib_surface_get_xrender_format" >&5
+echo "configure:12918: checking for cairo_xlib_surface_get_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 12866 "configure"
+#line 12921 "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. */
@@ -12885,7 +12940,7 @@
; return 0; }
EOF
-if { (eval echo configure:12889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_xlib_surface_get_xrender_format=yes"
else
@@ -12927,7 +12982,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:12931: checking whether to use FreeType" >&5
+echo "configure:12986: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -12946,7 +13001,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:12950: checking for location of FreeType includes" >&5
+echo "configure:13005: 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; }
@@ -12972,15 +13027,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12976: checking for $ac_hdr" >&5
+echo "configure:13031: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12979 "configure"
+#line 13034 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13039: \"$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*
@@ -13014,7 +13069,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:13018: checking for location of FreeType library" >&5
+echo "configure:13073: 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; }
@@ -13039,13 +13094,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:13043: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:13098: 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 13049 "configure"
+#line 13104 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13056,7 +13111,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:13060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13097,7 +13152,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:13101: checking whether to use NLS" >&5
+echo "configure:13156: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -13117,10 +13172,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:13121: checking for gettext" >&5
+echo "configure:13176: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 13124 "configure"
+#line 13179 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -13143,7 +13198,7 @@
; return 0; }
EOF
-if { (eval echo configure:13147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13202: \"$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
@@ -13161,13 +13216,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:13165: checking for gettext in -lintl" >&5
+echo "configure:13220: 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 13171 "configure"
+#line 13226 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13178,7 +13233,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:13182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13213,7 +13268,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:13217: checking whether to use C++" >&5
+echo "configure:13272: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -13229,7 +13284,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:13233: checking for $ac_word" >&5
+echo "configure:13288: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -13258,7 +13313,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:13262: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:13317: 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.
@@ -13269,12 +13324,12 @@
cat > conftest.$ac_ext << EOF
-#line 13273 "configure"
+#line 13328 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:13278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13333: \"$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
@@ -13300,19 +13355,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:13304: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:13359: 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:13309: checking whether we are using GNU C++" >&5
+echo "configure:13364: 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:13316: \"$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:13371: \"$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
@@ -13330,7 +13385,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:13334: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:13389: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -13371,7 +13426,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:13375: checking whether to use openDWG" >&5
+echo "configure:13430: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -13391,7 +13446,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:13395: checking for location of openDGW includes" >&5
+echo "configure:13450: 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; }
@@ -13417,15 +13472,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13421: checking for $ac_hdr" >&5
+echo "configure:13476: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13424 "configure"
+#line 13479 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13484: \"$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*
@@ -13459,7 +13514,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:13463: checking for location of openDWG library" >&5
+echo "configure:13518: 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; }
@@ -13500,7 +13555,7 @@
echo $ac_n "checking whether to use POSIX threads""... $ac_c" 1>&6
-echo "configure:13504: checking whether to use POSIX threads" >&5
+echo "configure:13559: checking whether to use POSIX threads" >&5
echo "$ac_t"""$with_pthread"" 1>&6
case "$with_pthread" in
"no") USE_PTHREAD= ;;
@@ -13520,7 +13575,7 @@
echo $ac_n "checking for location of POSIX threads includes""... $ac_c" 1>&6
-echo "configure:13524: checking for location of POSIX threads includes" >&5
+echo "configure:13579: 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; }
@@ -13546,15 +13601,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13550: checking for $ac_hdr" >&5
+echo "configure:13605: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13553 "configure"
+#line 13608 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13613: \"$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*
@@ -13588,7 +13643,7 @@
echo $ac_n "checking for location of POSIX threads library""... $ac_c" 1>&6
-echo "configure:13592: checking for location of POSIX threads library" >&5
+echo "configure:13647: 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; }
@@ -13613,10 +13668,10 @@
LIBS=" $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-echo "configure:13617: checking for pthread_create" >&5
+echo "configure:13672: checking for pthread_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 13620 "configure"
+#line 13675 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_create(); below. */
@@ -13639,7 +13694,7 @@
; return 0; }
EOF
-if { (eval echo configure:13643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13698: \"$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
@@ -13666,13 +13721,13 @@
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:13670: checking for pthread_create in -lpthread" >&5
+echo "configure:13725: 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 13676 "configure"
+#line 13731 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13683,7 +13738,7 @@
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:13687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13739,7 +13794,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:13743: checking for special C compiler options needed for large files" >&5
+echo "configure:13798: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -13747,7 +13802,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 13751 "configure"
+#line 13806 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13763,7 +13818,7 @@
; return 0; }
EOF
-if { (eval echo configure:13767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -13772,7 +13827,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 13776 "configure"
+#line 13831 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13788,7 +13843,7 @@
; return 0; }
EOF
-if { (eval echo configure:13792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -13808,11 +13863,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:13812: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:13867: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 13816 "configure"
+#line 13871 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13828,14 +13883,14 @@
; return 0; }
EOF
-if { (eval echo configure:13832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13887: \"$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 13839 "configure"
+#line 13894 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -13853,7 +13908,7 @@
; return 0; }
EOF
-if { (eval echo configure:13857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -13872,11 +13927,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:13876: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:13931: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 13880 "configure"
+#line 13935 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -13892,14 +13947,14 @@
; return 0; }
EOF
-if { (eval echo configure:13896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13951: \"$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 13903 "configure"
+#line 13958 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -13917,7 +13972,7 @@
; return 0; }
EOF
-if { (eval echo configure:13921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -13936,25 +13991,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13940: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:13995: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 13944 "configure"
+#line 13999 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14006: \"$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 13958 "configure"
+#line 14013 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -13963,7 +14018,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -13984,25 +14039,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:13988: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14043: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 13992 "configure"
+#line 14047 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:13999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14006 "configure"
+#line 14061 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -14011,7 +14066,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:14015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -14034,18 +14089,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:14038: checking for fseeko" >&5
+echo "configure:14093: checking for fseeko" >&5
ac_cv_func_fseeko=no
cat > conftest.$ac_ext <<EOF
-#line 14042 "configure"
+#line 14097 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return fseeko && fseeko (stdin, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:14049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_fseeko=yes
else
@@ -14062,10 +14117,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:14066: checking if system supports Large Files at all" >&5
+echo "configure:14121: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 14069 "configure"
+#line 14124 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -14097,7 +14152,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:14101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -14126,7 +14181,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:14130: checking whether to use wxWidgets" >&5
+echo "configure:14185: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -14147,7 +14202,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:14151: checking for $ac_word" >&5
+echo "configure:14206: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -14195,7 +14250,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:14199: checking wxWidgets version" >&5
+echo "configure:14254: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -14218,15 +14273,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14222: checking for $ac_hdr" >&5
+echo "configure:14277: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14225 "configure"
+#line 14280 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14285: \"$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 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/configure.in 2011-02-28 12:04:38 UTC (rev 45484)
@@ -827,7 +827,11 @@
fi
LOC_CHECK_INCLUDES(geos_c.h,GEOS,$GEOS_CFLAGS)
- LOC_CHECK_LIBS(geos_c,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
+ if test "$MINGW32" = yes ; then
+ LOC_CHECK_LIBS(geos_c_i,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
+ else
+ LOC_CHECK_LIBS(geos_c,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
+ fi
AC_DEFINE(HAVE_GEOS)
fi
Modified: grass/trunk/general/g.region/printwindow.c
===================================================================
--- grass/trunk/general/g.region/printwindow.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/general/g.region/printwindow.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -1,6 +1,10 @@
#include <string.h>
#include <stdlib.h>
+
+#ifndef __MINGW32__
#include <projects.h>
+#endif
+
#include <grass/gis.h>
#include <grass/gprojects.h>
#include <grass/glocale.h>
Modified: grass/trunk/include/gprojects.h
===================================================================
--- grass/trunk/include/gprojects.h 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/include/gprojects.h 2011-02-28 12:04:38 UTC (rev 45484)
@@ -105,4 +105,31 @@
double *, double *, double *);
void GPJ_free_ellps(struct gpj_ellps *);
+
+#ifdef __MINGW32__
+/* PROJ.4's private datastructures copied from projects.h as removed
+ from osgeo4w; pending better solution. see:
+ http://trac.osgeo.org/proj/ticket/98 */
+
+typedef struct { double u, v; } LP;
+
+struct DERIVS {
+ double x_l, x_p; /* derivatives of x for lambda-phi */
+ double y_l, y_p; /* derivatives of y for lambda-phi */
+};
+
+struct FACTORS {
+ struct DERIVS der;
+ double h, k; /* meridinal, parallel scales */
+ double omega, thetap; /* angular distortion, theta prime */
+ double conv; /* convergence */
+ double s; /* areal scale factor */
+ double a, b; /* max-min scale error */
+ int code; /* info as to analytics, see following */
+};
+
+int pj_factors(LP, void *, double, struct FACTORS *);
+/* end of copy */
#endif
+
+#endif
Modified: grass/trunk/include/proto_dbmi.h
===================================================================
--- grass/trunk/include/proto_dbmi.h 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/include/proto_dbmi.h 2011-02-28 12:04:38 UTC (rev 45484)
@@ -132,6 +132,7 @@
int db_fetch(dbCursor * cursor, int position, int *more);
int db_find_database(dbDriver * driver, dbHandle * handle, int *found);
dbAddress db_find_token(dbToken token);
+void *db_free(void *s);
void db_free_column(dbColumn * column);
void db_free_cursor(dbCursor * cursor);
void db_free_cursor_column_flags(dbCursor * cursor);
Modified: grass/trunk/lib/db/dbmi_base/alloc.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/alloc.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/alloc.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -74,3 +74,14 @@
db_memory_error();
return s;
}
+
+/*!
+ \fn void *db_free (void *s)
+ \brief
+ \return
+ \param
+ */
+void *db_free(void *s)
+{
+ free(s);
+}
Modified: grass/trunk/lib/db/dbmi_base/cursor.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/cursor.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/cursor.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -299,7 +299,7 @@
void db_free_cursor_column_flags(dbCursor *cursor)
{
if (cursor->column_flags)
- free(cursor->column_flags);
+ db_free(cursor->column_flags);
cursor->column_flags = NULL;
}
Modified: grass/trunk/lib/db/dbmi_base/dbmscap.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/dbmscap.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/dbmscap.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -244,6 +244,6 @@
for (cur = list; cur; cur = next) {
next = cur->next;
- free(cur);
+ db_free(cur);
}
}
Modified: grass/trunk/lib/db/dbmi_base/dirent.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/dirent.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/dirent.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -85,7 +85,7 @@
dirent[i].isdir = (db_isdir(path) == DB_OK);
}
closedir(dp);
- free(path);
+ db_free(path);
sort_dirent(dirent, *n);
@@ -105,7 +105,7 @@
if (dirent) {
for (i = 0; i < count; i++)
db_free_string(&dirent[i].name);
- free(dirent);
+ db_free(dirent);
}
}
Modified: grass/trunk/lib/db/dbmi_base/error.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/error.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/error.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -33,7 +33,7 @@
void db_set_error_who(const char *me)
{
if (who)
- free(who);
+ db_free_string(who);
who = db_store(me);
}
@@ -59,7 +59,7 @@
if (s == NULL)
s = "<NULL error message>";
if (err_msg)
- free(err_msg);
+ db_free_string(err_msg);
err_msg = db_store(s);
err_flag = 1;
if (auto_print_errors)
Modified: grass/trunk/lib/db/dbmi_base/handle.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/handle.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/handle.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -95,7 +95,7 @@
if (handle) {
for (i = 0; i < count; i++)
db_free_handle(&handle[i]);
- G_free((void *) handle);
+ db_free((void *) handle);
}
}
Modified: grass/trunk/lib/db/dbmi_base/index.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/index.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/index.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -80,7 +80,7 @@
if (list) {
for (i = 0; i < count; i++)
db_free_index(&list[i]);
- free(list);
+ db_free(list);
}
}
Modified: grass/trunk/lib/db/dbmi_base/string.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/string.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/string.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -150,7 +150,7 @@
void db_free_string(dbString * x)
{
if (x->nalloc > 0)
- G_free(x->string);
+ db_free(x->string);
db_init_string(x);
}
@@ -167,7 +167,7 @@
if (a) {
for (i = 0; i < n; i++)
db_free_string(&a[i]);
- G_free(a);
+ db_free(a);
}
}
Modified: grass/trunk/lib/db/dbmi_base/table.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/table.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/table.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -21,7 +21,7 @@
table->columns = (dbColumn *) db_calloc(sizeof(dbColumn), ncols);
if (table->columns == NULL) {
- free(table);
+ db_free(table);
return (table = NULL);
}
table->numColumns = ncols;
@@ -54,8 +54,8 @@
for (i = 0; i < table->numColumns; i++)
db_free_column(&table->columns[i]);
if (table->columns)
- free(table->columns);
- free(table);
+ db_free(table->columns);
+ db_free(table);
}
/*!
Modified: grass/trunk/lib/db/dbmi_base/value.c
===================================================================
--- grass/trunk/lib/db/dbmi_base/value.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_base/value.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -353,15 +353,15 @@
for (i = 0; i < arr->n_values; i++) {
if (arr->ctype == DB_C_TYPE_STRING && arr->value[i].val.s) {
db_free_string(arr->value[i].val.s);
- free(arr->value[i].val.s);
+ db_free(arr->value[i].val.s);
}
if (arr->ctype == DB_C_TYPE_DATETIME && arr->value[i].val.t) {
- free(arr->value[i].val.t);
+ db_free(arr->value[i].val.t);
}
}
}
- free(arr->value);
+ G_free(arr->value);
}
/*!
Modified: grass/trunk/lib/db/dbmi_client/copy_tab.c
===================================================================
--- grass/trunk/lib/db/dbmi_client/copy_tab.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_client/copy_tab.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -374,7 +374,7 @@
}
}
if (selcol)
- free(ivalues);
+ G_free(ivalues);
G_debug(3, "Table copy OK");
db_close_cursor(&cursor);
Modified: grass/trunk/lib/db/dbmi_client/shutdown.c
===================================================================
--- grass/trunk/lib/db/dbmi_client/shutdown.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_client/shutdown.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -70,7 +70,7 @@
driver->pid = 0;
/* free the driver structure. THIS IS GOOFY */
- free(driver);
+ db_free(driver);
return status;
}
Modified: grass/trunk/lib/db/dbmi_driver/d_close_cur.c
===================================================================
--- grass/trunk/lib/db/dbmi_driver/d_close_cur.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_driver/d_close_cur.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -44,7 +44,7 @@
db_drop_token(token);
db_free_cursor(cursor);
db__drop_cursor_from_driver_state(cursor);
- free(cursor);
+ db_free(cursor);
/* send the return code */
if (stat != DB_OK) {
Modified: grass/trunk/lib/db/dbmi_driver/driver_state.c
===================================================================
--- grass/trunk/lib/db/dbmi_driver/driver_state.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmi_driver/driver_state.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -66,8 +66,8 @@
*/
void db__mark_database_closed(void)
{
- free(state.dbname);
- free(state.dbschema);
+ db_free_string(state.dbname);
+ db_free_string(state.dbschema);
state.open = 0;
}
@@ -128,7 +128,7 @@
db_driver_close_cursor(state.cursor_list[i]);
if (state.cursor_list)
- free(state.cursor_list);
+ db_free(state.cursor_list);
state.ncursors = 0;
state.cursor_list = NULL;
Modified: grass/trunk/lib/db/dbmilib.dox
===================================================================
--- grass/trunk/lib/db/dbmilib.dox 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/db/dbmilib.dox 2011-02-28 12:04:38 UTC (rev 45484)
@@ -269,9 +269,11 @@
void #db_malloc (int n)
-void #db_realloc (void s, int n)
+void #db_realloc (void *s, int n)
+void #db_free (void *s, int n)
+
\subsection DB_case_routines DB case routines
int #db_nocase_compare (char *a, char *b)
Modified: grass/trunk/lib/g3d/g3dcache.c
===================================================================
--- grass/trunk/lib/g3d/g3dcache.c 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/g3d/g3dcache.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -121,7 +121,7 @@
return 0;
}
- index = *((int *)(xdr + nBytes));
+ index = *((int *)((unsigned char *)xdr + nBytes));
map->index[index] = -pos - 2;
map->cachePosLast--;
Modified: grass/trunk/lib/proj/Makefile
===================================================================
--- grass/trunk/lib/proj/Makefile 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/lib/proj/Makefile 2011-02-28 12:04:38 UTC (rev 45484)
@@ -2,6 +2,10 @@
LIB = GPROJ
+include $(MODULE_TOPDIR)/include/Make/Vars.make
+
+MOD_OBJS := $(filter-out ftol.o,$(AUTO_OBJS))
+
include $(MODULE_TOPDIR)/include/Make/Lib.make
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
@@ -27,9 +31,14 @@
PROJ_TABLES := proj-desc.table proj-parms.table proj-units.table
PROJ_DSTFILES := $(patsubst %,$(ETC)/%,$(PROJ_TABLES))
-default: lib
+default: lib $(FTOL_OBJ)
$(MAKE) $(NAD_DSTFILES) $(CSV_DSTFILES) $(PROJ_DSTFILES) $(NAD_SRCFILES)
+ifdef MINGW
+$(FTOL_OBJ): $(OBJDIR)/ftol.o
+ $(INSTALL) $< $@
+endif
+
$(NAD_DSTFILES): $(NAD_DIR)/%: %.lla | $(NAD_DIR)
$(NAD2BIN) < $< $@
Copied: grass/trunk/lib/proj/ftol.c (from rev 45429, grass/branches/develbranch_6/lib/proj/ftol.c)
===================================================================
--- grass/trunk/lib/proj/ftol.c (rev 0)
+++ grass/trunk/lib/proj/ftol.c 2011-02-28 12:04:38 UTC (rev 45484)
@@ -0,0 +1,2 @@
+long _ftol(double);
+long _ftol2(double x) { return _ftol(x); }
Modified: grass/trunk/mswindows/osgeo4w/config.h.vc
===================================================================
--- grass/trunk/mswindows/osgeo4w/config.h.vc 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/mswindows/osgeo4w/config.h.vc 2011-02-28 12:04:38 UTC (rev 45484)
@@ -162,7 +162,7 @@
#define HAVE_PQCMDTUPLES 1
/* define if ODBC exists */
-/* #undef HAVE_SQL_H */
+#define HAVE_SQL_H 1
/* define if tiffio.h exists */
#define HAVE_TIFFIO_H 1
Deleted: grass/trunk/mswindows/osgeo4w/gdal-1.6.diff
===================================================================
--- grass/trunk/mswindows/osgeo4w/gdal-1.6.diff 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/mswindows/osgeo4w/gdal-1.6.diff 2011-02-28 12:04:38 UTC (rev 45484)
@@ -1,261 +0,0 @@
-Index: nmake.opt
-===================================================================
---- nmake.opt (revision 17458)
-+++ nmake.opt (working copy)
-@@ -22,8 +22,8 @@
- # 1200 = 6.0
- #
- !IFNDEF MSVC_VER
--#assume msvc 7.1
--MSVC_VER=1310
-+#assume msvc 9.0
-+MSVC_VER=1500
- !ENDIF
-
- ###############################################################################
-@@ -39,11 +39,11 @@
- # But the paths *should* be absolute (relative paths mess up in submakefiles).
-
- !IFNDEF GDAL_HOME
--GDAL_HOME = "C:\warmerda\bld"
-+GDAL_HOME = $(OSGEO4W_ROOT)
- !ENDIF
- BINDIR = $(GDAL_HOME)\bin
- PLUGINDIR = $(BINDIR)\gdalplugins
--PY_INST_DIR = $(GDAL_HOME)\pymod
-+PY_INST_DIR = $(GDAL_HOME)\apps\Python25\lib\site-packages
- LIBDIR = $(GDAL_HOME)\lib
- INCDIR = $(GDAL_HOME)\include
- DATADIR = $(GDAL_HOME)\data
-@@ -52,7 +52,7 @@
- # Set this to the installed directory containing python. If you don't
- # have python just let it point to a directory that does not exist (as now).
- !IFNDEF PYDIR
--PYDIR = "C:\Software\Python24"
-+PYDIR = $(OSGEO4W_ROOT)\apps\Python25
- !ENDIF
-
- # Set the location of your SWIG installation
-@@ -77,7 +77,7 @@
- !IFNDEF OPTFLAGS
- !IF $(MSVC_VER) >= 1400
- !IFNDEF DEBUG
--OPTFLAGS= /nologo /MD /EHsc /Ox /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
-+OPTFLAGS= /nologo /MD /EHsc /Zi /Ox /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG /Fd$(GDAL_ROOT)\gdal$(VERSION).pdb
- !ELSE
- OPTFLAGS= /nologo /MD /EHsc /Zi /W4 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /Fd$(GDAL_ROOT)\gdal$(VERSION).pdb
- !ENDIF
-Index: ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp
-===================================================================
---- ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp (revision 17458)
-+++ ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp (working copy)
-@@ -31,6 +31,10 @@
- #include "cpl_conv.h"
- #include "cpl_string.h"
-
-+#ifdef WIN32
-+#include <fcntl.h>
-+#endif
-+
- CPL_CVSID("$Id$");
-
- /************************************************************************/
-@@ -187,6 +191,9 @@
- /* -------------------------------------------------------------------- */
- Vect_set_fatal_error ( GV_FATAL_PRINT ); // Print error and continue
- Vect_set_open_level (2);
-+#ifdef WIN32
-+ _set_fmode(_O_BINARY);
-+#endif
- int level = Vect_open_old ( &map, pszMap, pszMapset);
-
- if ( level < 2 ) {
-Index: ogr/ogrsf_frmts/grass/makefile.vc
-===================================================================
---- ogr/ogrsf_frmts/grass/makefile.vc (revision 0)
-+++ ogr/ogrsf_frmts/grass/makefile.vc (revision 0)
-@@ -0,0 +1,33 @@
-+GRASS_BASE = $(OSGEO4W_ROOT)\apps\grass\grass-$(GRASS_VERSION)
-+SRC = ogrgrassdriver.cpp ogrgrassdatasource.cpp ogrgrasslayer.obj
-+OBJ = ogrgrassdriver.obj ogrgrassdatasource.obj ogrgrasslayer.obj
-+PLUGIN_DLL = ogr_GRASS.dll
-+CFLAGS = /nologo /MD /EHsc /Od /Zi /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG \
-+ -I $(OSGEO4W_ROOT)/apps/gdal-16/include \
-+ -I $(OSGEO4W_ROOT)/include -I $(GRASS_BASE)/include \
-+ -D GRASS_GISBASE=\"$(OSGEO4W_ROOT)\\apps\\grass\\grass-$(GRASS_VERSION)\"
-+GRASS_LIBS = /LIBPATH:$(GRASS_BASE)/lib $(OSGEO4W_ROOT)/apps/gdal-16/lib/gdal_i.lib grass_gis.lib grass_vect.lib grass_dbmibase.lib grass_dbmiclient.lib grass_gproj.lib
-+PLUGIN_DIR = $(OSGEO4W_ROOT)\apps\gdal-16\bin\gdalplugins
-+
-+#GRASS_LIBS = /LIBPATH:$(GRASS_BASE)/lib /LIBPATH:$(OSGEO4W_ROOT)/lib gdal_i.lib grass_gis.lib grass_vect.lib grass_dbmibase.lib grass_dbmiclient.lib grass_gproj.lib
-+#PLUGIN_DIR = $(OSGEO4W_ROOT)\bin\gdalplugins
-+
-+plugin: $(PLUGIN_DLL)
-+
-+$(PLUGIN_DLL): $(OBJ)
-+ link /debug /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) $(GDALLIB) $(GRASS_LIBS)
-+ if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2
-+ xcopy $(PLUGIN_DLL) $(PLUGIN_DIR) /y
-+
-+.cpp.obj:
-+ $(CC) $(CFLAGS) /c $*.cpp
-+
-+default: $(OBJ)
-+ xcopy /D /Y *.obj ..\o
-+
-+clean:
-+ -del *.obj
-+
-+plugin-install: $(PLUGIN_DLL)
-+ -mkdir $(PLUGINDIR)
-+ $(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
-Index: ogr/ogrfeature.cpp
-===================================================================
---- ogr/ogrfeature.cpp (revision 17458)
-+++ ogr/ogrfeature.cpp (working copy)
-@@ -976,8 +976,7 @@
- const char *OGRFeature::GetFieldAsString( int iField )
-
- {
--#define TEMP_BUFFER_SIZE 80
-- char szTempBuffer[TEMP_BUFFER_SIZE];
-+ char szTempBufferSize[80];
-
- CPLFree(m_pszTmpFieldValue);
- m_pszTmpFieldValue = NULL;
-@@ -989,7 +988,7 @@
- switch (iSpecialField)
- {
- case SPF_FID:
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE, "%ld", GetFID() );
-+ snprintf( szTempBuffer, sizeof szTempBufferSize, "%ld", GetFID() );
- return m_pszTmpFieldValue = CPLStrdup( szTempBuffer );
-
- case SPF_OGR_GEOMETRY:
-@@ -1038,7 +1037,7 @@
- }
- else if( poFDefn->GetType() == OFTInteger )
- {
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE,
-+ snprintf( szTempBuffer, sizeof szTempBufferSize,
- "%d", pauFields[iField].Integer );
- return m_pszTmpFieldValue = CPLStrdup( szTempBuffer );
- }
-@@ -1054,14 +1053,14 @@
- else
- strcpy( szFormat, "%.15g" );
-
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE,
-+ snprintf( szTempBuffer, sizeof szTempBufferSize,
- szFormat, pauFields[iField].Real );
-
- return m_pszTmpFieldValue = CPLStrdup( szTempBuffer );
- }
- else if( poFDefn->GetType() == OFTDateTime )
- {
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE,
-+ snprintf( szTempBuffer, sizeof szTempBufferSize,
- "%04d/%02d/%02d %2d:%02d:%02d",
- pauFields[iField].Date.Year,
- pauFields[iField].Date.Month,
-@@ -1086,17 +1085,17 @@
-
- if( nMinutes == 0 )
- snprintf( szTempBuffer+strlen(szTempBuffer),
-- TEMP_BUFFER_SIZE-strlen(szTempBuffer), "%02d", nHours );
-+ sizeof szTempBufferSize-strlen(szTempBuffer), "%02d", nHours );
- else
- snprintf( szTempBuffer+strlen(szTempBuffer),
-- TEMP_BUFFER_SIZE-strlen(szTempBuffer), "%02d%02d", nHours, nMinutes );
-+ sizeof szTempBufferSize-strlen(szTempBuffer), "%02d%02d", nHours, nMinutes );
- }
-
- return m_pszTmpFieldValue = CPLStrdup( szTempBuffer );
- }
- else if( poFDefn->GetType() == OFTDate )
- {
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE, "%04d/%02d/%02d",
-+ snprintf( szTempBuffer, sizeof szTempBufferSize, "%04d/%02d/%02d",
- pauFields[iField].Date.Year,
- pauFields[iField].Date.Month,
- pauFields[iField].Date.Day );
-@@ -1105,7 +1104,7 @@
- }
- else if( poFDefn->GetType() == OFTTime )
- {
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE, "%2d:%02d:%02d",
-+ snprintf( szTempBuffer, sizeof szTempBufferSize, "%2d:%02d:%02d",
- pauFields[iField].Date.Hour,
- pauFields[iField].Date.Minute,
- pauFields[iField].Date.Second );
-@@ -1117,7 +1116,7 @@
- char szItem[32];
- int i, nCount = pauFields[iField].IntegerList.nCount;
-
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE, "(%d:", nCount );
-+ snprintf( szTempBuffer, sizeof szTempBufferSize, "(%d:", nCount );
- for( i = 0; i < nCount; i++ )
- {
- snprintf( szItem, sizeof(szItem), "%d",
-@@ -1155,7 +1154,7 @@
- else
- strcpy( szFormat, "%.16g" );
-
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE, "(%d:", nCount );
-+ snprintf( szTempBuffer, sizeof szTempBufferSize, "(%d:", nCount );
- for( i = 0; i < nCount; i++ )
- {
- snprintf( szItem, sizeof(szItem), szFormat,
-@@ -1183,7 +1182,7 @@
- {
- int i, nCount = pauFields[iField].StringList.nCount;
-
-- snprintf( szTempBuffer, TEMP_BUFFER_SIZE, "(%d:", nCount );
-+ snprintf( szTempBuffer, sizeof szTempBufferSize, "(%d:", nCount );
- for( i = 0; i < nCount; i++ )
- {
- const char *pszItem = pauFields[iField].StringList.paList[i];
-@@ -1228,7 +1227,6 @@
- }
- else
- return "";
--#undef TEMP_BUFFER_SIZE
- }
-
- /************************************************************************/
-Index: frmts/grass/makefile.vc
-===================================================================
---- frmts/grass/makefile.vc (revision 0)
-+++ frmts/grass/makefile.vc (revision 0)
-@@ -0,0 +1,32 @@
-+SRC = grass57dataset.cpp
-+OBJ = grass57dataset.obj
-+PLUGIN_DLL = gdal_GRASS.dll
-+LDEBUG = /debug
-+
-+CFLAGS = -I $(OSGEO4W_ROOT)\apps\grass\grass-$(GRASS_VERSION)\include -I $(OSGEO4W_ROOT)\apps\gdal-16\include -I $(OSGEO4W_ROOT)\include /MD /EHsc
-+GRASS_LIBS = /LIBPATH:$(OSGEO4W_ROOT)\apps\grass\grass-$(GRASS_VERSION)\lib $(OSGEO4W_ROOT)\apps\gdal-16\lib\gdal_i.lib grass_gis.lib grass_i.lib grass_gproj.lib
-+PLUGINDIR = $(OSGEO4W_ROOT)\apps\gdal-16\bin\gdalplugins
-+
-+#CFLAGS = -I $(OSGEO4W_ROOT)\include -I $(OSGEO4W_ROOT)\apps\grass\grass-$(GRASS_VERSION)\include /MD /EHsc /Od /Zi /DNDEBUG /Fdgdal_GRASS.pdb
-+#GRASS_LIBS = /LIBPATH:c:/OSGeo4W/apps/grass/grass-$(GRASS_VERSION)/lib /LIBPATH:C:/OSGeo4W/lib gdal_i.lib grass_gis.lib grass_i.lib grass_gproj.lib
-+#PLUGINDIR = $(OSGEO4W_ROOT)\bin\gdalplugins
-+
-+plugin: $(PLUGIN_DLL)
-+
-+$(PLUGIN_DLL): $(OBJ)
-+ link /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) $(GDALLIB) $(GRASS_LIBS)
-+ if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2
-+ xcopy $(PLUGIN_DLL) $(PLUGINDIR) /y
-+
-+$(OBJ): $(SRC)
-+ $(CC) $(CFLAGS) /c $(SRC)
-+
-+default: $(OBJ)
-+ xcopy /D /Y *.obj ..\o
-+
-+clean:
-+ -del *.obj *.manifest *.dll *.lib *.exp *.pdb
-+
-+plugin-install: $(PLUGIN_DLL)
-+ -mkdir $(PLUGINDIR)
-+ $(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
Copied: grass/trunk/mswindows/osgeo4w/gdal-config (from rev 45429, grass/branches/develbranch_6/mswindows/osgeo4w/gdal-config)
===================================================================
--- grass/trunk/mswindows/osgeo4w/gdal-config (rev 0)
+++ grass/trunk/mswindows/osgeo4w/gdal-config 2011-02-28 12:04:38 UTC (rev 45484)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+
+CONFIG_LIBS="$OSGEO4W_ROOT_MSYS/lib/gdal_i.lib"
+CONFIG_DEP_LIBS="$OSGEO4W_ROOT_MSYS/lib/libpng13.lib $OSGEO4W_ROOT_MSYS/lib/zlib.lib"
+CONFIG_PREFIX="$OSGEO4W_ROOT_MSYS"
+CONFIG_CFLAGS="-I$OSGEO4W_ROOT_MSYS/include"
+CONFIG_VERSION="1.8.0"
+CONFIG_OGR_ENABLED=yes
+CONFIG_FORMATS="gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi idrisi bsb gif jpeg png pcraster "
+usage()
+{
+ cat <<EOF
+Usage: gdal-config [OPTIONS]
+Options:
+ [--prefix[=DIR]]
+ [--libs]
+ [--dep-libs]
+ [--cflags]
+ [--version]
+ [--ogr-enabled]
+ [--formats]
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+case $1 in
+ --libs)
+ echo $CONFIG_LIBS
+ ;;
+
+ --dep-libs)
+ echo $CONFIG_DEP_LIBS
+ ;;
+
+ --cflags)
+ echo $CONFIG_CFLAGS
+ ;;
+
+ --prefix)
+ echo $CONFIG_PREFIX
+ ;;
+
+ --version)
+ echo $CONFIG_VERSION
+ ;;
+
+ --ogr-enabled)
+ echo $CONFIG_OGR_ENABLED
+ ;;
+
+ --formats)
+ echo $CONFIG_FORMATS
+ ;;
+
+ *)
+ usage 1 1>&2
+ ;;
+
+esac
Deleted: grass/trunk/mswindows/osgeo4w/gdalplugins.cmd
===================================================================
--- grass/trunk/mswindows/osgeo4w/gdalplugins.cmd 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/mswindows/osgeo4w/gdalplugins.cmd 2011-02-28 12:04:38 UTC (rev 45484)
@@ -1,33 +0,0 @@
-path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem
-
-set VS90COMNTOOLS=%PROGRAMFILES%\Microsoft Visual Studio 9.0\Common7\Tools\
-call "%PROGRAMFILES%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
-set OSGEO4W_ROOT=%PROGRAMFILES%\OSGeo4W
-set P=%PATH%
-call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
-path %P%;%OSGEO4W_ROOT%\bin
-
-set VERSION=1.6.0
-set PACKAGE=1
-
-set P=%CD%
-
-echo OGR: %DATE% %TIME%
-cd ..\gdal-1.6\ogr\ogrsf_frmts\grass
-nmake /f makefile.vc clean
-nmake /f makefile.vc GRASS_VERSION=%1 plugin
-
-echo GDAL: %DATE% %TIME%
-cd ..\..\..\frmts\grass
-nmake /f makefile.vc clean
-nmake /f makefile.vc GRASS_VERSION=%1 plugin
-
-cd %P%
-
-mkdir package\gdal16-grass
-tar -C %OSGEO4W_ROOT% -cjf package/gdal16-grass-%VERSION%-%PACKAGE%.tar.bz2 ^
- apps/gdal-16/bin/gdalplugins/ogr_GRASS.dll ^
- apps/gdal-16/bin/gdalplugins/gdal_GRASS.dll
-
-:end
-echo END: %DATE% %TIME%
Copied: grass/trunk/mswindows/osgeo4w/geos-config (from rev 45429, grass/branches/develbranch_6/mswindows/osgeo4w/geos-config)
===================================================================
--- grass/trunk/mswindows/osgeo4w/geos-config (rev 0)
+++ grass/trunk/mswindows/osgeo4w/geos-config 2011-02-28 12:04:38 UTC (rev 45484)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+usage()
+{
+ cat <<EOF
+Usage: geos-config [OPTIONS]
+Options:
+ [--prefix]
+ [--version]
+ [--libs]
+ [--cflags]
+ [--ldflags]
+ [--includes]
+ [--jtsport]
+EOF
+ exit $1
+}
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+while test $# -gt 0; do
+case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+esac
+case $1 in
+ --prefix)
+ echo $OSGEO4W_ROOT_MSYS
+ ;;
+ --version)
+ echo 3.2.2
+ ;;
+ --cflags)
+ echo -I$OSGEO4W_ROOT_MSYS/include
+ ;;
+ --libs)
+ echo $OSGEO4W_ROOT_MSYS/lib/geos_c_i.lib
+ ;;
+ --ldflags)
+ echo
+ ;;
+ --includes)
+ echo $OSGEO4W_ROOT_MSYS/include
+ ;;
+ --jtsport)
+ echo 1.10.0
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+
Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/mswindows/osgeo4w/package.sh 2011-02-28 12:04:38 UTC (rev 45484)
@@ -1,65 +1,115 @@
#!/c/OSGeo4W/apps/msys/bin/sh
-###set -e
+set -e
+PWD="$(pwd)"
+
if ! [ -d mswindows ]; then
echo Start from GRASS toplevel dir
exit 1
fi
-OSGEO4W_ROOT_MSYS=/c/OSGeo4W
-PATH=.:/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem
-export OSGEO4W_ROOT_MSYS PATH
+if ! [ -d /tmp ]; then
+ mkdir /tmp
+ if ! [ -d /tmp ]; then
+ echo /tmp does not exists
+ exit 1
+ fi
+fi
-version() {
- (
- read MAJOR
- read MINOR
- read PATCH
- echo $MAJOR.$MINOR.$PATCH
- ) < include/VERSION
+export PACKAGE=${1:-1}
+export POSTFIX=$2
+export OSGEO4W_ROOT_MSYS=/c/OSGeo4W
+export PATH=.:/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/Subversion:$PWD/mswindows/osgeo4w
+
+T0=$(date +%s)
+LT=$T0
+CS=""
+
+log() {
+ local D T
+ NOW=$(date)
+ T=$(date +%s)
+
+ if [ -n "$CS" ]; then
+ local D H M S
+ (( S=T-$LT ))
+ (( M=S/60 )); (( S=S%60 ))
+ (( H=M/60 )); (( M=M%60 ))
+ (( D=H/24 )); (( H=H%24 ))
+
+ echo -n "$NOW: FINISHED $CS AFTER "
+ (( D>0 )) && echo -n "${D}d"
+ (( H>0 )) && echo -n "${H}h"
+ (( M>0 )) && echo -n "${M}m"
+ echo "${S}s"
+ fi
+
+ CS="$@"
+ LT=$T
+ if [ -n "$CS" ]; then
+ echo $NOW: STARTING $CS
+ elif [ -n "$T0" ]; then
+ CS="COMPLETE RUN"
+ LT=$T0
+ T0=""
+ log
+ fi
}
-VERSION=$(version)
-PACKAGE=3
-export VERSION PACKAGE
+exec 3<include/VERSION
+read MAJOR <&3
+read MINOR <&3
+read PATCH <&3
-GRASS_PYTHON=/c/OSGeo4W/apps/Python25
-PYTHONHOME=/c/OSGeo4W/apps/Python25
-export GRASS_PYTHON PYTHONHOME
+export VERSION=$MAJOR.$MINOR.$PATCH
-LOG=mswindows/osgeo4w/package.log
+export GRASS_PYTHON=/c/OSGeo4W/apps/Python25
+export PYTHONHOME=/c/OSGeo4W/apps/Python25
-report() {
- echo $(date): STARTING $1
- echo $(date): STARTING $1 >>$LOG
-}
+if [ -f mswindows/osgeo4w/package.log ]; then
+ i=0
+ while [ -f mswindows/osgeo4w/package.log.$i ]; do
+ (( i++ ))
+ done
+ mv mswindows/osgeo4w/package.log mswindows/osgeo4w/package.log.$i
+fi
-echo $(date): START > $LOG
+exec 3>&1 >> mswindows/osgeo4w/package.log 2>&1
+[ -d mswindows/osgeo4w/lib ] || mkdir mswindows/osgeo4w/lib
+cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/libsqlite3.a
+cp -uv $OSGEO4W_ROOT_MSYS/lib/proj.lib mswindows/osgeo4w/lib/libproj.a
+cp -uv $OSGEO4W_ROOT_MSYS/lib/libtiff_i.lib mswindows/osgeo4w/lib/libtiff.a
+cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.a
+cp -uv $OSGEO4W_ROOT_MSYS/lib/jpeg_i.lib mswindows/osgeo4w/lib/libjpeg.a
+cp -uv $OSGEO4W_ROOT_MSYS/lib/zlib.lib mswindows/osgeo4w/lib/libz.a
+
if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
- if [ -e include/Make/Platform.make ] ; then
- report "distclean"
- make distclean >>$LOG 2>&1
+ if [ -e include/Make/Grass.make ] ; then
+ log make distclean
+ make distclean
fi
- report "configure"
+ log configure
./configure \
- --with-libs="$OSGEO4W_ROOT_MSYS/apps/gdal-16/lib $OSGEO4W_ROOT_MSYS/lib" \
- --with-includes="$OSGEO4W_ROOT_MSYS/apps/gdal-16/include $OSGEO4W_ROOT_MSYS/include" \
- --exec-prefix=$OSGEO4W_ROOT_MSYS/apps/grass \
+ --with-libs="$OSGEO4W_ROOT_MSYS/lib $PWD/mswindows/osgeo4w/lib" \
+ --with-includes=$OSGEO4W_ROOT_MSYS/include \
+ --exec-prefix=$OSGEO4W_ROOT_MSYS/bin \
--libexecdir=$OSGEO4W_ROOT_MSYS/bin \
--prefix=$OSGEO4W_ROOT_MSYS/apps/grass \
--includedir=$OSGEO4W_ROOT_MSYS/include \
--disable-x --without-x \
--with-cxx \
--enable-shared \
+ --enable-largefile \
--with-opengl=windows \
--with-fftw \
--with-freetype \
--with-proj-share=$OSGEO4W_ROOT_MSYS/share/proj \
- --with-gdal=$OSGEO4W_ROOT_MSYS/bin/gdal-config \
+ --with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
+ --with-geos=$PWD/mswindows/osgeo4w/geos-config \
--with-tcltk \
--with-sqlite \
--with-postgres \
@@ -67,23 +117,75 @@
--with-regex \
--with-nls \
--with-freetype-includes=$OSGEO4W_ROOT_MSYS/include/freetype2 \
- --without-cairo \
- --enable-largefile \
- --with-odbc >>$LOG 2>&1
-
+ --with-odbc
+
touch mswindows/osgeo4w/configure-stamp
fi
-report "make"
-make >>$LOG 2>&1
+log make
+make -k || make || ( cat error.log >&3 && false )
-report "make install"
-make install >>$LOG 2>&1
+log make install
+make install
-report "cleanup"
-mv "$OSGEO4W_ROOT_MSYS"/apps/grass/grass-$VERSION/lib/*.$VERSION.dll \
- "$OSGEO4W_ROOT_MSYS/bin"
+log cleanup
+mv $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
+mv $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h.mingw
+cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
+cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
+if [ -n "$POSTFIX" ] ; then
+ sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$POSTFIX#g" mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$POSTFIX.bat.tmpl
+ sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$POSTFIX#g" mswindows/osgeo4w/grass.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$POSTFIX.tmpl
+ sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$POSTFIX#g" mswindows/osgeo4w/ini.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$POSTFIX-env.bat.tmpl
+ sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$POSTFIX#g" mswindows/osgeo4w/postinstall.bat >$OSGEO4W_ROOT_MSYS/etc/postinstall/grass$POSTFIX.bat
+ sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$POSTFIX#g" mswindows/osgeo4w/preremove.bat >$OSGEO4W_ROOT_MSYS/etc/preremove/grass$POSTFIX.bat
+fi
-echo $(date): END >> $LOG
+if [ -f /c/mingw/bin/libgnurx-0.dll ]; then
+ cp /c/mingw/bin/libgnurx-0.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
+ cp /c/mingw/bin/libiconv-2.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
+ cp /c/mingw/bin/libintl-8.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
+fi
+P="$(pwd -W)"
+P="${P//\//\\\\}\\\\dist.i686-pc-mingw32"
+
+sed -e "s#$P#@osgeo4w@#g" $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap.tmpl
+rm "$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap"
+if [ -f $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass$MAJOR$MINOR ]; then
+ sed -e "s#$P#@osgeo4w_msys@#g" $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass$MAJOR$MINOR >$OSGEO4W_ROOT_MSYS/bin/grass$POSTFIX.tmpl
+ rm $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass$MAJOR$MINOR
+elif [ -f dist.i686-pc-mingw32/grass$MAJOR$MINOR ]; then
+ sed -e "s#$P#@osgeo4w_msys@/apps/grass/grass-$VERSION#g" dist.i686-pc-mingw32/grass$MAJOR$MINOR.tmp >$OSGEO4W_ROOT_MSYS/bin/grass$POSTFIX.tmpl
+fi
+
+if [ -n "$1" ] && [ -n "$2" ] ; then
+ log building vc libraries
+ sh mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin/*.$VERSION.dll
+ mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib
+
+ # log BUILDING GDAL GRASS plugins
+ # $COMSPEC /c "mswindows\\osgeo4w\\gdalplugins.cmd $VERSION"
+
+ log CREATING PACKAGES
+ mkdir -p package/grass$POSTFIX
+
+ PDIR=$PWD/package
+ cd $OSGEO4W_ROOT_MSYS
+
+ tar -cjf $PDIR/grass$POSTFIX/grass$POSTFIX-$VERSION-$PACKAGE.tar.bz2 \
+ apps/grass/grass-$VERSION \
+ bin/grass$POSTFIX.bat.tmpl \
+ bin/grass$POSTFIX.tmpl \
+ bin/grass$POSTFIX-env.bat.tmpl \
+ etc/postinstall/grass$POSTFIX.bat \
+ etc/preremove/grass$POSTFIX.bat
+
+ cd $PDIR/..
+ svn diff >/tmp/grass$POSTFIX-$VERSION.diff
+ tar -C /tmp -cjf $PDIR/grass$POSTFIX/grass$POSTFIX-$VERSION-$PACKAGE-src.tar.bz2 grass$POSTFIX-$VERSION.diff
+fi
+
+log
+
exit 0
Modified: grass/trunk/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/postinstall.bat 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/mswindows/osgeo4w/postinstall.bat 2011-02-28 12:04:38 UTC (rev 45484)
@@ -1,15 +1,14 @@
-set ICON=%OSGEO4W_ROOT%\apps\grass\grass-7.0.0svn\etc\gui\icons\grass.ico
-set BATCH=%OSGEO4W_ROOT%\bin\grass70.bat
+set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass.ico
+set BATCH=%OSGEO4W_ROOT%\bin\grass at POSTFIX@.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass70.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-7.0.0svn\etc\fontcap
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\bin\grass70
+textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@-env.bat
+textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.bat
+textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@
+textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
-mkdir "%OSGEO4W_STARTMENU%\GRASS GIS"
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS\wxPython.lnk" "%BATCH%" "-wxpython" \ "wxPython interface" 1 "%ICON%"
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS\TclTk.lnk" "%BATCH%" "-tcltk" \ "Tcl/Tk interface" 1 "%ICON%"
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS\Text.lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%"
+mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\wxPython @VERSION at .lnk" "%BATCH%" "-wxpython" \ "wxPython interface" 1 "%ICON%"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\Text @VERSION at .lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%"
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS (wxpython).lnk" "%BATCH%" "-wxpython" \ "wxPython" 1 "%ICON%"
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS (TclTk).lnk" "%BATCH%" "-tcltk" \ "Tcl/Tk" 1 "%ICON%"
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS (Text).lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%"
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (wxpython).lnk" "%BATCH%" "-wxpython" \ "wxPython" 1 "%ICON%"
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (Text).lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%"
Modified: grass/trunk/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/preremove.bat 2011-02-28 11:11:42 UTC (rev 45483)
+++ grass/trunk/mswindows/osgeo4w/preremove.bat 2011-02-28 12:04:38 UTC (rev 45484)
@@ -1,15 +1,11 @@
-del "%OSGEO4W_STARTMENU%\GRASS.lnk"
-del "%ALLUSERSPROFILE%\Desktop\grass.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\wxpython.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\text.lnk"
+rmdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
-del "%OSGEO4W_STARTMENU%\GRASS GIS\wxpython.lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS\tcltk.lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS\text.lnk"
-rmdir "%OSGEO4W_STARTMENU%\GRASS GIS"
+del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (wxPython).lnk"
+del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (Text).lnk"
-del "%ALLUSERSPROFILE%\Desktop\GRASS GIS (wxPython).lnk"
-del "%ALLUSERSPROFILE%\Desktop\GRASS GIS (TclTk).lnk"
-del "%ALLUSERSPROFILE%\Desktop\GRASS GIS (Text).lnk"
-
-del "%OSGEO4W_ROOT%"\apps\grass\grass-7.0.0svn\etc\fontcap
-del "%OSGEO4W_ROOT%"\apps\grass\bin\grass70
-del "%OSGEO4W_ROOT%"\bin\grass70.bat
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
+del "%OSGEO4W_ROOT%"\apps\grass\bin\grass at POSTFIX@
+del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@-env.bat
+del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.bat
More information about the grass-commit
mailing list