[GRASS-SVN] r45515 - in grass/branches/releasebranch_6_4: .
general/g.parser general/g.region include lib/db
lib/db/dbmi_base lib/db/dbmi_client lib/db/dbmi_driver
lib/g3d lib/gis lib/proj locale mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Mar 2 06:33:10 EST 2011
Author: martinl
Date: 2011-03-02 03:33:10 -0800 (Wed, 02 Mar 2011)
New Revision: 45515
Added:
grass/branches/releasebranch_6_4/lib/proj/ftol.c
grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-config
grass/branches/releasebranch_6_4/mswindows/osgeo4w/geos-config
grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl
grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl
Removed:
grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-1.6.diff
grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdalplugins.cmd
grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.bat.tmpl
grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.tmpl
Modified:
grass/branches/releasebranch_6_4/
grass/branches/releasebranch_6_4/configure
grass/branches/releasebranch_6_4/configure.in
grass/branches/releasebranch_6_4/general/g.parser/Makefile
grass/branches/releasebranch_6_4/general/g.region/printwindow.c
grass/branches/releasebranch_6_4/include/gprojects.h
grass/branches/releasebranch_6_4/include/proto_dbmi.h
grass/branches/releasebranch_6_4/lib/db/dbmi_base/alloc.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/cursor.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/dbmscap.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/dirent.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/error.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/handle.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/index.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/string.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/table.c
grass/branches/releasebranch_6_4/lib/db/dbmi_base/value.c
grass/branches/releasebranch_6_4/lib/db/dbmi_client/copy_tab.c
grass/branches/releasebranch_6_4/lib/db/dbmi_client/shutdown.c
grass/branches/releasebranch_6_4/lib/db/dbmi_driver/d_close_cur.c
grass/branches/releasebranch_6_4/lib/db/dbmi_driver/driver_state.c
grass/branches/releasebranch_6_4/lib/db/dbmilib.dox
grass/branches/releasebranch_6_4/lib/g3d/g3dcache.c
grass/branches/releasebranch_6_4/lib/gis/Makefile
grass/branches/releasebranch_6_4/lib/proj/Makefile
grass/branches/releasebranch_6_4/locale/Makefile
grass/branches/releasebranch_6_4/mswindows/osgeo4w/
grass/branches/releasebranch_6_4/mswindows/osgeo4w/config.h.vc
grass/branches/releasebranch_6_4/mswindows/osgeo4w/ini.bat.tmpl
grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
Log:
major winGRASS update (based on r45429)
Property changes on: grass/branches/releasebranch_6_4
___________________________________________________________________
Deleted: svn:mergeinfo
- /grass/branches/develbranch_6:44934
/grass/branches/releasebranch_6_4:44816
/grass/trunk:44830,44833,44896,44948,44951
Modified: grass/branches/releasebranch_6_4/configure
===================================================================
--- grass/branches/releasebranch_6_4/configure 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/configure 2011-03-02 11:33:10 UTC (rev 45515)
@@ -8267,19 +8267,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:8278: checking for initGEOS in -lgeos_c_i" >&5
+ac_lib_var=`echo geos_c_i'_'initGEOS | sed 'y%./+-%__p_%'`
+
+ac_save_LIBS="$LIBS"
+LIBS="-lgeos_c_i $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8284 "configure"
+#include "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:8295: \"$ac_link\") 1>&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:8277: checking for initGEOS in -lgeos_c" >&5
+echo "configure:8331: 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 8283 "configure"
+#line 8337 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8290,7 +8344,7 @@
initGEOS()
; return 0; }
EOF
-if { (eval echo configure:8294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8319,6 +8373,8 @@
LDFLAGS=${ac_save_ldflags}
+ fi
+
cat >> confdefs.h <<\EOF
#define HAVE_GEOS 1
EOF
@@ -8333,7 +8389,7 @@
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:8337: checking whether to use TIFF" >&5
+echo "configure:8393: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -8353,7 +8409,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:8357: checking for location of TIFF includes" >&5
+echo "configure:8413: 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; }
@@ -8379,15 +8435,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8383: checking for $ac_hdr" >&5
+echo "configure:8439: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8386 "configure"
+#line 8442 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8447: \"$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*
@@ -8421,7 +8477,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:8425: checking for location of TIFF library" >&5
+echo "configure:8481: 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; }
@@ -8452,13 +8508,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8456: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8512: 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 8462 "configure"
+#line 8518 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8469,7 +8525,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8488,13 +8544,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8492: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8548: 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 8498 "configure"
+#line 8554 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8505,7 +8561,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8524,13 +8580,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8528: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8584: 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 8534 "configure"
+#line 8590 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8541,7 +8597,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8560,13 +8616,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8564: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8620: 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 8570 "configure"
+#line 8626 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8577,7 +8633,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8596,13 +8652,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8600: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8656: 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 8606 "configure"
+#line 8662 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8613,7 +8669,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8632,13 +8688,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8636: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8692: 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 8642 "configure"
+#line 8698 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8649,7 +8705,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8668,13 +8724,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8672: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8728: 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 8678 "configure"
+#line 8734 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8685,7 +8741,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8704,13 +8760,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8708: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8764: 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 8714 "configure"
+#line 8770 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8721,7 +8777,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8819,7 +8875,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:8823: checking whether to use PNG" >&5
+echo "configure:8879: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -8838,7 +8894,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:8842: checking for location of PNG includes" >&5
+echo "configure:8898: 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; }
@@ -8864,15 +8920,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8868: checking for $ac_hdr" >&5
+echo "configure:8924: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8871 "configure"
+#line 8927 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8932: \"$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*
@@ -8906,7 +8962,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:8910: checking for location of PNG library" >&5
+echo "configure:8966: 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; }
@@ -8931,13 +8987,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8935: checking for png_read_image in -lpng" >&5
+echo "configure:8991: 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 8941 "configure"
+#line 8997 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8948,7 +9004,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:8952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9008: \"$ac_link\") 1>&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,7 +9046,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:8994: checking whether to use PostgreSQL" >&5
+echo "configure:9050: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -9017,7 +9073,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:9021: checking for location of PostgreSQL includes" >&5
+echo "configure:9077: 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; }
@@ -9043,15 +9099,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9047: checking for $ac_hdr" >&5
+echo "configure:9103: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9050 "configure"
+#line 9106 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9089,7 +9145,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:9093: checking for location of PostgreSQL library" >&5
+echo "configure:9149: 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; }
@@ -9118,13 +9174,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9122: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9178: 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 9128 "configure"
+#line 9184 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9135,7 +9191,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9154,13 +9210,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9158: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9214: 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 9164 "configure"
+#line 9220 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9171,7 +9227,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9190,13 +9246,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9194: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9250: 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 9200 "configure"
+#line 9256 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9207,7 +9263,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9226,13 +9282,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9230: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9286: 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 9236 "configure"
+#line 9292 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9243,7 +9299,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9300,13 +9356,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9304: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9360: 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 9310 "configure"
+#line 9366 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9317,7 +9373,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9339,13 +9395,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9343: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9399: 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 9349 "configure"
+#line 9405 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9356,7 +9412,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9399,7 +9455,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:9403: checking whether to use MySQL" >&5
+echo "configure:9459: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -9419,7 +9475,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:9423: checking for location of MySQL includes" >&5
+echo "configure:9479: 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; }
@@ -9445,15 +9501,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9449: checking for $ac_hdr" >&5
+echo "configure:9505: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9452 "configure"
+#line 9508 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -9490,7 +9546,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:9494: checking for location of MySQL library" >&5
+echo "configure:9550: 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; }
@@ -9521,13 +9577,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9525: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9581: 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 9531 "configure"
+#line 9587 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9538,7 +9594,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9557,13 +9613,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9561: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9617: 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 9567 "configure"
+#line 9623 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9574,7 +9630,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9593,13 +9649,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9597: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9653: 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 9603 "configure"
+#line 9659 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9610,7 +9666,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9629,13 +9685,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9633: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9689: 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 9639 "configure"
+#line 9695 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9646,7 +9702,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9665,13 +9721,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9669: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9725: 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 9675 "configure"
+#line 9731 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9682,7 +9738,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9701,13 +9757,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9705: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9761: 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 9711 "configure"
+#line 9767 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9718,7 +9774,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9737,13 +9793,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9741: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9797: 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 9747 "configure"
+#line 9803 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9754,7 +9810,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9773,13 +9829,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9777: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9833: 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 9783 "configure"
+#line 9839 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9790,7 +9846,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9880,7 +9936,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:9884: checking for $ac_word" >&5
+echo "configure:9940: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -9921,10 +9977,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:9925: checking for mysql_server_init" >&5
+echo "configure:9981: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 9928 "configure"
+#line 9984 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -9947,7 +10003,7 @@
; return 0; }
EOF
-if { (eval echo configure:9951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10007: \"$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
@@ -9985,7 +10041,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:9989: checking whether to use SQLite" >&5
+echo "configure:10045: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -10005,7 +10061,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:10009: checking for location of SQLite includes" >&5
+echo "configure:10065: 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; }
@@ -10031,15 +10087,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10035: checking for $ac_hdr" >&5
+echo "configure:10091: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10038 "configure"
+#line 10094 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10099: \"$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*
@@ -10082,7 +10138,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:10086: checking for location of SQLite library" >&5
+echo "configure:10142: 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; }
@@ -10111,13 +10167,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10115: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10171: 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 10121 "configure"
+#line 10177 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10128,7 +10184,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10147,13 +10203,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10151: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10207: 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 10157 "configure"
+#line 10213 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10164,7 +10220,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10183,13 +10239,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10187: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10243: 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 10193 "configure"
+#line 10249 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10200,7 +10256,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10219,13 +10275,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10223: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10279: 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 10229 "configure"
+#line 10285 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10236,7 +10292,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10305,7 +10361,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10309: checking whether to use FFMPEG" >&5
+echo "configure:10365: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -10325,7 +10381,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10329: checking for location of FFMPEG includes" >&5
+echo "configure:10385: 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; }
@@ -10351,15 +10407,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10355: checking for $ac_hdr" >&5
+echo "configure:10411: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10358 "configure"
+#line 10414 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10419: \"$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*
@@ -10395,15 +10451,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10399: checking for $ac_hdr" >&5
+echo "configure:10455: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10402 "configure"
+#line 10458 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10463: \"$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*
@@ -10439,15 +10495,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10443: checking for $ac_hdr" >&5
+echo "configure:10499: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10446 "configure"
+#line 10502 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10507: \"$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*
@@ -10490,7 +10546,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10494: checking for location of FFMPEG library" >&5
+echo "configure:10550: 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; }
@@ -10517,13 +10573,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10521: checking for av_free in -lavutil" >&5
+echo "configure:10577: 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 10527 "configure"
+#line 10583 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10534,7 +10590,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10553,13 +10609,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10557: checking for av_free in -lavutil" >&5
+echo "configure:10613: 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 10563 "configure"
+#line 10619 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10570,7 +10626,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10615,13 +10671,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10619: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10675: 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 10625 "configure"
+#line 10681 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10632,7 +10688,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10651,13 +10707,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10655: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10711: 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 10661 "configure"
+#line 10717 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10668,7 +10724,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10713,13 +10769,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10717: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10773: 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 10723 "configure"
+#line 10779 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10730,7 +10786,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10749,13 +10805,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10753: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10809: 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 10759 "configure"
+#line 10815 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10766,7 +10822,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10825,7 +10881,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:10829: checking whether to use OpenGL" >&5
+echo "configure:10885: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -10859,7 +10915,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:10863: checking for location of OpenGL includes" >&5
+echo "configure:10919: 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; }
@@ -10885,15 +10941,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10889: checking for $ac_hdr" >&5
+echo "configure:10945: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10892 "configure"
+#line 10948 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10953: \"$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*
@@ -10927,7 +10983,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:10931: checking for location of OpenGL library" >&5
+echo "configure:10987: 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; }
@@ -10956,13 +11012,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10960: checking for glBegin in -lGL" >&5
+echo "configure:11016: 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 10966 "configure"
+#line 11022 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10973,7 +11029,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:10977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10992,13 +11048,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:10996: checking for glBegin in -lGL" >&5
+echo "configure:11052: 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 11002 "configure"
+#line 11058 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11009,7 +11065,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11028,13 +11084,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11032: checking for glBegin in -lGL" >&5
+echo "configure:11088: 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 11038 "configure"
+#line 11094 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11045,7 +11101,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11105: \"$ac_link\") 1>&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,13 +11120,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11068: checking for glBegin in -lGL" >&5
+echo "configure:11124: 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 11074 "configure"
+#line 11130 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11081,7 +11137,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11143,13 +11199,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11147: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11203: 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 11153 "configure"
+#line 11209 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11160,7 +11216,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11179,13 +11235,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11183: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11239: 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 11189 "configure"
+#line 11245 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11196,7 +11252,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11240,10 +11296,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $OPENGLLIB"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:11244: checking for glXCreatePbuffer" >&5
+echo "configure:11300: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 11247 "configure"
+#line 11303 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -11266,7 +11322,7 @@
; return 0; }
EOF
-if { (eval echo configure:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11326: \"$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
@@ -11288,10 +11344,10 @@
fi
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11292: checking for glXCreateGLXPixmap" >&5
+echo "configure:11348: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 11295 "configure"
+#line 11351 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -11314,7 +11370,7 @@
; return 0; }
EOF
-if { (eval echo configure:11318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11374: \"$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
@@ -11353,7 +11409,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11357: checking for location of OpenGL includes" >&5
+echo "configure:11413: 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; }
@@ -11379,15 +11435,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11383: checking for $ac_hdr" >&5
+echo "configure:11439: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11386 "configure"
+#line 11442 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11447: \"$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*
@@ -11422,10 +11478,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$with_opengl_libs $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11426: checking for glBegin" >&5
+echo "configure:11482: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 11429 "configure"
+#line 11485 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -11448,7 +11504,7 @@
; return 0; }
EOF
-if { (eval echo configure:11452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11508: \"$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
@@ -11463,10 +11519,10 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11467: checking for gluBeginCurve" >&5
+echo "configure:11523: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 11470 "configure"
+#line 11526 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -11489,7 +11545,7 @@
; return 0; }
EOF
-if { (eval echo configure:11493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11549: \"$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
@@ -11533,7 +11589,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11537: checking for location of OpenGL includes" >&5
+echo "configure:11593: 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; }
@@ -11559,15 +11615,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11563: checking for $ac_hdr" >&5
+echo "configure:11619: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11566 "configure"
+#line 11622 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11627: \"$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*
@@ -11601,7 +11657,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11605: checking for location of OpenGL library" >&5
+echo "configure:11661: 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; }
@@ -11626,18 +11682,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11630: checking for OpenGL library" >&5
+echo "configure:11686: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 11634 "configure"
+#line 11690 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:11641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11661,18 +11717,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11665: checking for GLU library" >&5
+echo "configure:11721: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 11669 "configure"
+#line 11725 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:11676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11721,7 +11777,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:11725: checking whether to use Tcl/Tk" >&5
+echo "configure:11781: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -11741,7 +11797,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:11745: checking for location of Tcl/Tk includes" >&5
+echo "configure:11801: 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; }
@@ -11767,15 +11823,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11771: checking for $ac_hdr" >&5
+echo "configure:11827: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11774 "configure"
+#line 11830 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11835: \"$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*
@@ -11812,15 +11868,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11816: checking for $ac_hdr" >&5
+echo "configure:11872: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11819 "configure"
+#line 11875 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11880: \"$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*
@@ -11853,7 +11909,7 @@
# Tcl/Tk version checks
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:11857: checking Tcl version" >&5
+echo "configure:11913: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -11861,7 +11917,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11865 "configure"
+#line 11921 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11873,7 +11929,7 @@
}
EOF
-if { (eval echo configure:11877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11933: \"$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
@@ -11891,7 +11947,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:11895: checking Tk version" >&5
+echo "configure:11951: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -11899,7 +11955,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11903 "configure"
+#line 11959 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11911,7 +11967,7 @@
}
EOF
-if { (eval echo configure:11915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
tk_ver=`cat conftestdata`
echo "$ac_t""$tk_ver" 1>&6
@@ -11942,7 +11998,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:11946: checking for location of Tcl/Tk library" >&5
+echo "configure:12002: 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; }
@@ -11982,13 +12038,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:11986: checking for Tcl_Init in -ltcl" >&5
+echo "configure:12042: 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 11992 "configure"
+#line 12048 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11999,7 +12055,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12018,13 +12074,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:12022: checking for Tcl_Init in -ltcl" >&5
+echo "configure:12078: 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 12028 "configure"
+#line 12084 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12035,7 +12091,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12062,13 +12118,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12066: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:12122: 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 12072 "configure"
+#line 12128 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12079,7 +12135,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12098,13 +12154,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12102: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:12158: 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 12108 "configure"
+#line 12164 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12115,7 +12171,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12142,13 +12198,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12146: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:12202: 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 12152 "configure"
+#line 12208 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12159,7 +12215,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12178,13 +12234,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12182: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:12238: 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 12188 "configure"
+#line 12244 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12195,7 +12251,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12273,13 +12329,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:12277: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:12333: 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 12283 "configure"
+#line 12339 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12290,7 +12346,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12309,13 +12365,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:12313: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:12369: 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 12319 "configure"
+#line 12375 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12326,7 +12382,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12353,13 +12409,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12357: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:12413: 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 12363 "configure"
+#line 12419 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12370,7 +12426,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12389,13 +12445,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:12393: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:12449: 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 12399 "configure"
+#line 12455 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12406,7 +12462,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12433,13 +12489,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12437: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:12493: 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 12443 "configure"
+#line 12499 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12450,7 +12506,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12469,13 +12525,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:12473: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:12529: 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 12479 "configure"
+#line 12535 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12486,7 +12542,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:12490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12576,13 +12632,13 @@
do
# add only if in MACOSX_ARCHS
echo $ac_n "checking for Tcl_Init in -l$tlib""... $ac_c" 1>&6
-echo "configure:12580: checking for Tcl_Init in -l$tlib" >&5
+echo "configure:12636: 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 12586 "configure"
+#line 12642 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12593,7 +12649,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:12597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12642,7 +12698,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:12646: checking whether to use ODBC" >&5
+echo "configure:12702: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -12661,7 +12717,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:12665: checking for location of ODBC includes" >&5
+echo "configure:12721: 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; }
@@ -12687,15 +12743,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12691: checking for $ac_hdr" >&5
+echo "configure:12747: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12694 "configure"
+#line 12750 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12755: \"$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*
@@ -12729,7 +12785,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:12733: checking for location of ODBC library" >&5
+echo "configure:12789: 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; }
@@ -12754,13 +12810,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:12758: checking for SQLConnect in -lodbc" >&5
+echo "configure:12814: 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 12764 "configure"
+#line 12820 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12771,7 +12827,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12796,13 +12852,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:12800: checking for SQLConnect in -liodbc" >&5
+echo "configure:12856: 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 12806 "configure"
+#line 12862 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12813,7 +12869,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12838,11 +12894,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:12842: checking for ODBC library" >&5
+echo "configure:12898: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 12846 "configure"
+#line 12902 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -12850,7 +12906,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:12854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -12899,7 +12955,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:12903: checking whether to use FFTW" >&5
+echo "configure:12959: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -12918,7 +12974,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:12922: checking for location of FFTW includes" >&5
+echo "configure:12978: 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; }
@@ -12944,15 +13000,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12948: checking for $ac_hdr" >&5
+echo "configure:13004: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12951 "configure"
+#line 13007 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13012: \"$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*
@@ -12980,15 +13036,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12984: checking for $ac_hdr" >&5
+echo "configure:13040: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12987 "configure"
+#line 13043 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13048: \"$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*
@@ -13016,15 +13072,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13020: checking for $ac_hdr" >&5
+echo "configure:13076: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13023 "configure"
+#line 13079 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13084: \"$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*
@@ -13070,7 +13126,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:13074: checking for location of FFTW library" >&5
+echo "configure:13130: 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; }
@@ -13095,13 +13151,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:13099: checking for fftw_execute in -lfftw3" >&5
+echo "configure:13155: 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 13105 "configure"
+#line 13161 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13112,7 +13168,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:13116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13137,13 +13193,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:13141: checking for fftwnd_one in -lfftw" >&5
+echo "configure:13197: 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 13147 "configure"
+#line 13203 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13154,7 +13210,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:13158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13179,13 +13235,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:13183: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:13239: 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 13189 "configure"
+#line 13245 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13196,7 +13252,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:13200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13253,7 +13309,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:13257: checking whether to use BLAS" >&5
+echo "configure:13313: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -13274,7 +13330,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:13278: checking for location of BLAS includes" >&5
+echo "configure:13334: 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; }
@@ -13294,7 +13350,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:13298: checking for location of BLAS library" >&5
+echo "configure:13354: 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; }
@@ -13320,15 +13376,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13324: checking for $ac_hdr" >&5
+echo "configure:13380: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13327 "configure"
+#line 13383 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13388: \"$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*
@@ -13363,13 +13419,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:13367: checking for dnrm2_ in -lblas" >&5
+echo "configure:13423: 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 13373 "configure"
+#line 13429 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13380,7 +13436,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:13384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13399,13 +13455,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:13403: checking for dnrm2_ in -lblas" >&5
+echo "configure:13459: 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 13409 "configure"
+#line 13465 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13416,7 +13472,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:13420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13460,13 +13516,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:13464: checking for ATL_xerbla in -latlas" >&5
+echo "configure:13520: 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 13470 "configure"
+#line 13526 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13477,7 +13533,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:13481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13492,13 +13548,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:13496: checking for sgemm_ in -lf77blas" >&5
+echo "configure:13552: 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 13502 "configure"
+#line 13558 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13509,7 +13565,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13524,13 +13580,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:13528: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:13584: 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 13534 "configure"
+#line 13590 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13541,7 +13597,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:13545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13587,16 +13643,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:13591: checking for sgemm in $vlib_flags" >&5
+echo "configure:13647: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 13593 "configure"
+#line 13649 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:13600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13656: \"$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
@@ -13614,13 +13670,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:13618: checking for sgemm_ in -lblas" >&5
+echo "configure:13674: 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 13624 "configure"
+#line 13680 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13631,7 +13687,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13646,13 +13702,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:13650: checking for dgemm_ in -ldgemm" >&5
+echo "configure:13706: 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 13656 "configure"
+#line 13712 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13663,7 +13719,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:13667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13678,13 +13734,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:13682: checking for sgemm_ in -lsgemm" >&5
+echo "configure:13738: 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 13688 "configure"
+#line 13744 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13695,7 +13751,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13729,13 +13785,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:13733: checking for acosp in -lsunmath" >&5
+echo "configure:13789: 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 13739 "configure"
+#line 13795 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13746,7 +13802,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:13750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13761,13 +13817,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:13765: checking for sgemm_ in -lsunperf" >&5
+echo "configure:13821: 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 13771 "configure"
+#line 13827 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13778,7 +13834,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13808,13 +13864,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:13812: checking for sgemm_ in -lblas" >&5
+echo "configure:13868: 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 13818 "configure"
+#line 13874 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13825,7 +13881,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13864,7 +13920,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:13868: checking whether to use LAPACK" >&5
+echo "configure:13924: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -13889,7 +13945,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:13893: checking for location of LAPACK includes" >&5
+echo "configure:13949: 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; }
@@ -13909,7 +13965,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:13913: checking for location of LAPACK library" >&5
+echo "configure:13969: 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; }
@@ -13935,15 +13991,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13939: checking for $ac_hdr" >&5
+echo "configure:13995: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13942 "configure"
+#line 13998 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14003: \"$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*
@@ -13975,10 +14031,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:13979: checking for dsegv_" >&5
+echo "configure:14035: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 13982 "configure"
+#line 14038 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -14001,7 +14057,7 @@
; return 0; }
EOF
-if { (eval echo configure:14005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14061: \"$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
@@ -14028,13 +14084,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:14032: checking for desgv_ in -llapack" >&5
+echo "configure:14088: 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 14038 "configure"
+#line 14094 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14045,7 +14101,7 @@
desgv_()
; 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:14105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14077,13 +14133,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:14081: checking for dgesv_ in -llapack" >&5
+echo "configure:14137: 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 14087 "configure"
+#line 14143 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14094,7 +14150,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:14098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14113,13 +14169,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:14117: checking for dgesv_ in -llapack" >&5
+echo "configure:14173: 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 14123 "configure"
+#line 14179 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14130,7 +14186,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:14134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14186,7 +14242,7 @@
echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:14190: checking whether to use Motif" >&5
+echo "configure:14246: checking whether to use Motif" >&5
echo "$ac_t"""$with_motif"" 1>&6
case "$with_motif" in
"no") USE_MOTIF= ;;
@@ -14205,7 +14261,7 @@
echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:14209: checking for location of Motif includes" >&5
+echo "configure:14265: checking for location of Motif includes" >&5
case "$with_motif_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-motif-includes." 1>&2; exit 1; }
@@ -14231,15 +14287,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14235: checking for $ac_hdr" >&5
+echo "configure:14291: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14238 "configure"
+#line 14294 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14299: \"$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*
@@ -14273,7 +14329,7 @@
echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:14277: checking for location of Motif library" >&5
+echo "configure:14333: checking for location of Motif library" >&5
case "$with_motif_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-motif-libs." 1>&2; exit 1; }
@@ -14298,13 +14354,13 @@
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:14302: checking for XmStringCreate in -lXm" >&5
+echo "configure:14358: checking for XmStringCreate in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lXm $X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14308 "configure"
+#line 14364 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14315,7 +14371,7 @@
XmStringCreate()
; return 0; }
EOF
-if { (eval echo configure:14319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14356,7 +14412,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:14360: checking whether to use Cairo" >&5
+echo "configure:14416: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -14382,7 +14438,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:14386: checking for location of cairo includes" >&5
+echo "configure:14442: 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; }
@@ -14408,15 +14464,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14412: checking for $ac_hdr" >&5
+echo "configure:14468: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14415 "configure"
+#line 14471 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14476: \"$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*
@@ -14452,7 +14508,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:14456: checking for location of cairo library" >&5
+echo "configure:14512: 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; }
@@ -14472,7 +14528,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:14476: checking for cairo linking flags" >&5
+echo "configure:14532: 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; }
@@ -14488,10 +14544,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:14492: checking for cairo_create" >&5
+echo "configure:14548: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 14495 "configure"
+#line 14551 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -14514,7 +14570,7 @@
; return 0; }
EOF
-if { (eval echo configure:14518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14574: \"$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
@@ -14548,10 +14604,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:14552: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:14608: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 14555 "configure"
+#line 14611 "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. */
@@ -14574,7 +14630,7 @@
; return 0; }
EOF
-if { (eval echo configure:14578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14634: \"$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
@@ -14616,7 +14672,7 @@
echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
-echo "configure:14620: checking whether to use GLw" >&5
+echo "configure:14676: checking whether to use GLw" >&5
echo "$ac_t"""$with_glw"" 1>&6
case "$with_glw" in
"no") USE_GLW= ;;
@@ -14635,7 +14691,7 @@
echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
-echo "configure:14639: checking for location of GLw includes" >&5
+echo "configure:14695: checking for location of GLw includes" >&5
case "$with_glw_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-glw-includes." 1>&2; exit 1; }
@@ -14661,15 +14717,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14665: checking for $ac_hdr" >&5
+echo "configure:14721: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14668 "configure"
+#line 14724 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14729: \"$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*
@@ -14697,15 +14753,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14701: checking for $ac_hdr" >&5
+echo "configure:14757: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14704 "configure"
+#line 14760 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14765: \"$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*
@@ -14745,7 +14801,7 @@
echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
-echo "configure:14749: checking for location of GLw library" >&5
+echo "configure:14805: checking for location of GLw library" >&5
case "$with_glw_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-glw-libs." 1>&2; exit 1; }
@@ -14770,13 +14826,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14774: checking for GLwCreateMDrawingArea in -lGLw" >&5
+echo "configure:14830: checking for GLwCreateMDrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14780 "configure"
+#line 14836 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14787,7 +14843,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14812,13 +14868,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14816: checking for GLwCreateM1DrawingArea in -lGLw" >&5
+echo "configure:14872: checking for GLwCreateM1DrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14822 "configure"
+#line 14878 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14829,7 +14885,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14854,13 +14910,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14858: checking for GLwCreateM2DrawingArea in -lGLw" >&5
+echo "configure:14914: checking for GLwCreateM2DrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14864 "configure"
+#line 14920 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14871,7 +14927,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14896,13 +14952,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14900: checking for GLwCreateMDrawingArea in -lGLwM" >&5
+echo "configure:14956: checking for GLwCreateMDrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14906 "configure"
+#line 14962 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14913,7 +14969,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14938,13 +14994,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14942: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
+echo "configure:14998: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14948 "configure"
+#line 15004 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14955,7 +15011,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14980,13 +15036,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14984: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
+echo "configure:15040: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14990 "configure"
+#line 15046 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14997,7 +15053,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15024,13 +15080,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:15028: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:15084: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15034 "configure"
+#line 15090 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15041,7 +15097,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15060,13 +15116,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:15064: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:15120: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15070 "configure"
+#line 15126 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15077,7 +15133,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15104,13 +15160,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:15108: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:15164: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15114 "configure"
+#line 15170 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15121,7 +15177,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15140,13 +15196,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:15144: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:15200: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15150 "configure"
+#line 15206 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15157,7 +15213,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15270,7 +15326,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:15274: checking whether to use FreeType" >&5
+echo "configure:15330: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -15289,7 +15345,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:15293: checking for location of FreeType includes" >&5
+echo "configure:15349: 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; }
@@ -15315,15 +15371,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15319: checking for $ac_hdr" >&5
+echo "configure:15375: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15322 "configure"
+#line 15378 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15383: \"$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*
@@ -15357,7 +15413,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:15361: checking for location of FreeType library" >&5
+echo "configure:15417: 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; }
@@ -15382,13 +15438,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:15386: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:15442: 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 15392 "configure"
+#line 15448 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15399,7 +15455,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:15403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15440,7 +15496,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:15444: checking whether to use NLS" >&5
+echo "configure:15500: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -15460,10 +15516,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:15464: checking for gettext" >&5
+echo "configure:15520: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 15467 "configure"
+#line 15523 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -15486,7 +15542,7 @@
; return 0; }
EOF
-if { (eval echo configure:15490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15546: \"$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
@@ -15504,13 +15560,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:15508: checking for gettext in -lintl" >&5
+echo "configure:15564: 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 15514 "configure"
+#line 15570 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15521,7 +15577,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:15525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15556,7 +15612,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:15560: checking whether to use C++" >&5
+echo "configure:15616: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -15572,7 +15628,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:15576: checking for $ac_word" >&5
+echo "configure:15632: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -15601,7 +15657,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:15605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:15661: 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.
@@ -15612,12 +15668,12 @@
cat > conftest.$ac_ext << EOF
-#line 15616 "configure"
+#line 15672 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:15621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15677: \"$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
@@ -15643,19 +15699,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:15647: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:15703: 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:15652: checking whether we are using GNU C++" >&5
+echo "configure:15708: 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:15659: \"$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:15715: \"$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
@@ -15673,7 +15729,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:15677: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:15733: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -15714,7 +15770,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:15718: checking whether to use openDWG" >&5
+echo "configure:15774: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -15734,7 +15790,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:15738: checking for location of openDGW includes" >&5
+echo "configure:15794: 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; }
@@ -15760,15 +15816,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15764: checking for $ac_hdr" >&5
+echo "configure:15820: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15767 "configure"
+#line 15823 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15828: \"$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*
@@ -15802,7 +15858,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:15806: checking for location of openDWG library" >&5
+echo "configure:15862: 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; }
@@ -15849,7 +15905,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:15853: checking for special C compiler options needed for large files" >&5
+echo "configure:15909: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -15857,7 +15913,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 15861 "configure"
+#line 15917 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15873,7 +15929,7 @@
; return 0; }
EOF
-if { (eval echo configure:15877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -15882,7 +15938,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 15886 "configure"
+#line 15942 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15898,7 +15954,7 @@
; return 0; }
EOF
-if { (eval echo configure:15902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -15918,11 +15974,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:15922: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:15978: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 15926 "configure"
+#line 15982 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15938,14 +15994,14 @@
; return 0; }
EOF
-if { (eval echo configure:15942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15998: \"$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 15949 "configure"
+#line 16005 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -15963,7 +16019,7 @@
; return 0; }
EOF
-if { (eval echo configure:15967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -15982,11 +16038,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:15986: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:16042: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 15990 "configure"
+#line 16046 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -16002,14 +16058,14 @@
; return 0; }
EOF
-if { (eval echo configure:16006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16062: \"$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 16013 "configure"
+#line 16069 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -16027,7 +16083,7 @@
; return 0; }
EOF
-if { (eval echo configure:16031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -16046,25 +16102,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:16050: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:16106: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 16054 "configure"
+#line 16110 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:16061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16068 "configure"
+#line 16124 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -16073,7 +16129,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:16077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -16094,10 +16150,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:16098: checking if system supports Large Files at all" >&5
+echo "configure:16154: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 16101 "configure"
+#line 16157 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -16129,7 +16185,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:16133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -16158,7 +16214,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:16162: checking whether to use Python" >&5
+echo "configure:16218: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -16178,7 +16234,7 @@
# Extract the first word of "python-config", so it can be a program name with args.
set dummy python-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16182: checking for $ac_word" >&5
+echo "configure:16238: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -16220,15 +16276,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16224: checking for $ac_hdr" >&5
+echo "configure:16280: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16227 "configure"
+#line 16283 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16288: \"$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*
@@ -16298,7 +16354,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:16302: checking whether to use wxWidgets" >&5
+echo "configure:16358: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -16319,7 +16375,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:16323: checking for $ac_word" >&5
+echo "configure:16379: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -16367,7 +16423,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:16371: checking wxWidgets version" >&5
+echo "configure:16427: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -16390,15 +16446,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16394: checking for $ac_hdr" >&5
+echo "configure:16450: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16397 "configure"
+#line 16453 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16458: \"$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/branches/releasebranch_6_4/configure.in
===================================================================
--- grass/branches/releasebranch_6_4/configure.in 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/configure.in 2011-03-02 11:33:10 UTC (rev 45515)
@@ -874,7 +874,12 @@
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/branches/releasebranch_6_4/general/g.parser/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/general/g.parser/Makefile 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/general/g.parser/Makefile 2011-03-02 11:33:10 UTC (rev 45515)
@@ -10,5 +10,7 @@
default: cmd
#hardcoded here, this is an exeption due to the g.parser specialities:
+ifneq ($(MSYSTEM),MINGW32)
htmlcmd:
$(MAKE) $(HTMLDIR)/$(PGM).html HTMLSRC=
+endif
Modified: grass/branches/releasebranch_6_4/general/g.region/printwindow.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.region/printwindow.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/general/g.region/printwindow.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/include/gprojects.h
===================================================================
--- grass/branches/releasebranch_6_4/include/gprojects.h 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/include/gprojects.h 2011-03-02 11:33:10 UTC (rev 45515)
@@ -106,4 +106,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/branches/releasebranch_6_4/include/proto_dbmi.h
===================================================================
--- grass/branches/releasebranch_6_4/include/proto_dbmi.h 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/include/proto_dbmi.h 2011-03-02 11:33:10 UTC (rev 45515)
@@ -129,6 +129,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/branches/releasebranch_6_4/lib/db/dbmi_base/alloc.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/alloc.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/alloc.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/db/dbmi_base/cursor.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/cursor.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/cursor.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -274,7 +274,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/branches/releasebranch_6_4/lib/db/dbmi_base/dbmscap.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/dbmscap.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/dbmscap.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -232,6 +232,6 @@
for (cur = list; cur; cur = next) {
next = cur->next;
- free(cur);
+ db_free(cur);
}
}
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_base/dirent.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/dirent.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/dirent.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -84,7 +84,7 @@
dirent[i].isdir = (db_isdir(path) == DB_OK);
}
closedir(dp);
- free(path);
+ db_free(path);
sort_dirent(dirent, *n);
@@ -104,7 +104,7 @@
if (dirent) {
for (i = 0; i < count; i++)
db_free_string(&dirent[i].name);
- free(dirent);
+ db_free(dirent);
}
}
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_base/error.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/error.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/error.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/db/dbmi_base/handle.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/handle.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/handle.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -77,7 +77,7 @@
if (handle) {
for (i = 0; i < count; i++)
db_free_handle(&handle[i]);
- free(handle);
+ db_free(handle);
}
}
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_base/index.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/index.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/index.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -80,7 +80,7 @@
if (list) {
for (i = 0; i < count; i++)
db_free_index(&list[i]);
- free(list);
+ db_free(list);
}
}
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_base/string.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/string.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/string.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -142,7 +142,7 @@
void db_free_string(dbString * x)
{
if (x->nalloc > 0)
- free(x->string);
+ db_free(x->string);
db_init_string(x);
}
@@ -159,7 +159,7 @@
if (a) {
for (i = 0; i < n; i++)
db_free_string(&a[i]);
- free(a);
+ db_free(a);
}
}
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_base/table.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/table.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/table.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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;
@@ -58,8 +58,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/branches/releasebranch_6_4/lib/db/dbmi_base/value.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_base/value.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_base/value.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/db/dbmi_client/copy_tab.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_client/copy_tab.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_client/copy_tab.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -374,7 +374,7 @@
}
}
if (selcol)
- free(ivalues);
+ G_free(ivalues);
G_debug(3, "Table copy OK");
db_close_cursor(&cursor);
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_client/shutdown.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_client/shutdown.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_client/shutdown.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -70,7 +70,7 @@
driver->pid = 0;
/* free the driver structure. THIS IS GOOFY */
- free(driver);
+ db_free(driver);
return status;
}
Modified: grass/branches/releasebranch_6_4/lib/db/dbmi_driver/d_close_cur.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_driver/d_close_cur.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_driver/d_close_cur.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/db/dbmi_driver/driver_state.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmi_driver/driver_state.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmi_driver/driver_state.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/db/dbmilib.dox
===================================================================
--- grass/branches/releasebranch_6_4/lib/db/dbmilib.dox 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/db/dbmilib.dox 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/g3d/g3dcache.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/g3d/g3dcache.c 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/g3d/g3dcache.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/lib/gis/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/gis/Makefile 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/gis/Makefile 2011-03-02 11:33:10 UTC (rev 45515)
@@ -45,7 +45,11 @@
endif
+ifneq ($(MSYSTEM),MINGW32)
default: lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/element_list
+else
+default: lib $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/element_list
+endif
$(ETC)/colors:
$(MKDIR) $@
Modified: grass/branches/releasebranch_6_4/lib/proj/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/proj/Makefile 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/lib/proj/Makefile 2011-03-02 11:33:10 UTC (rev 45515)
@@ -11,6 +11,10 @@
LIB_OBJS = get_proj.o do_proj.o convert.o datum.o ellipse.o
+ifeq ($(MSYSTEM),MINGW32)
+LIB_OBJS += ftol.o
+endif
+
NAD_TABLES = FL.lla MD.lla TN.lla WI.lla WO.lla alaska.lla conus.lla \
hawaii.lla prvi.lla stgeorge.lla stlrnc.lla stpaul.lla
Copied: grass/branches/releasebranch_6_4/lib/proj/ftol.c (from rev 45429, grass/branches/develbranch_6/lib/proj/ftol.c)
===================================================================
--- grass/branches/releasebranch_6_4/lib/proj/ftol.c (rev 0)
+++ grass/branches/releasebranch_6_4/lib/proj/ftol.c 2011-03-02 11:33:10 UTC (rev 45515)
@@ -0,0 +1,2 @@
+long _ftol(double);
+long _ftol2(double x) { return _ftol(x); }
Modified: grass/branches/releasebranch_6_4/locale/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/locale/Makefile 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/locale/Makefile 2011-03-02 11:33:10 UTC (rev 45515)
@@ -80,14 +80,21 @@
done
@echo "Be careful with SVN commits as .po file updates must be syncronized with the individual translators."
-define dom_rule
-$(1)_FILES := $$(patsubst po/grass$(1)_%.po,$$(MO_DIR)/%/LC_MESSAGES/grass$(1).mo,$$(wildcard po/grass$(1)_*.po))
-$$(MO_DIR)/%/LC_MESSAGES/grass$(1).mo: po/grass$(1)_%.po
- @ [ -d $$(MO_DIR)/$$*/LC_MESSAGES ] || $(MKDIR) $$(MO_DIR)/$$*/LC_MESSAGES
- msgfmt --statistics -o $$@ $$<
-endef
-$(foreach domain,libs mods wxpy,$(eval $(call dom_rule,$(domain))))
+libs_FILES := $(patsubst po/grasslibs_%.po,$(MO_DIR)/%/LC_MESSAGES/grasslibs.mo,$(wildcard po/grasslibs_*.po))
+$(MO_DIR)/%/LC_MESSAGES/grasslibs.mo: po/grasslibs_%.po
+ @ [ -d $(MO_DIR)/$*/LC_MESSAGES ] || $(MKDIR) $(MO_DIR)/$*/LC_MESSAGES
+ msgfmt --statistics -o $@ $<
+mods_FILES := $(patsubst po/grassmods_%.po,$(MO_DIR)/%/LC_MESSAGES/grassmods.mo,$(wildcard po/grassmods_*.po))
+$(MO_DIR)/%/LC_MESSAGES/grassmods.mo: po/grassmods_%.po
+ @ [ -d $(MO_DIR)/$*/LC_MESSAGES ] || $(MKDIR) $(MO_DIR)/$*/LC_MESSAGES
+ msgfmt --statistics -o $@ $<
+
+wxpy_FILES := $(patsubst po/grasswxpy_%.po,$(MO_DIR)/%/LC_MESSAGES/grasswxpy.mo,$(wildcard po/grasswxpy_*.po))
+$(MO_DIR)/%/LC_MESSAGES/grasswxpy.mo: po/grasswxpy_%.po
+ @ [ -d $(MO_DIR)/$*/LC_MESSAGES ] || $(MKDIR) $(MO_DIR)/$*/LC_MESSAGES
+ msgfmt --statistics -o $@ $<
+
$(MSG_DIR)/%.msg: po/grasstcl_%.po
@ [ -d $(MSG_DIR) ] || $(MKDIR) $(MSG_DIR)
msgfmt --statistics --tcl -l $* -d $(MSG_DIR)/ $<
Property changes on: grass/branches/releasebranch_6_4/mswindows/osgeo4w
___________________________________________________________________
Modified: svn:ignore
- configure-stamp
vc
package.log
+ configure-stamp
vc
package.log*
lib
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/config.h.vc
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/config.h.vc 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/config.h.vc 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-1.6.diff
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-1.6.diff 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-1.6.diff 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-config (from rev 45429, grass/branches/develbranch_6/mswindows/osgeo4w/gdal-config)
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-config (rev 0)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdal-config 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/mswindows/osgeo4w/gdalplugins.cmd
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdalplugins.cmd 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/gdalplugins.cmd 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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/branches/releasebranch_6_4/mswindows/osgeo4w/geos-config (from rev 45429, grass/branches/develbranch_6/mswindows/osgeo4w/geos-config)
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/geos-config (rev 0)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/geos-config 2011-03-02 11:33:10 UTC (rev 45515)
@@ -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
+
+
Copied: grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl (from rev 45508, grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.bat.tmpl)
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl (rev 0)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl 2011-03-02 11:33:10 UTC (rev 45515)
@@ -0,0 +1,4 @@
+ at echo off
+call @osgeo4w@\bin\o4w_env.bat
+call @osgeo4w@\bin\grass at POSTFIX@-env.bat
+"%WINGISBASE%"\etc\init.bat %*
Copied: grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl (from rev 45508, grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.tmpl)
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl (rev 0)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl 2011-03-02 11:33:10 UTC (rev 45515)
@@ -0,0 +1,25 @@
+#! /bin/sh
+#############################################################################
+#
+# MODULE: GRASS Initialization
+# AUTHOR(S): Justin Hickey - Thailand - jhickey at hpcc.nectec.or.th
+# PURPOSE: The source file for this shell script is in
+# lib/init/grass.src and is the grass startup script. It
+# requires a source file because the definition of GISBASE
+# is not known until compile time and is substituted from the
+# Makefile. Any command line options are passed to Init.sh.
+# COPYRIGHT: (C) 2000-2005 by the GRASS Development Team
+#
+# This program is free software under the GNU General Public
+# License (>=v2). Read the file COPYING that comes with GRASS
+# for details.
+#
+#############################################################################
+
+trap "echo 'User break!' ; exit" 2 3 9 15
+
+# Set the GISBASE variable
+GISBASE=@osgeo4w_msys@/apps/grass/grass- at VERSION@
+export GISBASE
+
+exec "$GISBASE/etc/Init.sh" "$@"
Deleted: grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.bat.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.bat.tmpl 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.bat.tmpl 2011-03-02 11:33:10 UTC (rev 45515)
@@ -1,3 +0,0 @@
- at echo off
-call @osgeo4w@\bin\o4w_env.bat
-"%WINGISBASE%"\etc\init.bat %*
Deleted: grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.tmpl 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass64.tmpl 2011-03-02 11:33:10 UTC (rev 45515)
@@ -1,25 +0,0 @@
-#! /bin/sh
-#############################################################################
-#
-# MODULE: GRASS Initialization
-# AUTHOR(S): Justin Hickey - Thailand - jhickey at hpcc.nectec.or.th
-# PURPOSE: The source file for this shell script is in
-# lib/init/grass.src and is the grass startup script. It
-# requires a source file because the definition of GISBASE
-# is not known until compile time and is substituted from the
-# Makefile. Any command line options are passed to Init.sh.
-# COPYRIGHT: (C) 2000-2005 by the GRASS Development Team
-#
-# This program is free software under the GNU General Public
-# License (>=v2). Read the file COPYING that comes with GRASS
-# for details.
-#
-#############################################################################
-
-trap "echo 'User break!' ; exit" 2 3 9 15
-
-# Set the GISBASE variable
-GISBASE=@osgeo4w_msys@
-export GISBASE
-
-exec "$GISBASE/etc/Init.sh" "$@"
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/ini.bat.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/ini.bat.tmpl 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/ini.bat.tmpl 2011-03-02 11:33:10 UTC (rev 45515)
@@ -1,7 +1,8 @@
-set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0svn
-set WINGISBASE=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0svn
+set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
+set WINGISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
set GRASS_WISH=%OSGEO4W_ROOT%\bin\wish.exe
set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe
set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
set GRASS_HTML_BROWSER=%PROGRAMFILES%\Internet Explorer\iexplore.exe
+set PATH=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\bin;%PATH%
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh 2011-03-02 11:33:10 UTC (rev 45515)
@@ -2,51 +2,100 @@
set -e
+PWD="$(pwd)"
+
if ! [ -d mswindows ]; then
echo Start from GRASS toplevel dir
exit 1
fi
+if ! [ -d /tmp ]; then
+ mkdir /tmp
+ if ! [ -d /tmp ]; then
+ echo /tmp does not exists
+ exit 1
+ fi
+fi
+
+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
+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
-version() {
- (
- read MAJOR
- read MINOR
- read PATCH
- echo $MAJOR.$MINOR.$PATCH
- ) <include/VERSION
+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/Grass.make ] ; then
- report "distclean"
- make distclean >>$LOG 2>&1
+ 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" \
+ --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 \
@@ -59,7 +108,8 @@
--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,36 +117,75 @@
--with-regex \
--with-nls \
--with-freetype-includes=$OSGEO4W_ROOT_MSYS/include/freetype2 \
- --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
-rm $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.dll
-
+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
-cp mswindows/osgeo4w/grass64.bat.tmpl $OSGEO4W_ROOT_MSYS/bin/grass64.bat.tmpl
-cp mswindows/osgeo4w/ini.bat.tmpl $OSGEO4W_ROOT_MSYS/etc/ini/grass.bat.tmpl
-cp mswindows/osgeo4w/postinstall.bat $OSGEO4W_ROOT_MSYS/etc/postinstall/grass.bat
-cp mswindows/osgeo4w/preremove.bat $OSGEO4W_ROOT_MSYS/etc/preremove/grass.bat
+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
-P=$(pwd -W)
-P=${P//\//\\\\}\\\\dist.i686-pc-mingw32
+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
-sed -e "s#$P#@osgeo4w@#" $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap.tmpl
-sed -e "s#$P#@osgeo4w_msys@#" $OSGEO4W_ROOT_MSYS/apps/grass/bin/grass64 >$OSGEO4W_ROOT_MSYS/apps/grass/bin/grass64.tmpl
-rm $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap
+P="$(pwd -W)"
+P="${P//\//\\\\}\\\\dist.i686-pc-mingw32"
-echo $(date): END >> $LOG
+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
-exit 0
\ No newline at end of file
+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/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat 2011-03-02 11:33:10 UTC (rev 45515)
@@ -1,15 +1,15 @@
-set ICON=%OSGEO4W_ROOT%\apps\grass\grass-6.4.0svn\etc\gui\icons\grass.ico
-set BATCH=%OSGEO4W_ROOT%\bin\grass64.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\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
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass64.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-6.4.0svn\etc\fontcap
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\bin\grass64
+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@\TclTkx @VERSION at .lnk" "%BATCH%" "-tcltk" \ "Tcl/Tk interface" 1 "%ICON%"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\Text @VERSION at .lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%"
-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%"
-
-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@ (TclTk).lnk" "%BATCH%" "-tcltk" \ "Tcl/Tk" 1 "%ICON%"
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (Text).lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%"
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat 2011-03-02 10:19:51 UTC (rev 45514)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat 2011-03-02 11:33:10 UTC (rev 45515)
@@ -1,15 +1,14 @@
-del "%OSGEO4W_STARTMENU%\GRASS.lnk"
-del "%ALLUSERSPROFILE%\Desktop\grass.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\wxpython.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\tcltk.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@ (TclTk).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- 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
-del "%OSGEO4W_ROOT%"\apps\grass\grass-6.4.0svn\etc\fontcap
-del "%OSGEO4W_ROOT%"\apps\grass\bin\grass64
-del "%OSGEO4W_ROOT%"\bin\grass64.bat
More information about the grass-commit
mailing list