[GRASS-SVN] r33187 - in grass/branches/develbranch_6: . include
lib/gis raster raster/r.external
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Sep 1 07:13:00 EDT 2008
Author: neteler
Date: 2008-09-01 07:13:00 -0400 (Mon, 01 Sep 2008)
New Revision: 33187
Added:
grass/branches/develbranch_6/lib/gis/gdal.c
grass/branches/develbranch_6/raster/r.external/
grass/branches/develbranch_6/raster/r.external/Makefile
grass/branches/develbranch_6/raster/r.external/description.html
grass/branches/develbranch_6/raster/r.external/main.c
Modified:
grass/branches/develbranch_6/configure
grass/branches/develbranch_6/configure.in
grass/branches/develbranch_6/include/config.h.in
grass/branches/develbranch_6/include/gis.h
grass/branches/develbranch_6/include/gisdefs.h
grass/branches/develbranch_6/lib/gis/G.h
grass/branches/develbranch_6/lib/gis/Makefile
grass/branches/develbranch_6/lib/gis/closecell.c
grass/branches/develbranch_6/lib/gis/get_row.c
grass/branches/develbranch_6/lib/gis/opencell.c
Log:
backported r.external incl. conditionalized HAVE_GDAL/GDAL_link
Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/configure 2008-09-01 11:13:00 UTC (rev 33187)
@@ -7619,6 +7619,11 @@
echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
echo "configure:7621: checking whether to use GDAL" >&5
+GDAL_LIBS=
+GDAL_CFLAGS=
+USE_GDAL=
+USE_OGR=
+
if test "`basename xx/$with_gdal`" = "gdal-config" ; then
GDAL_CONFIG="$with_gdal"
fi
@@ -7630,7 +7635,7 @@
# Extract the first word of "gdal-config", so it can be a program name with args.
set dummy gdal-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7634: checking for $ac_word" >&5
+echo "configure:7639: checking for $ac_word" >&5
case "$GDAL_CONFIG" in
/*)
@@ -7665,11 +7670,6 @@
{ echo "configure: error: *** couldn't find gdal-config" 1>&2; exit 1; }
fi
- GDAL_LIBS=
- GDAL_CFLAGS=
- USE_GDAL=
- USE_OGR=
-
if test "$GDAL_CONFIG" != "" ; then
GDAL_LIBS=`"$GDAL_CONFIG" --libs`
GDAL_DEP_LIBS=`"$GDAL_CONFIG" --dep-libs`
@@ -7731,17 +7731,22 @@
LIBS=${ac_save_libs}
CFLAGS=${ac_save_cflags}
-
-
-
-
+ cat >> confdefs.h <<\EOF
+#define HAVE_GDAL 1
+EOF
+
fi
+
+
+
+
+
# Enable TIFF option
echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:7745: checking whether to use TIFF" >&5
+echo "configure:7750: checking whether to use TIFF" >&5
echo "$ac_t"""$with_tiff"" 1>&6
case "$with_tiff" in
"no") USE_TIFF= ;;
@@ -7761,7 +7766,7 @@
echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:7765: checking for location of TIFF includes" >&5
+echo "configure:7770: 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; }
@@ -7787,15 +7792,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7791: checking for $ac_hdr" >&5
+echo "configure:7796: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7794 "configure"
+#line 7799 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7804: \"$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*
@@ -7829,7 +7834,7 @@
echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:7833: checking for location of TIFF library" >&5
+echo "configure:7838: 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; }
@@ -7860,13 +7865,13 @@
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7864: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7869: 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 7870 "configure"
+#line 7875 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7877,7 +7882,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7896,13 +7901,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7900: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7905: 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 7906 "configure"
+#line 7911 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7913,7 +7918,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7932,13 +7937,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7936: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7941: 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 7942 "configure"
+#line 7947 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7949,7 +7954,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7968,13 +7973,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7972: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7977: 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 7978 "configure"
+#line 7983 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7985,7 +7990,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:7989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8004,13 +8009,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8008: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8013: 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 8014 "configure"
+#line 8019 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8021,7 +8026,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8040,13 +8045,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8044: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8049: 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 8050 "configure"
+#line 8055 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8057,7 +8062,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8076,13 +8081,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8080: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8085: 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 8086 "configure"
+#line 8091 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8093,7 +8098,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8112,13 +8117,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8116: checking for TIFFOpen in -ltiff" >&5
+echo "configure:8121: 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 8122 "configure"
+#line 8127 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8129,7 +8134,7 @@
TIFFOpen()
; return 0; }
EOF
-if { (eval echo configure:8133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8227,7 +8232,7 @@
echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:8231: checking whether to use PNG" >&5
+echo "configure:8236: checking whether to use PNG" >&5
echo "$ac_t"""$with_png"" 1>&6
case "$with_png" in
"no") USE_PNG= ;;
@@ -8246,7 +8251,7 @@
echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:8250: checking for location of PNG includes" >&5
+echo "configure:8255: 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; }
@@ -8272,15 +8277,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8276: checking for $ac_hdr" >&5
+echo "configure:8281: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8279 "configure"
+#line 8284 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8289: \"$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*
@@ -8314,7 +8319,7 @@
echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:8318: checking for location of PNG library" >&5
+echo "configure:8323: 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; }
@@ -8339,13 +8344,13 @@
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8343: checking for png_read_image in -lpng" >&5
+echo "configure:8348: 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 8349 "configure"
+#line 8354 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8356,7 +8361,7 @@
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:8360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8398,7 +8403,7 @@
echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:8402: checking whether to use Tcl/Tk" >&5
+echo "configure:8407: checking whether to use Tcl/Tk" >&5
echo "$ac_t"""$with_tcltk"" 1>&6
case "$with_tcltk" in
"no") USE_TCLTK= ;;
@@ -8418,7 +8423,7 @@
echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:8422: checking for location of Tcl/Tk includes" >&5
+echo "configure:8427: 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; }
@@ -8444,15 +8449,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8448: checking for $ac_hdr" >&5
+echo "configure:8453: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8451 "configure"
+#line 8456 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8461: \"$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*
@@ -8489,15 +8494,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8493: checking for $ac_hdr" >&5
+echo "configure:8498: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8496 "configure"
+#line 8501 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8506: \"$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*
@@ -8531,7 +8536,7 @@
echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:8535: checking Tcl version" >&5
+echo "configure:8540: checking Tcl version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -8539,7 +8544,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8543 "configure"
+#line 8548 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8551,7 +8556,7 @@
}
EOF
-if { (eval echo configure:8555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8560: \"$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
@@ -8569,7 +8574,7 @@
echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:8573: checking Tk version" >&5
+echo "configure:8578: checking Tk version" >&5
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
if test "$cross_compiling" = yes; then
@@ -8577,7 +8582,7 @@
echo "$ac_t""unknown (cross-compiling)" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8581 "configure"
+#line 8586 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8589,7 +8594,7 @@
}
EOF
-if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8598: \"$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
@@ -8618,7 +8623,7 @@
echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:8622: checking for location of Tcl/Tk library" >&5
+echo "configure:8627: 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; }
@@ -8648,13 +8653,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8652: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8657: 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 8658 "configure"
+#line 8663 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8665,7 +8670,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8684,13 +8689,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8688: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8693: 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 8694 "configure"
+#line 8699 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8701,7 +8706,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8728,13 +8733,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8732: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8737: 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 8738 "configure"
+#line 8743 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8745,7 +8750,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8764,13 +8769,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8768: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8773: 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 8774 "configure"
+#line 8779 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8781,7 +8786,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8808,13 +8813,13 @@
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8812: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8817: 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 8818 "configure"
+#line 8823 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8825,7 +8830,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8844,13 +8849,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8848: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8853: 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 8854 "configure"
+#line 8859 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8861,7 +8866,7 @@
Tcl_Init()
; return 0; }
EOF
-if { (eval echo configure:8865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8939,13 +8944,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8943: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8948: 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 8949 "configure"
+#line 8954 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8956,7 +8961,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -8975,13 +8980,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8979: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8984: 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 8985 "configure"
+#line 8990 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -8992,7 +8997,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9019,13 +9024,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:9023: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:9028: 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 9029 "configure"
+#line 9034 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9036,7 +9041,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:9040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9055,13 +9060,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:9059: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:9064: 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 9065 "configure"
+#line 9070 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9072,7 +9077,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:9076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9099,13 +9104,13 @@
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:9103: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:9108: 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 9109 "configure"
+#line 9114 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9116,7 +9121,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:9120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9135,13 +9140,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:9139: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:9144: 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 9145 "configure"
+#line 9150 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9152,7 +9157,7 @@
Tk_MainWindow()
; return 0; }
EOF
-if { (eval echo configure:9156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9244,7 +9249,7 @@
echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:9248: checking whether to use PostgreSQL" >&5
+echo "configure:9253: checking whether to use PostgreSQL" >&5
echo "$ac_t"""$with_postgres"" 1>&6
case "$with_postgres" in
"no") USE_POSTGRES= ;;
@@ -9271,7 +9276,7 @@
echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:9275: checking for location of PostgreSQL includes" >&5
+echo "configure:9280: 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; }
@@ -9297,15 +9302,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9301: checking for $ac_hdr" >&5
+echo "configure:9306: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9304 "configure"
+#line 9309 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9314: \"$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*
@@ -9343,7 +9348,7 @@
echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:9347: checking for location of PostgreSQL library" >&5
+echo "configure:9352: 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; }
@@ -9372,13 +9377,13 @@
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9376: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9381: 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 9382 "configure"
+#line 9387 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9389,7 +9394,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9408,13 +9413,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9412: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9417: 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 9418 "configure"
+#line 9423 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9425,7 +9430,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9444,13 +9449,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9448: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9453: 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 9454 "configure"
+#line 9459 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9461,7 +9466,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9480,13 +9485,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9484: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9489: 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 9490 "configure"
+#line 9495 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9497,7 +9502,7 @@
PQsetdbLogin()
; return 0; }
EOF
-if { (eval echo configure:9501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9554,13 +9559,13 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $PQLIBPATH"
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9558: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9563: 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 9564 "configure"
+#line 9569 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9571,7 +9576,7 @@
PQcmdTuples()
; return 0; }
EOF
-if { (eval echo configure:9575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9580: \"$ac_link\") 1>&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 +9598,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9597: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9602: 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 9603 "configure"
+#line 9608 "configure"
#include "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 +9615,7 @@
PQcmdTuples()
; 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:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9653,7 +9658,7 @@
echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:9657: checking whether to use MySQL" >&5
+echo "configure:9662: checking whether to use MySQL" >&5
echo "$ac_t"""$with_mysql"" 1>&6
case "$with_mysql" in
"no") USE_MYSQL= ;;
@@ -9673,7 +9678,7 @@
echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:9677: checking for location of MySQL includes" >&5
+echo "configure:9682: 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; }
@@ -9699,15 +9704,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9703: checking for $ac_hdr" >&5
+echo "configure:9708: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 9706 "configure"
+#line 9711 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9716: \"$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*
@@ -9744,7 +9749,7 @@
echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:9748: checking for location of MySQL library" >&5
+echo "configure:9753: 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; }
@@ -9775,13 +9780,13 @@
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9779: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9784: 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 9785 "configure"
+#line 9790 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9792,7 +9797,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9811,13 +9816,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9815: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9820: 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 9821 "configure"
+#line 9826 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9828,7 +9833,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9847,13 +9852,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9851: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9856: 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 9857 "configure"
+#line 9862 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9864,7 +9869,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9883,13 +9888,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9887: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9892: 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 9893 "configure"
+#line 9898 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9900,7 +9905,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9919,13 +9924,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9923: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9928: 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 9929 "configure"
+#line 9934 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9936,7 +9941,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9955,13 +9960,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9959: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9964: 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 9965 "configure"
+#line 9970 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -9972,7 +9977,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:9976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -9991,13 +9996,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9995: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:10000: 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 10001 "configure"
+#line 10006 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10008,7 +10013,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:10012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10027,13 +10032,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:10031: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:10036: 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 10037 "configure"
+#line 10042 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10044,7 +10049,7 @@
mysql_query()
; return 0; }
EOF
-if { (eval echo configure:10048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10134,7 +10139,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:10138: checking for $ac_word" >&5
+echo "configure:10143: checking for $ac_word" >&5
case "$MYSQLD_CONFIG" in
/*)
@@ -10175,10 +10180,10 @@
LIBS="$MYSQLDLIB $LIBS"
echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:10179: checking for mysql_server_init" >&5
+echo "configure:10184: checking for mysql_server_init" >&5
cat > conftest.$ac_ext <<EOF
-#line 10182 "configure"
+#line 10187 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mysql_server_init(); below. */
@@ -10201,7 +10206,7 @@
; return 0; }
EOF
-if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10210: \"$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
@@ -10239,7 +10244,7 @@
echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:10243: checking whether to use SQLite" >&5
+echo "configure:10248: checking whether to use SQLite" >&5
echo "$ac_t"""$with_sqlite"" 1>&6
case "$with_sqlite" in
"no") USE_SQLITE= ;;
@@ -10259,7 +10264,7 @@
echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:10263: checking for location of SQLite includes" >&5
+echo "configure:10268: 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; }
@@ -10285,15 +10290,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10289: checking for $ac_hdr" >&5
+echo "configure:10294: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10292 "configure"
+#line 10297 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10302: \"$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*
@@ -10336,7 +10341,7 @@
echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:10340: checking for location of SQLite library" >&5
+echo "configure:10345: 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; }
@@ -10363,13 +10368,13 @@
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10367: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10372: 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 10373 "configure"
+#line 10378 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10380,7 +10385,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10399,13 +10404,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10403: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10408: 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 10409 "configure"
+#line 10414 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10416,7 +10421,7 @@
sqlite3_open()
; return 0; }
EOF
-if { (eval echo configure:10420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10469,7 +10474,7 @@
echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10473: checking whether to use FFMPEG" >&5
+echo "configure:10478: checking whether to use FFMPEG" >&5
echo "$ac_t"""$with_ffmpeg"" 1>&6
case "$with_ffmpeg" in
"no") USE_FFMPEG= ;;
@@ -10489,7 +10494,7 @@
echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10493: checking for location of FFMPEG includes" >&5
+echo "configure:10498: 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; }
@@ -10515,15 +10520,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10519: checking for $ac_hdr" >&5
+echo "configure:10524: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10522 "configure"
+#line 10527 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10532: \"$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*
@@ -10559,15 +10564,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10563: checking for $ac_hdr" >&5
+echo "configure:10568: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10566 "configure"
+#line 10571 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10576: \"$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*
@@ -10603,15 +10608,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10607: checking for $ac_hdr" >&5
+echo "configure:10612: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10610 "configure"
+#line 10615 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10620: \"$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*
@@ -10654,7 +10659,7 @@
echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10658: checking for location of FFMPEG library" >&5
+echo "configure:10663: 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; }
@@ -10681,13 +10686,13 @@
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10685: checking for av_free in -lavutil" >&5
+echo "configure:10690: 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 10691 "configure"
+#line 10696 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10698,7 +10703,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10717,13 +10722,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10721: checking for av_free in -lavutil" >&5
+echo "configure:10726: 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 10727 "configure"
+#line 10732 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10734,7 +10739,7 @@
av_free()
; return 0; }
EOF
-if { (eval echo configure:10738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10779,13 +10784,13 @@
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10783: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10788: 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 10789 "configure"
+#line 10794 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10796,7 +10801,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10815,13 +10820,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10819: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10824: 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 10825 "configure"
+#line 10830 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10832,7 +10837,7 @@
avcodec_init()
; return 0; }
EOF
-if { (eval echo configure:10836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10877,13 +10882,13 @@
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10881: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10886: 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 10887 "configure"
+#line 10892 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10894,7 +10899,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10913,13 +10918,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10917: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10922: 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 10923 "configure"
+#line 10928 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -10930,7 +10935,7 @@
av_set_parameters()
; return 0; }
EOF
-if { (eval echo configure:10934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -10990,7 +10995,7 @@
OPENGL_WINDOWS=
echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:10994: checking whether to use OpenGL" >&5
+echo "configure:10999: checking whether to use OpenGL" >&5
echo "$ac_t"""$with_opengl"" 1>&6
case "$with_opengl" in
n|no)
@@ -11024,7 +11029,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11028: checking for location of OpenGL includes" >&5
+echo "configure:11033: 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; }
@@ -11050,15 +11055,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11054: checking for $ac_hdr" >&5
+echo "configure:11059: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11057 "configure"
+#line 11062 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11067: \"$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*
@@ -11092,7 +11097,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11096: checking for location of OpenGL library" >&5
+echo "configure:11101: 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; }
@@ -11121,13 +11126,13 @@
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11125: checking for glBegin in -lGL" >&5
+echo "configure:11130: 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 11131 "configure"
+#line 11136 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11138,7 +11143,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11157,13 +11162,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11161: checking for glBegin in -lGL" >&5
+echo "configure:11166: 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 11167 "configure"
+#line 11172 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11174,7 +11179,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11193,13 +11198,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11197: checking for glBegin in -lGL" >&5
+echo "configure:11202: 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 11203 "configure"
+#line 11208 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11210,7 +11215,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11229,13 +11234,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11233: checking for glBegin in -lGL" >&5
+echo "configure:11238: 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 11239 "configure"
+#line 11244 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11246,7 +11251,7 @@
glBegin()
; return 0; }
EOF
-if { (eval echo configure:11250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11308,13 +11313,13 @@
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11312: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11317: 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 11318 "configure"
+#line 11323 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11325,7 +11330,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11344,13 +11349,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11348: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:11353: 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 11354 "configure"
+#line 11359 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -11361,7 +11366,7 @@
gluBeginCurve()
; return 0; }
EOF
-if { (eval echo configure:11365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -11405,10 +11410,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $OPENGLLIB"
echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:11409: checking for glXCreatePbuffer" >&5
+echo "configure:11414: checking for glXCreatePbuffer" >&5
cat > conftest.$ac_ext <<EOF
-#line 11412 "configure"
+#line 11417 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreatePbuffer(); below. */
@@ -11431,7 +11436,7 @@
; return 0; }
EOF
-if { (eval echo configure:11435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11440: \"$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
@@ -11453,10 +11458,10 @@
fi
echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11457: checking for glXCreateGLXPixmap" >&5
+echo "configure:11462: checking for glXCreateGLXPixmap" >&5
cat > conftest.$ac_ext <<EOF
-#line 11460 "configure"
+#line 11465 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glXCreateGLXPixmap(); below. */
@@ -11479,7 +11484,7 @@
; return 0; }
EOF
-if { (eval echo configure:11483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11488: \"$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
@@ -11518,7 +11523,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11522: checking for location of OpenGL includes" >&5
+echo "configure:11527: 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; }
@@ -11544,15 +11549,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11548: checking for $ac_hdr" >&5
+echo "configure:11553: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11551 "configure"
+#line 11556 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11561: \"$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*
@@ -11587,10 +11592,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$with_opengl_libs $LDFLAGS"
echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11591: checking for glBegin" >&5
+echo "configure:11596: checking for glBegin" >&5
cat > conftest.$ac_ext <<EOF
-#line 11594 "configure"
+#line 11599 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glBegin(); below. */
@@ -11613,7 +11618,7 @@
; return 0; }
EOF
-if { (eval echo configure:11617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11622: \"$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
@@ -11628,10 +11633,10 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11632: checking for gluBeginCurve" >&5
+echo "configure:11637: checking for gluBeginCurve" >&5
cat > conftest.$ac_ext <<EOF
-#line 11635 "configure"
+#line 11640 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gluBeginCurve(); below. */
@@ -11654,7 +11659,7 @@
; return 0; }
EOF
-if { (eval echo configure:11658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11663: \"$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
@@ -11698,7 +11703,7 @@
echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11702: checking for location of OpenGL includes" >&5
+echo "configure:11707: 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; }
@@ -11724,15 +11729,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11728: checking for $ac_hdr" >&5
+echo "configure:11733: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11731 "configure"
+#line 11736 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11741: \"$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*
@@ -11766,7 +11771,7 @@
echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11770: checking for location of OpenGL library" >&5
+echo "configure:11775: 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; }
@@ -11791,18 +11796,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11795: checking for OpenGL library" >&5
+echo "configure:11800: checking for OpenGL library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lopengl32 "
cat > conftest.$ac_ext <<EOF
-#line 11799 "configure"
+#line 11804 "configure"
#include "confdefs.h"
#include <GL/gl.h>
int main() {
glEnd();
; return 0; }
EOF
-if { (eval echo configure:11806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11826,18 +11831,18 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11830: checking for GLU library" >&5
+echo "configure:11835: checking for GLU library" >&5
LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
LIBS="-lglu32 $OPENGLLIB "
cat > conftest.$ac_ext <<EOF
-#line 11834 "configure"
+#line 11839 "configure"
#include "confdefs.h"
#include <GL/glu.h>
int main() {
gluNewQuadric();
; return 0; }
EOF
-if { (eval echo configure:11841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -11886,7 +11891,7 @@
echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11890: checking whether to use ODBC" >&5
+echo "configure:11895: checking whether to use ODBC" >&5
echo "$ac_t"""$with_odbc"" 1>&6
case "$with_odbc" in
"no") USE_ODBC= ;;
@@ -11905,7 +11910,7 @@
echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11909: checking for location of ODBC includes" >&5
+echo "configure:11914: 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; }
@@ -11931,15 +11936,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11935: checking for $ac_hdr" >&5
+echo "configure:11940: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11938 "configure"
+#line 11943 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -11973,7 +11978,7 @@
echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:11977: checking for location of ODBC library" >&5
+echo "configure:11982: 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; }
@@ -11998,13 +12003,13 @@
echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:12002: checking for SQLConnect in -lodbc" >&5
+echo "configure:12007: 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 12008 "configure"
+#line 12013 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12015,7 +12020,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12040,13 +12045,13 @@
echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:12044: checking for SQLConnect in -liodbc" >&5
+echo "configure:12049: 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 12050 "configure"
+#line 12055 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12057,7 +12062,7 @@
SQLConnect()
; return 0; }
EOF
-if { (eval echo configure:12061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12082,11 +12087,11 @@
ac_save_ldflags="$LDFLAGS"
ac_save_libs="$LIBS"
echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:12086: checking for ODBC library" >&5
+echo "configure:12091: checking for ODBC library" >&5
LDFLAGS="$ODBCLIB $LDFLAGS"
LIBS="-lodbc32 "
cat > conftest.$ac_ext <<EOF
-#line 12090 "configure"
+#line 12095 "configure"
#include "confdefs.h"
#include <windows.h>
#include <sql.h>
@@ -12094,7 +12099,7 @@
SQLAllocEnv((SQLHENV *)0);
; return 0; }
EOF
-if { (eval echo configure:12098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""found" 1>&6
@@ -12143,7 +12148,7 @@
echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:12147: checking whether to use FFTW" >&5
+echo "configure:12152: checking whether to use FFTW" >&5
echo "$ac_t"""$with_fftw"" 1>&6
case "$with_fftw" in
"no") USE_FFTW= ;;
@@ -12162,7 +12167,7 @@
echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:12166: checking for location of FFTW includes" >&5
+echo "configure:12171: 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; }
@@ -12188,15 +12193,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12192: checking for $ac_hdr" >&5
+echo "configure:12197: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12195 "configure"
+#line 12200 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12205: \"$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*
@@ -12224,15 +12229,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12228: checking for $ac_hdr" >&5
+echo "configure:12233: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12231 "configure"
+#line 12236 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12241: \"$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*
@@ -12260,15 +12265,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12264: checking for $ac_hdr" >&5
+echo "configure:12269: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12267 "configure"
+#line 12272 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12277: \"$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*
@@ -12314,7 +12319,7 @@
echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:12318: checking for location of FFTW library" >&5
+echo "configure:12323: 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; }
@@ -12339,13 +12344,13 @@
echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:12343: checking for fftw_execute in -lfftw3" >&5
+echo "configure:12348: 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 12349 "configure"
+#line 12354 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12356,7 +12361,7 @@
fftw_execute()
; return 0; }
EOF
-if { (eval echo configure:12360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12381,13 +12386,13 @@
echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:12385: checking for fftwnd_one in -lfftw" >&5
+echo "configure:12390: 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 12391 "configure"
+#line 12396 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12398,7 +12403,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12423,13 +12428,13 @@
echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:12427: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:12432: 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 12433 "configure"
+#line 12438 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12440,7 +12445,7 @@
fftwnd_one()
; return 0; }
EOF
-if { (eval echo configure:12444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12497,7 +12502,7 @@
echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:12501: checking whether to use BLAS" >&5
+echo "configure:12506: checking whether to use BLAS" >&5
echo "$ac_t"""$with_blas"" 1>&6
case "$with_blas" in
"no") USE_BLAS= ;;
@@ -12518,7 +12523,7 @@
echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:12522: checking for location of BLAS includes" >&5
+echo "configure:12527: 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; }
@@ -12538,7 +12543,7 @@
echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:12542: checking for location of BLAS library" >&5
+echo "configure:12547: 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; }
@@ -12564,15 +12569,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12568: checking for $ac_hdr" >&5
+echo "configure:12573: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12571 "configure"
+#line 12576 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12581: \"$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*
@@ -12607,13 +12612,13 @@
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12611: checking for dnrm2_ in -lblas" >&5
+echo "configure:12616: 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 12617 "configure"
+#line 12622 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12624,7 +12629,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12643,13 +12648,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12647: checking for dnrm2_ in -lblas" >&5
+echo "configure:12652: 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 12653 "configure"
+#line 12658 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12660,7 +12665,7 @@
dnrm2_()
; return 0; }
EOF
-if { (eval echo configure:12664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12704,13 +12709,13 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$BLASLIB $LDFLAGS"
echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:12708: checking for ATL_xerbla in -latlas" >&5
+echo "configure:12713: 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 12714 "configure"
+#line 12719 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12721,7 +12726,7 @@
ATL_xerbla()
; return 0; }
EOF
-if { (eval echo configure:12725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12736,13 +12741,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:12740: checking for sgemm_ in -lf77blas" >&5
+echo "configure:12745: 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 12746 "configure"
+#line 12751 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12753,7 +12758,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12768,13 +12773,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:12772: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12777: 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 12778 "configure"
+#line 12783 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12785,7 +12790,7 @@
cblas_dgemm()
; return 0; }
EOF
-if { (eval echo configure:12789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12830,16 +12835,16 @@
save_LIBS="$LIBS"
LIBS="$vlib_flags $LIBS"
echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12834: checking for sgemm in $vlib_flags" >&5
+echo "configure:12839: checking for sgemm in $vlib_flags" >&5
cat > conftest.$ac_ext <<EOF
-#line 12836 "configure"
+#line 12841 "configure"
#include "confdefs.h"
int main() {
sgemm
; return 0; }
EOF
-if { (eval echo configure:12843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12848: \"$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
@@ -12857,13 +12862,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:12861: checking for sgemm_ in -lblas" >&5
+echo "configure:12866: 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 12867 "configure"
+#line 12872 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12874,7 +12879,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12889,13 +12894,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:12893: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12898: 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 12899 "configure"
+#line 12904 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12906,7 +12911,7 @@
dgemm_()
; return 0; }
EOF
-if { (eval echo configure:12910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12921,13 +12926,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:12925: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12930: 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 12931 "configure"
+#line 12936 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12938,7 +12943,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:12942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -12972,13 +12977,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:12976: checking for acosp in -lsunmath" >&5
+echo "configure:12981: 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 12982 "configure"
+#line 12987 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -12989,7 +12994,7 @@
acosp()
; return 0; }
EOF
-if { (eval echo configure:12993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13004,13 +13009,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:13008: checking for sgemm_ in -lsunperf" >&5
+echo "configure:13013: 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 13014 "configure"
+#line 13019 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13021,7 +13026,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13051,13 +13056,13 @@
# Generic BLAS library
if test $blas_ok = no; then
echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:13055: checking for sgemm_ in -lblas" >&5
+echo "configure:13060: 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 13061 "configure"
+#line 13066 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13068,7 +13073,7 @@
sgemm_()
; return 0; }
EOF
-if { (eval echo configure:13072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13107,7 +13112,7 @@
echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:13111: checking whether to use LAPACK" >&5
+echo "configure:13116: checking whether to use LAPACK" >&5
echo "$ac_t"""$with_lapack"" 1>&6
case "$with_lapack" in
"no") USE_LAPACK= ;;
@@ -13132,7 +13137,7 @@
echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:13136: checking for location of LAPACK includes" >&5
+echo "configure:13141: 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; }
@@ -13152,7 +13157,7 @@
echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:13156: checking for location of LAPACK library" >&5
+echo "configure:13161: 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; }
@@ -13178,15 +13183,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13182: checking for $ac_hdr" >&5
+echo "configure:13187: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13185 "configure"
+#line 13190 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13195: \"$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*
@@ -13218,10 +13223,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:13222: checking for dsegv_" >&5
+echo "configure:13227: checking for dsegv_" >&5
cat > conftest.$ac_ext <<EOF
-#line 13225 "configure"
+#line 13230 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dsegv_(); below. */
@@ -13244,7 +13249,7 @@
; return 0; }
EOF
-if { (eval echo configure:13248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13253: \"$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
@@ -13271,13 +13276,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:13275: checking for desgv_ in -llapack" >&5
+echo "configure:13280: 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 13281 "configure"
+#line 13286 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13288,7 +13293,7 @@
desgv_()
; return 0; }
EOF
-if { (eval echo configure:13292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13320,13 +13325,13 @@
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13324: checking for dgesv_ in -llapack" >&5
+echo "configure:13329: 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 13330 "configure"
+#line 13335 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13337,7 +13342,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:13341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13356,13 +13361,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13360: checking for dgesv_ in -llapack" >&5
+echo "configure:13365: 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 13366 "configure"
+#line 13371 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13373,7 +13378,7 @@
dgesv_()
; return 0; }
EOF
-if { (eval echo configure:13377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13429,7 +13434,7 @@
echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:13433: checking whether to use Motif" >&5
+echo "configure:13438: checking whether to use Motif" >&5
echo "$ac_t"""$with_motif"" 1>&6
case "$with_motif" in
"no") USE_MOTIF= ;;
@@ -13448,7 +13453,7 @@
echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:13452: checking for location of Motif includes" >&5
+echo "configure:13457: 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; }
@@ -13474,15 +13479,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13478: checking for $ac_hdr" >&5
+echo "configure:13483: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13481 "configure"
+#line 13486 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13491: \"$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*
@@ -13516,7 +13521,7 @@
echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:13520: checking for location of Motif library" >&5
+echo "configure:13525: 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; }
@@ -13541,13 +13546,13 @@
echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:13545: checking for XmStringCreate in -lXm" >&5
+echo "configure:13550: 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 13551 "configure"
+#line 13556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13558,7 +13563,7 @@
XmStringCreate()
; return 0; }
EOF
-if { (eval echo configure:13562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13599,7 +13604,7 @@
echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:13603: checking whether to use Cairo" >&5
+echo "configure:13608: checking whether to use Cairo" >&5
echo "$ac_t"""$with_cairo"" 1>&6
case "$with_cairo" in
"no") USE_CAIRO= ;;
@@ -13625,15 +13630,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13629: checking for $ac_hdr" >&5
+echo "configure:13634: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13632 "configure"
+#line 13637 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13642: \"$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*
@@ -13670,10 +13675,10 @@
ac_save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS $CAIROLIB"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:13674: checking for cairo_create" >&5
+echo "configure:13679: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 13677 "configure"
+#line 13682 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -13696,7 +13701,7 @@
; return 0; }
EOF
-if { (eval echo configure:13700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13705: \"$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
@@ -13731,7 +13736,7 @@
echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
-echo "configure:13735: checking whether to use GLw" >&5
+echo "configure:13740: checking whether to use GLw" >&5
echo "$ac_t"""$with_glw"" 1>&6
case "$with_glw" in
"no") USE_GLW= ;;
@@ -13750,7 +13755,7 @@
echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
-echo "configure:13754: checking for location of GLw includes" >&5
+echo "configure:13759: 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; }
@@ -13776,15 +13781,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13780: checking for $ac_hdr" >&5
+echo "configure:13785: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13783 "configure"
+#line 13788 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13793: \"$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*
@@ -13812,15 +13817,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13816: checking for $ac_hdr" >&5
+echo "configure:13821: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 13819 "configure"
+#line 13824 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13829: \"$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*
@@ -13860,7 +13865,7 @@
echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
-echo "configure:13864: checking for location of GLw library" >&5
+echo "configure:13869: 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; }
@@ -13885,13 +13890,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:13889: checking for GLwCreateMDrawingArea in -lGLw" >&5
+echo "configure:13894: 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 13895 "configure"
+#line 13900 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13902,7 +13907,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:13906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13927,13 +13932,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:13931: checking for GLwCreateM1DrawingArea in -lGLw" >&5
+echo "configure:13936: 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 13937 "configure"
+#line 13942 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13944,7 +13949,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:13948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13969,13 +13974,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:13973: checking for GLwCreateM2DrawingArea in -lGLw" >&5
+echo "configure:13978: 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 13979 "configure"
+#line 13984 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -13986,7 +13991,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:13990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14011,13 +14016,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14015: checking for GLwCreateMDrawingArea in -lGLwM" >&5
+echo "configure:14020: 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 14021 "configure"
+#line 14026 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14028,7 +14033,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14053,13 +14058,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14057: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
+echo "configure:14062: 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 14063 "configure"
+#line 14068 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14070,7 +14075,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14095,13 +14100,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14099: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
+echo "configure:14104: 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 14105 "configure"
+#line 14110 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14112,7 +14117,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14139,13 +14144,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:14143: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:14148: 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 14149 "configure"
+#line 14154 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14156,7 +14161,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14175,13 +14180,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:14179: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:14184: 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 14185 "configure"
+#line 14190 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14192,7 +14197,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14219,13 +14224,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:14223: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:14228: 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 14229 "configure"
+#line 14234 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14236,7 +14241,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14255,13 +14260,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:14259: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:14264: 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 14265 "configure"
+#line 14270 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14272,7 +14277,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14385,7 +14390,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:14389: checking whether to use FreeType" >&5
+echo "configure:14394: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -14404,7 +14409,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:14408: checking for location of FreeType includes" >&5
+echo "configure:14413: 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; }
@@ -14430,15 +14435,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14434: checking for $ac_hdr" >&5
+echo "configure:14439: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14437 "configure"
+#line 14442 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14447: \"$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*
@@ -14472,7 +14477,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:14476: checking for location of FreeType library" >&5
+echo "configure:14481: 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; }
@@ -14497,13 +14502,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:14501: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:14506: 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 14507 "configure"
+#line 14512 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14514,7 +14519,7 @@
FT_Init_FreeType()
; 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:14523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14555,7 +14560,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:14559: checking whether to use NLS" >&5
+echo "configure:14564: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -14575,10 +14580,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:14579: checking for gettext" >&5
+echo "configure:14584: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 14582 "configure"
+#line 14587 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -14601,7 +14606,7 @@
; return 0; }
EOF
-if { (eval echo configure:14605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14610: \"$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
@@ -14619,13 +14624,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:14623: checking for gettext in -lintl" >&5
+echo "configure:14628: 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 14629 "configure"
+#line 14634 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14636,7 +14641,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:14640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14671,7 +14676,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:14675: checking whether to use C++" >&5
+echo "configure:14680: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -14687,7 +14692,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:14691: checking for $ac_word" >&5
+echo "configure:14696: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -14716,7 +14721,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:14720: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:14725: 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.
@@ -14727,12 +14732,12 @@
cat > conftest.$ac_ext << EOF
-#line 14731 "configure"
+#line 14736 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:14736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14741: \"$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
@@ -14758,19 +14763,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:14762: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:14767: 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:14767: checking whether we are using GNU C++" >&5
+echo "configure:14772: 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:14774: \"$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:14779: \"$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
@@ -14788,7 +14793,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:14792: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:14797: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -14829,7 +14834,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:14833: checking whether to use openDWG" >&5
+echo "configure:14838: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -14849,7 +14854,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:14853: checking for location of openDGW includes" >&5
+echo "configure:14858: 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; }
@@ -14875,15 +14880,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14879: checking for $ac_hdr" >&5
+echo "configure:14884: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14882 "configure"
+#line 14887 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14892: \"$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*
@@ -14917,7 +14922,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:14921: checking for location of openDWG library" >&5
+echo "configure:14926: 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; }
@@ -14964,7 +14969,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:14968: checking for special C compiler options needed for large files" >&5
+echo "configure:14973: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -14972,7 +14977,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 14976 "configure"
+#line 14981 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -14988,7 +14993,7 @@
; return 0; }
EOF
-if { (eval echo configure:14992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -14997,7 +15002,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 15001 "configure"
+#line 15006 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15013,7 +15018,7 @@
; return 0; }
EOF
-if { (eval echo configure:15017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -15033,11 +15038,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:15037: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:15042: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 15041 "configure"
+#line 15046 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15053,14 +15058,14 @@
; return 0; }
EOF
-if { (eval echo configure:15057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15062: \"$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 15064 "configure"
+#line 15069 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -15078,7 +15083,7 @@
; return 0; }
EOF
-if { (eval echo configure:15082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -15097,11 +15102,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:15101: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:15106: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 15105 "configure"
+#line 15110 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15117,14 +15122,14 @@
; return 0; }
EOF
-if { (eval echo configure:15121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15126: \"$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 15128 "configure"
+#line 15133 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -15142,7 +15147,7 @@
; return 0; }
EOF
-if { (eval echo configure:15146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -15161,25 +15166,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:15165: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:15170: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 15169 "configure"
+#line 15174 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:15176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15181: \"$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 15183 "configure"
+#line 15188 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -15188,7 +15193,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:15192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -15209,10 +15214,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:15213: checking if system supports Large Files at all" >&5
+echo "configure:15218: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 15216 "configure"
+#line 15221 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -15244,7 +15249,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:15248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -15273,7 +15278,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:15277: checking whether to use Python" >&5
+echo "configure:15282: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -15293,7 +15298,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:15297: checking for $ac_word" >&5
+echo "configure:15302: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -15338,15 +15343,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15342: checking for $ac_hdr" >&5
+echo "configure:15347: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15345 "configure"
+#line 15350 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15355: \"$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*
@@ -15386,7 +15391,7 @@
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15390: checking for $ac_word" >&5
+echo "configure:15395: checking for $ac_word" >&5
case "$SWIG" in
/*)
@@ -15432,7 +15437,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:15436: checking whether to use wxWidgets" >&5
+echo "configure:15441: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -15452,7 +15457,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:15456: checking for $ac_word" >&5
+echo "configure:15461: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -15500,7 +15505,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:15504: checking wxWidgets version" >&5
+echo "configure:15509: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -15523,15 +15528,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15527: checking for $ac_hdr" >&5
+echo "configure:15532: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15530 "configure"
+#line 15535 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15540: \"$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*
@@ -15567,15 +15572,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15571: checking for $ac_hdr" >&5
+echo "configure:15576: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15574 "configure"
+#line 15579 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15584: \"$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/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/configure.in 2008-09-01 11:13:00 UTC (rev 33187)
@@ -679,6 +679,11 @@
AC_MSG_CHECKING(whether to use GDAL)
+GDAL_LIBS=
+GDAL_CFLAGS=
+USE_GDAL=
+USE_OGR=
+
if test "`basename xx/$with_gdal`" = "gdal-config" ; then
GDAL_CONFIG="$with_gdal"
fi
@@ -693,11 +698,6 @@
AC_MSG_ERROR([*** couldn't find gdal-config])
fi
- GDAL_LIBS=
- GDAL_CFLAGS=
- USE_GDAL=
- USE_OGR=
-
if test "$GDAL_CONFIG" != "" ; then
GDAL_LIBS=`"$GDAL_CONFIG" --libs`
GDAL_DEP_LIBS=`"$GDAL_CONFIG" --dep-libs`
@@ -723,12 +723,14 @@
LIBS=${ac_save_libs}
CFLAGS=${ac_save_cflags}
- AC_SUBST(GDAL_LIBS)
- AC_SUBST(GDAL_CFLAGS)
- AC_SUBST(USE_GDAL)
- AC_SUBST(USE_OGR)
+ AC_DEFINE(HAVE_GDAL)
fi
+AC_SUBST(GDAL_LIBS)
+AC_SUBST(GDAL_CFLAGS)
+AC_SUBST(USE_GDAL)
+AC_SUBST(USE_OGR)
+
# Enable TIFF option
LOC_CHECK_USE(tiff,TIFF,USE_TIFF)
Modified: grass/branches/develbranch_6/include/config.h.in
===================================================================
--- grass/branches/develbranch_6/include/config.h.in 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/include/config.h.in 2008-09-01 11:13:00 UTC (rev 33187)
@@ -146,6 +146,9 @@
/* define if SQLite is to be used */
#undef HAVE_SQLITE
+/* define if GDAL is to be used */
+#undef HAVE_GDAL
+
/* define if OGR is to be used */
#undef HAVE_OGR
Modified: grass/branches/develbranch_6/include/gis.h
===================================================================
--- grass/branches/develbranch_6/include/gis.h 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/include/gis.h 2008-09-01 11:13:00 UTC (rev 33187)
@@ -623,6 +623,8 @@
int count;
};
+struct GDAL_link;
+
/*============================== Prototypes ================================*/
/* Since there are so many prototypes for the gis library they are stored */
Modified: grass/branches/develbranch_6/include/gisdefs.h
===================================================================
--- grass/branches/develbranch_6/include/gisdefs.h 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/include/gisdefs.h 2008-09-01 11:13:00 UTC (rev 33187)
@@ -548,6 +548,9 @@
int);
void G_fpreclass_perform_id(const struct FPReclass *, const CELL *, DCELL *,
int);
+/* gdal.c */
+struct GDAL_link *G_get_gdal_link(const char *, const char *);
+void G_close_gdal_link(struct GDAL_link *);
/* geodesic.c */
int G_begin_geodesic_equation(double, double, double, double);
Modified: grass/branches/develbranch_6/lib/gis/G.h
===================================================================
--- grass/branches/develbranch_6/lib/gis/G.h 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/lib/gis/G.h 2008-09-01 11:13:00 UTC (rev 33187)
@@ -1,6 +1,10 @@
+#include <grass/config.h>
#include <grass/gis.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
+#ifdef HAVE_GDAL
+#include <gdal.h>
+#endif
#define XDR_FLOAT_NBYTES 4
#define XDR_DOUBLE_NBYTES 8
@@ -14,6 +18,18 @@
*/
typedef int COLUMN_MAPPING;
+struct GDAL_link
+{
+ char *filename;
+ int band_num;
+ DCELL null_val;
+#ifdef HAVE_GDAL
+ GDALDatasetH data;
+ GDALRasterBandH band;
+ GDALDataType type;
+#endif
+};
+
struct fileinfo /* Information for opened cell files */
{
int open_mode; /* see defines below */
@@ -44,6 +60,7 @@
unsigned char *null_work_buf; /* data buffer for reading null rows */
int min_null_row; /* Minimum row null row number in memory */
struct Quant quant;
+ struct GDAL_link *gdal;
};
struct G__ /* Structure of library globals */
Modified: grass/branches/develbranch_6/lib/gis/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/gis/Makefile 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/lib/gis/Makefile 2008-09-01 11:13:00 UTC (rev 33187)
@@ -15,6 +15,11 @@
ifneq ($(USE_LARGEFILES),)
EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
endif
+ifneq ($(USE_GDAL),)
+EXTRA_CFLAGS += -DGDAL_LINK
+EXTRA_INC += $(PROJINC) $(GDALCFLAGS)
+EXTRA_LIBS += $(GDALLIBS)
+endif
default: lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES)
Modified: grass/branches/develbranch_6/lib/gis/closecell.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/closecell.c 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/lib/gis/closecell.c 2008-09-01 11:13:00 UTC (rev 33187)
@@ -133,6 +133,9 @@
This is obsolete since now the mask_bus is always allocated
*/
+ if (fcb->gdal)
+ G_close_gdal_link(fcb->gdal);
+
for (i = 0; i < NULL_ROWS_INMEM; i++)
G_free(fcb->NULL_ROWS[i]);
G_free(fcb->null_work_buf);
Added: grass/branches/develbranch_6/lib/gis/gdal.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gdal.c (rev 0)
+++ grass/branches/develbranch_6/lib/gis/gdal.c 2008-09-01 11:13:00 UTC (rev 33187)
@@ -0,0 +1,125 @@
+
+#include <stdlib.h>
+#include <string.h>
+#include <grass/config.h>
+#include <grass/gis.h>
+#include "G.h"
+
+struct GDAL_link *G_get_gdal_link(const char *name, const char *mapset)
+{
+#ifdef HAVE_GDAL
+ static int initialized;
+ GDALDatasetH data;
+ GDALRasterBandH band;
+ GDALDataType type;
+ RASTER_MAP_TYPE req_type;
+#endif
+ const char *filename;
+ int band_num;
+ struct GDAL_link *gdal;
+ RASTER_MAP_TYPE map_type;
+ FILE *fp;
+ struct Key_Value *key_val;
+ const char *p;
+ DCELL null_val;
+
+ if (!G_find_cell2(name, mapset))
+ return NULL;
+
+ map_type = G_raster_map_type(name, mapset);
+ if (map_type < 0)
+ return NULL;
+
+ fp = G_fopen_old_misc("cell_misc", "gdal", name, mapset);
+ if (!fp)
+ return NULL;
+ key_val = G_fread_key_value(fp);
+ fclose(fp);
+
+ if (!key_val)
+ return NULL;
+
+ filename = G_find_key_value("file", key_val);
+ if (!filename)
+ return NULL;
+
+ p = G_find_key_value("band", key_val);
+ if (!p)
+ return NULL;
+ band_num = atoi(p);
+ if (!band_num)
+ return NULL;
+
+ p = G_find_key_value("null", key_val);
+ if (!p)
+ return NULL;
+ if (strcmp(p, "none") == 0)
+ G_set_d_null_value(&null_val, 1);
+ else
+ null_val = atof(p);
+
+#ifdef HAVE_GDAL
+ p = G_find_key_value("type", key_val);
+ if (!p)
+ return NULL;
+ type = atoi(p);
+
+ switch (type) {
+ case GDT_Byte:
+ case GDT_Int16:
+ case GDT_UInt16:
+ case GDT_Int32:
+ case GDT_UInt32:
+ req_type = CELL_TYPE;
+ break;
+ case GDT_Float32:
+ req_type = FCELL_TYPE;
+ break;
+ case GDT_Float64:
+ req_type = DCELL_TYPE;
+ break;
+ default:
+ return NULL;
+ }
+
+ if (req_type != map_type)
+ return NULL;
+
+ if (!initialized) {
+ GDALAllRegister();
+ initialized = 1;
+ }
+
+ data = GDALOpen(filename, GA_ReadOnly);
+ if (!data)
+ return NULL;
+
+ band = GDALGetRasterBand(data, band_num);
+ if (!band) {
+ GDALClose(data);
+ return NULL;
+ }
+#endif
+
+ gdal = G_calloc(1, sizeof(struct GDAL_link));
+
+ gdal->filename = G_store(filename);
+ gdal->band_num = band_num;
+ gdal->null_val = null_val;
+#ifdef HAVE_GDAL
+ gdal->data = data;
+ gdal->band = band;
+ gdal->type = type;
+#endif
+
+ return gdal;
+}
+
+void G_close_gdal_link(struct GDAL_link *gdal)
+{
+#ifdef HAVE_GDAL
+ GDALClose(gdal->data);
+#endif
+ G_free(gdal->filename);
+ G_free(gdal);
+}
Property changes on: grass/branches/develbranch_6/lib/gis/gdal.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: grass/branches/develbranch_6/lib/gis/get_row.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/get_row.c 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/lib/gis/get_row.c 2008-09-01 11:13:00 UTC (rev 33187)
@@ -198,12 +198,35 @@
/*--------------------------------------------------------------------------*/
+#ifdef HAVE_GDAL
+static int read_data_gdal(int fd, int row, unsigned char *data_buf, int *nbytes)
+{
+ struct fileinfo *fcb = &G__.fileinfo[fd];
+ CPLErr err;
+
+ *nbytes = fcb->nbytes;
+
+ err = GDALRasterIO(
+ fcb->gdal->band, GF_Read, 0, row, fcb->cellhd.cols, 1, data_buf,
+ fcb->cellhd.cols, 1, fcb->gdal->type, 0, 0);
+
+ return err == CE_None ? 0 : -1;
+}
+#endif
+
+/*--------------------------------------------------------------------------*/
+
/* Actually read a row of data in */
static int read_data(int fd, int row, unsigned char *data_buf, int *nbytes)
{
struct fileinfo *fcb = &G__.fileinfo[fd];
+#ifdef HAVE_GDAL
+ if (fcb->gdal)
+ return read_data_gdal(fd, row, data_buf, nbytes);
+#endif
+
if (!fcb->cellhd.compressed)
return read_data_uncompressed(fd, row, data_buf, nbytes);
@@ -350,8 +373,106 @@
/*--------------------------------------------------------------------------*/
+#ifdef HAVE_GDAL
+
/*--------------------------------------------------------------------------*/
+static void gdal_values_int(int fd, const unsigned char *data,
+ const COLUMN_MAPPING *cmap, int nbytes,
+ CELL *cell, int n)
+{
+ struct fileinfo *fcb = &G__.fileinfo[fd];
+ const unsigned char *d;
+ COLUMN_MAPPING cmapold = 0;
+ int i;
+
+ for (i = 0; i < n; i++) {
+ if (!cmap[i]) {
+ cell[i] = 0;
+ continue;
+ }
+
+ if (cmap[i] == cmapold) {
+ cell[i] = cell[i-1];
+ continue;
+ }
+
+ d = data + (cmap[i] - 1) * nbytes;
+
+ switch (fcb->gdal->type) {
+ case GDT_Byte: cell[i] = *(GByte *)d; break;
+ case GDT_Int16: cell[i] = *(GInt16 *)d; break;
+ case GDT_UInt16: cell[i] = *(GUInt16 *)d; break;
+ case GDT_Int32: cell[i] = *(GInt32 *)d; break;
+ case GDT_UInt32: cell[i] = *(GUInt32 *)d; break;
+ default:
+ /* shouldn't happen */
+ G_set_c_null_value(&cell[i], 1);
+ break;
+ }
+
+ cmapold = cmap[i];
+ }
+}
+
+/*--------------------------------------------------------------------------*/
+
+static void gdal_values_float(int fd, const float *data,
+ const COLUMN_MAPPING *cmap, int nbytes,
+ FCELL *cell, int n)
+{
+ COLUMN_MAPPING cmapold = 0;
+ int i;
+
+ for (i = 0; i < n; i++) {
+ if (!cmap[i]) {
+ cell[i] = 0;
+ continue;
+ }
+
+ if (cmap[i] == cmapold) {
+ cell[i] = cell[i-1];
+ continue;
+ }
+
+ cell[i] = data[cmap[i] - 1];
+
+ cmapold = cmap[i];
+ }
+}
+
+/*--------------------------------------------------------------------------*/
+
+static void gdal_values_double(int fd, const double *data,
+ const COLUMN_MAPPING *cmap, int nbytes,
+ DCELL *cell, int n)
+{
+ COLUMN_MAPPING cmapold = 0;
+ int i;
+
+ for (i = 0; i < n; i++) {
+ if (!cmap[i]) {
+ cell[i] = 0;
+ continue;
+ }
+
+ if (cmap[i] == cmapold) {
+ cell[i] = cell[i-1];
+ continue;
+ }
+
+ cell[i] = data[cmap[i] - 1];
+
+ cmapold = cmap[i];
+ }
+}
+
+/*--------------------------------------------------------------------------*/
+
+#endif
+
+/*--------------------------------------------------------------------------*/
+
/* transfer_to_cell_XY takes bytes from fcb->data, converts these bytes with
the appropriate procedure (e.g. XDR or byte reordering) into type X
values which are put into array G__.work_buf.
@@ -368,8 +489,19 @@
{
static void (*cell_values_type[3]) () = {
cell_values_int, cell_values_float, cell_values_double};
+#ifdef HAVE_GDAL
+ static void (*gdal_values_type[3]) () = {
+ gdal_values_int, gdal_values_float, gdal_values_double};
+#endif
struct fileinfo *fcb = &G__.fileinfo[fd];
+#ifdef HAVE_GDAL
+ if (fcb->gdal)
+ (gdal_values_type[fcb->map_type]) (fd, fcb->data, fcb->col_map,
+ fcb->cur_nbytes, cell,
+ G__.window.cols);
+ else
+#endif
(cell_values_type[fcb->map_type]) (fd, fcb->data, fcb->col_map,
fcb->cur_nbytes, cell,
G__.window.cols);
@@ -998,6 +1130,29 @@
/*--------------------------------------------------------------------------*/
+#ifdef HAVE_GDAL
+
+static void get_null_value_row_gdal(int fd, char *flags, int row)
+{
+ struct fileinfo *fcb = &G__.fileinfo[fd];
+ DCELL *tmp_buf = G_allocate_d_raster_buf();
+ int i;
+
+ if (get_map_row_nomask(fd, tmp_buf, row, DCELL_TYPE) <= 0) {
+ memset(flags, 1, G__.window.cols);
+ G_free(tmp_buf);
+ return;
+ }
+
+ for (i = 0; i < G__.window.cols; i++)
+ /* note: using == won't work if the null value is NaN */
+ flags[i] = memcmp(&tmp_buf[i], &fcb->gdal->null_val, sizeof(DCELL)) == 0;
+
+ G_free(tmp_buf);
+}
+
+#endif
+
/*--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*/
@@ -1022,6 +1177,12 @@
static void get_null_value_row(int fd, char *flags, int row, int with_mask)
{
+#ifdef HAVE_GDAL
+ struct fileinfo *fcb = &G__.fileinfo[fd];
+ if (fcb->gdal)
+ get_null_value_row_gdal(fd, flags, row);
+ else
+#endif
get_null_value_row_nomask(fd, flags, row);
if (with_mask)
Modified: grass/branches/develbranch_6/lib/gis/opencell.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/opencell.c 2008-09-01 10:39:54 UTC (rev 33186)
+++ grass/branches/develbranch_6/lib/gis/opencell.c 2008-09-01 11:13:00 UTC (rev 33187)
@@ -159,6 +159,7 @@
RASTER_MAP_TYPE MAP_TYPE;
struct Reclass reclass;
const char *xmapset;
+ struct GDAL_link *gdal;
/* make sure window is set */
G__init_window();
@@ -250,8 +251,21 @@
MAP_NBYTES = CELL_nbytes;
}
- /* now actually open file for reading */
- fd = G_open_old(cell_dir, r_name, r_mapset);
+ gdal = G_get_gdal_link(r_name, r_mapset);
+ if (gdal) {
+#ifdef HAVE_GDAL
+ /* dummy descriptor to reserve the fileinfo slot */
+ fd = open("/dev/null", O_RDONLY);
+#else
+ G_warning(_("map <%s@%s> is a GDAL link but GRASS is compiled without GDAL support"),
+ r_name, r_mapset);
+ return -1;
+#endif
+ }
+ else
+ /* now actually open file for reading */
+ fd = G_open_old(cell_dir, r_name, r_mapset);
+
if (fd < 0)
return -1;
@@ -292,11 +306,14 @@
if ((fcb->reclass_flag = reclass_flag))
G_copy(&fcb->reclass, &reclass, sizeof(reclass));
- /* check for compressed data format, making initial reads if necessary */
- if (G__check_format(fd) < 0) {
- close(fd); /* warning issued by check_format() */
- return -1;
- }
+ if (gdal)
+ fcb->gdal = gdal;
+ else
+ /* check for compressed data format, making initial reads if necessary */
+ if (G__check_format(fd) < 0) {
+ close(fd); /* warning issued by check_format() */
+ return -1;
+ }
/* create the mapping from cell file to window */
G__create_window_mapping(fd);
Added: grass/branches/develbranch_6/raster/r.external/Makefile
===================================================================
--- grass/branches/develbranch_6/raster/r.external/Makefile (rev 0)
+++ grass/branches/develbranch_6/raster/r.external/Makefile 2008-09-01 11:13:00 UTC (rev 33187)
@@ -0,0 +1,15 @@
+MODULE_TOPDIR = ../..
+
+PGM = r.external
+
+LIBES= $(GPROJLIB) $(GISLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(IMAGERYDEP) $(GMATHDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+ifneq ($(USE_GDAL),)
+default: cmd
+else
+default:
+endif
Property changes on: grass/branches/develbranch_6/raster/r.external/Makefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: grass/branches/develbranch_6/raster/r.external/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.external/description.html (rev 0)
+++ grass/branches/develbranch_6/raster/r.external/description.html 2008-09-01 11:13:00 UTC (rev 33187)
@@ -0,0 +1,33 @@
+<h2>DESCRIPTION</h2>
+
+<em>r.external</em> allows a user to link a GDAL supported raster file to a binary
+raster map layer, from any GDAL supported raster map format, with an optional
+title. The file is not imported but just registered as GRASS raster map.
+
+<h2>EXAMPLES</h2>
+
+<h3>RGB Orthophoto from GeoTIFF</h3>
+
+<div class="code"><pre>
+r.external /home/user/data/maps/059100.tif out=ortho.1 band=1
+r.external /home/user/data/maps/059100.tif out=ortho.2 band=2
+r.external /home/user/data/maps/059100.tif out=ortho.3 band=3
+g.region rast=ortho.3 -p
+d.rgb r=ortho.1 g=ortho.2 b=ortho.3
+r.composite r=ortho.1 g=ortho.2 b=ortho.3 output=ortho.rgb
+</pre></div>
+
+<h2>SEE ALSO</h2>
+<em>
+<a href="r.in.gdal.html">r.in.gdal</a>
+</em>
+
+<h2>REFERENCES</h2>
+
+GDAL Pages: <a href="http://www.gdal.org">http://www.gdal.org/</a><br>
+
+<h2>AUTHOR</h2>
+
+Glynn Clements
+
+<p><i>Last changed: $Date: 2008-08-15 08:16:42 +0200 (Fri, 15 Aug 2008) $</i>
Added: grass/branches/develbranch_6/raster/r.external/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.external/main.c (rev 0)
+++ grass/branches/develbranch_6/raster/r.external/main.c 2008-09-01 11:13:00 UTC (rev 33187)
@@ -0,0 +1,627 @@
+
+/****************************************************************************
+ *
+ * MODULE: r.external
+ *
+ * AUTHOR(S): Glynn Clements, based on r.in.gdal
+ *
+ * PURPOSE: Link raster map into GRASS utilizing the GDAL library.
+ *
+ * COPYRIGHT: (C) 2008 by Glynn Clements and 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.
+ *
+ *****************************************************************************/
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <math.h>
+#include <string.h>
+#include <grass/gis.h>
+#include <grass/imagery.h>
+#include <grass/gprojects.h>
+#include <grass/glocale.h>
+
+#include "gdal.h"
+#include "ogr_srs_api.h"
+
+#undef MIN
+#undef MAX
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+
+struct band_info
+{
+ RASTER_MAP_TYPE data_type;
+ GDALDataType gdal_type;
+ int has_null;
+ double null_val;
+ double range[2];
+ struct Colors colors;
+};
+
+static void list_formats(void)
+{
+ /* -------------------------------------------------------------------- */
+ /* List supported formats and exit. */
+ /* code from GDAL 1.2.5 gcore/gdal_misc.cpp */
+ /* Copyright (c) 1999, Frank Warmerdam */
+ /* -------------------------------------------------------------------- */
+ int iDr;
+
+ fprintf(stdout, _("Supported Formats:\n"));
+ for (iDr = 0; iDr < GDALGetDriverCount(); iDr++) {
+ GDALDriverH hDriver = GDALGetDriver(iDr);
+ const char *pszRWFlag;
+
+ if (GDALGetMetadataItem(hDriver, GDAL_DCAP_CREATE, NULL))
+ pszRWFlag = "rw+";
+ else if (GDALGetMetadataItem(hDriver, GDAL_DCAP_CREATECOPY, NULL))
+ pszRWFlag = "rw";
+ else
+ pszRWFlag = "ro";
+
+ fprintf(stdout, " %s (%s): %s\n",
+ GDALGetDriverShortName(hDriver),
+ pszRWFlag, GDALGetDriverLongName(hDriver));
+ }
+}
+
+static void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int override)
+{
+ struct Cell_head loc_wind;
+ struct Key_Value *proj_info = NULL, *proj_units = NULL;
+ struct Key_Value *loc_proj_info = NULL, *loc_proj_units = NULL;
+ int projcomp_error = 0;
+ char error_msg[8096];
+
+ /* Projection only required for checking so convert non-interactively */
+ if (GPJ_wkt_to_grass(cellhd, &proj_info,
+ &proj_units, GDALGetProjectionRef(hDS), 0) < 0)
+ G_warning(_("Unable to convert input raster map projection information to "
+ "GRASS format for checking"));
+ else {
+ /* -------------------------------------------------------------------- */
+ /* Does the projection of the current location match the */
+ /* dataset? */
+ /* -------------------------------------------------------------------- */
+ G_get_window(&loc_wind);
+ if (loc_wind.proj != PROJECTION_XY) {
+ loc_proj_info = G_get_projinfo();
+ loc_proj_units = G_get_projunits();
+ }
+
+ if (override) {
+ cellhd->proj = loc_wind.proj;
+ cellhd->zone = loc_wind.zone;
+ G_warning(_("Over-riding projection check"));
+ }
+ else if (loc_wind.proj != cellhd->proj ||
+ (projcomp_error = G_compare_projections(
+ loc_proj_info, loc_proj_units, proj_info, proj_units)) < 0) {
+ int i_value;
+
+ strcpy(error_msg,
+ _("Projection of dataset does not"
+ " appear to match current location.\n\n"));
+
+ /* TODO: output this info sorted by key: */
+ if (loc_proj_info != NULL) {
+ strcat(error_msg, _("Location PROJ_INFO is:\n"));
+ for (i_value = 0;
+ loc_proj_info != NULL &&
+ i_value < loc_proj_info->nitems; i_value++)
+ sprintf(error_msg + strlen(error_msg), "%s: %s\n",
+ loc_proj_info->key[i_value],
+ loc_proj_info->value[i_value]);
+ strcat(error_msg, "\n");
+ }
+
+ if (proj_info != NULL) {
+ strcat(error_msg, _("Dataset PROJ_INFO is:\n"));
+ for (i_value = 0;
+ proj_info != NULL && i_value < proj_info->nitems;
+ i_value++)
+ sprintf(error_msg + strlen(error_msg), "%s: %s\n",
+ proj_info->key[i_value],
+ proj_info->value[i_value]);
+ strcat(error_msg, "\nERROR: ");
+ switch (projcomp_error) {
+ case -1:
+ strcat(error_msg, "proj\n");
+ break;
+ case -2:
+ strcat(error_msg, "units\n");
+ break;
+ case -3:
+ strcat(error_msg, "datum\n");
+ break;
+ case -4:
+ strcat(error_msg, "ellps\n");
+ break;
+ case -5:
+ strcat(error_msg, "zone\n");
+ break;
+ }
+ }
+ else {
+ strcat(error_msg, _("Import dataset PROJ_INFO is:\n"));
+ if (cellhd->proj == PROJECTION_XY)
+ sprintf(error_msg + strlen(error_msg),
+ "cellhd.proj = %d (unreferenced/unknown)\n",
+ cellhd->proj);
+ else if (cellhd->proj == PROJECTION_LL)
+ sprintf(error_msg + strlen(error_msg),
+ "cellhd.proj = %d (lat/long)\n", cellhd->proj);
+ else if (cellhd->proj == PROJECTION_UTM)
+ sprintf(error_msg + strlen(error_msg),
+ "cellhd.proj = %d (UTM), zone = %d\n",
+ cellhd->proj, cellhd->zone);
+ else if (cellhd->proj == PROJECTION_SP)
+ sprintf(error_msg + strlen(error_msg),
+ "cellhd.proj = %d (State Plane), zone = %d\n",
+ cellhd->proj, cellhd->zone);
+ else
+ sprintf(error_msg + strlen(error_msg),
+ "cellhd.proj = %d (unknown), zone = %d\n",
+ cellhd->proj, cellhd->zone);
+ }
+ strcat(error_msg,
+ _("\nYou can use the -o flag to r.external to override this check and "
+ "use the location definition for the dataset.\n"));
+ strcat(error_msg,
+ _("Consider generating a new location from the input dataset using "
+ "the 'location' parameter.\n"));
+ G_fatal_error(error_msg);
+ }
+ else {
+ G_message(_("Projection of input dataset and current location "
+ "appear to match"));
+ }
+ }
+}
+
+static void setup_window(struct Cell_head *cellhd, GDALDatasetH hDS)
+{
+ /* -------------------------------------------------------------------- */
+ /* Set up the window representing the data we have. */
+ /* -------------------------------------------------------------------- */
+
+ double adfGeoTransform[6];
+
+ cellhd->rows = GDALGetRasterYSize(hDS);
+ cellhd->rows3 = GDALGetRasterYSize(hDS);
+ cellhd->cols = GDALGetRasterXSize(hDS);
+ cellhd->cols3 = GDALGetRasterXSize(hDS);
+
+ if (GDALGetGeoTransform(hDS, adfGeoTransform) == CE_None &&
+ adfGeoTransform[5] < 0.0) {
+ if (adfGeoTransform[2] != 0.0 || adfGeoTransform[4] != 0.0)
+ G_fatal_error(_("Input raster map is rotated - cannot import. "
+ "You may use 'gdalwarp' to transform the map to North-up."));
+
+ cellhd->north = adfGeoTransform[3];
+ cellhd->ns_res = fabs(adfGeoTransform[5]);
+ cellhd->ns_res3 = fabs(adfGeoTransform[5]);
+ cellhd->south = cellhd->north - cellhd->ns_res * cellhd->rows;
+ cellhd->west = adfGeoTransform[0];
+ cellhd->ew_res = adfGeoTransform[1];
+ cellhd->ew_res3 = adfGeoTransform[1];
+ cellhd->east = cellhd->west + cellhd->cols * cellhd->ew_res;
+ cellhd->top = 1.;
+ cellhd->bottom = 0.;
+ cellhd->tb_res = 1.;
+ cellhd->depths = 1;
+ }
+ else {
+ cellhd->north = cellhd->rows;
+ cellhd->south = 0.0;
+ cellhd->ns_res = 1.0;
+ cellhd->ns_res3 = 1.0;
+ cellhd->west = 0.0;
+ cellhd->east = cellhd->cols;
+ cellhd->ew_res = 1.0;
+ cellhd->ew_res3 = 1.0;
+ cellhd->top = 1.;
+ cellhd->bottom = 0.;
+ cellhd->tb_res = 1.;
+ cellhd->depths = 1;
+ }
+}
+
+static void update_default_window(struct Cell_head *cellhd)
+{
+ /* -------------------------------------------------------------------- */
+ /* Extend current window based on dataset. */
+ /* -------------------------------------------------------------------- */
+
+ struct Cell_head def_wind;
+
+ G_get_default_window(&def_wind);
+
+ def_wind.north = MAX(def_wind.north, cellhd->north);
+ def_wind.south = MIN(def_wind.south, cellhd->south);
+ def_wind.west = MIN(def_wind.west, cellhd->west);
+ def_wind.east = MAX(def_wind.east, cellhd->east);
+
+ def_wind.rows = (int)ceil((def_wind.north - def_wind.south)
+ / def_wind.ns_res);
+ def_wind.south = def_wind.north - def_wind.rows * def_wind.ns_res;
+
+ def_wind.cols = (int)ceil((def_wind.east - def_wind.west)
+ / def_wind.ew_res);
+ def_wind.east = def_wind.west + def_wind.cols * def_wind.ew_res;
+
+ G__put_window(&def_wind, "../PERMANENT", "DEFAULT_WIND");
+}
+
+static void query_band(GDALRasterBandH hBand, const char *output, int exact_range,
+ struct Cell_head *cellhd, struct band_info *info)
+{
+ int bGotMin, bGotMax;
+
+ info->gdal_type = GDALGetRasterDataType(hBand);
+
+ info->null_val = GDALGetRasterNoDataValue(hBand, &info->has_null);
+
+ cellhd->compressed = 0;
+
+ switch (info->gdal_type) {
+ case GDT_Float32:
+ info->data_type = FCELL_TYPE;
+ cellhd->format = -1;
+ break;
+
+ case GDT_Float64:
+ info->data_type = DCELL_TYPE;
+ cellhd->format = -1;
+ break;
+
+ case GDT_Byte:
+ info->data_type = CELL_TYPE;
+ cellhd->format = 0;
+ break;
+
+ case GDT_Int16:
+ case GDT_UInt16:
+ info->data_type = CELL_TYPE;
+ cellhd->format = 1;
+ break;
+
+ case GDT_Int32:
+ case GDT_UInt32:
+ info->data_type = CELL_TYPE;
+ cellhd->format = 3;
+ break;
+
+ default:
+ G_fatal_error(_("Complex types not supported"));
+ break;
+ }
+
+ info->range[0] = GDALGetRasterMinimum(hBand, &bGotMin);
+ info->range[1] = GDALGetRasterMaximum(hBand, &bGotMax);
+ if(!(bGotMin && bGotMax))
+ GDALComputeRasterMinMax(hBand, !exact_range, info->range);
+
+ G_init_colors(&info->colors);
+
+ if (GDALGetRasterColorTable(hBand) != NULL) {
+ GDALColorTableH hCT;
+ int count, i;
+
+ G_verbose_message(_("Copying color table for %s"), output);
+
+ hCT = GDALGetRasterColorTable(hBand);
+ count = GDALGetColorEntryCount(hCT);
+
+ for (i = 0; i < count; i++) {
+ GDALColorEntry sEntry;
+
+ GDALGetColorEntryAsRGB(hCT, i, &sEntry);
+ if (sEntry.c4 == 0)
+ continue;
+
+ G_set_color(i, sEntry.c1, sEntry.c2, sEntry.c3, &info->colors);
+ }
+ }
+ else {
+ if (info->gdal_type == GDT_Byte) {
+ /* set full 0..255 range to grey scale: */
+ G_verbose_message(_("Setting grey color table for <%s> (full 8bit range)"),
+ output);
+ G_make_grey_scale_colors(&info->colors, 0, 255);
+ }
+ else {
+ /* set data range to grey scale: */
+ G_verbose_message(_("Setting grey color table for <%s> (data range)"),
+ output);
+ G_make_grey_scale_colors(&info->colors,
+ (int) info->range[0], (int) info->range[1]);
+ }
+ }
+}
+
+static void make_cell(const char *output, const struct band_info *info)
+{
+ FILE *fp;
+
+ fp = G_fopen_new("cell", output);
+ if (!fp)
+ G_fatal_error(_("Unable to create cell/%s file"), output);
+
+ fclose(fp);
+
+ if (info->data_type == CELL_TYPE)
+ return;
+
+ fp = G_fopen_new("fcell", output);
+ if (!fp)
+ G_fatal_error(_("Unable to create fcell/%s file"), output);
+
+ fclose(fp);
+}
+
+static void make_link(const char *input, const char *output, int band,
+ const struct band_info *info)
+{
+ struct Key_Value *key_val = G_create_key_value();
+ char null_str[256], type_str[8], band_str[8];
+ FILE *fp;
+
+ sprintf(band_str, "%d", band);
+
+ if (info->has_null) {
+ if (info->data_type == CELL_TYPE)
+ sprintf(null_str, "%d", (int) info->null_val);
+ else
+ sprintf(null_str, "%.22g", info->null_val);
+ }
+ else
+ strcpy(null_str, "none");
+
+ sprintf(type_str, "%d", info->gdal_type);
+
+ G_set_key_value("file", input, key_val);
+ G_set_key_value("band", band_str, key_val);
+ G_set_key_value("null", null_str, key_val);
+ G_set_key_value("type", type_str, key_val);
+
+ fp = G_fopen_new_misc("cell_misc", "gdal", output);
+ if (!fp)
+ G_fatal_error(_("Unable to create cell_misc/%s/gdal file"), output);
+
+ if (G_fwrite_key_value(fp, key_val) < 0)
+ G_fatal_error(_("Error writing cell_misc/%s/gdal file"), output);
+
+ fclose(fp);
+}
+
+static void write_fp_format(const char *output, const struct band_info *info)
+{
+ struct Key_Value *key_val;
+ const char *type;
+ FILE *fp;
+
+ if (info->data_type == CELL_TYPE)
+ return;
+
+ key_val = G_create_key_value();
+
+ type = (info->data_type == FCELL_TYPE)
+ ? "float"
+ : "double";
+ G_set_key_value("type", type, key_val);
+
+ G_set_key_value("byte_order", "xdr", key_val);
+
+ fp = G_fopen_new_misc("cell_misc", "f_format", output);
+ if (!fp)
+ G_fatal_error(_("Unable to create cell_misc/%s/f_format file"), output);
+
+ if (G_fwrite_key_value(fp, key_val) < 0)
+ G_fatal_error(_("Error writing cell_misc/%s/f_format file"), output);
+
+ G_free_key_value(key_val);
+}
+
+static void write_fp_quant(const char *output)
+{
+ struct Quant quant;
+
+ G_quant_round(&quant);
+
+ if (G_write_quant(output, G_mapset(), &quant) < 0)
+ G_warning(_("Unable to write quant file"));
+}
+
+static void create_map(const char *input, int band, const char *output,
+ struct Cell_head *cellhd, struct band_info *info,
+ const char *title)
+{
+ struct History history;
+
+ G_put_cellhd(output, cellhd);
+
+ make_cell(output, info);
+
+ make_link(input, output, band, info);
+
+ if (info->data_type == CELL_TYPE) {
+ struct Range range;
+ range.min = (CELL)info->range[0];
+ range.max = (CELL)info->range[1];
+ G_write_range(output, &range);
+ }
+ else {
+ struct FPRange fprange;
+ fprange.min = info->range[0];
+ fprange.max = info->range[1];
+ G_write_fp_range(output, &fprange);
+ write_fp_format(output, info);
+ write_fp_quant(output);
+ }
+
+ G_verbose_message(_("Creating support files for %s"), output);
+ G_short_history(output, "raster", &history);
+ G_command_history(&history);
+ G_write_history(output, &history);
+
+ G_write_colors(output, G_mapset(), &info->colors);
+
+ if (title)
+ G_put_cell_title(output, title);
+
+ G_message(_("<%s> created"), output);
+
+ return;
+}
+
+int main(int argc, char *argv[])
+{
+ char *input;
+ char *source;
+ char *output;
+ char *title;
+ struct Cell_head cellhd;
+ GDALDatasetH hDS;
+ GDALRasterBandH hBand;
+ struct GModule *module;
+ struct {
+ struct Option *input, *source, *output, *band, *title;
+ } parm;
+ struct Flag *flag_o, *flag_f, *flag_e, *flag_r;
+ int band;
+ struct band_info info;
+
+ G_gisinit(argv[0]);
+
+ module = G_define_module();
+ module->keywords = _("raster, import");
+ module->description =
+ _("Link GDAL supported raster file to a binary raster map layer.");
+
+ parm.input = G_define_standard_option(G_OPT_F_INPUT);
+ parm.input->description = _("Raster file to be linked");
+ parm.input->required = NO;
+ parm.input->guisection = _("Required");
+
+ parm.source = G_define_option();
+ parm.source->key = "source";
+ parm.source->description = _("Name of non-file GDAL data source");
+ parm.source->required = NO;
+ parm.source->type = TYPE_STRING;
+
+ parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
+ parm.output->required = NO; /* not required because of -f flag */
+ parm.output->guisection = _("Required");
+
+ parm.band = G_define_option();
+ parm.band->key = "band";
+ parm.band->type = TYPE_INTEGER;
+ parm.band->required = NO;
+ parm.band->description = _("Band to select");
+ parm.band->answer = "1";
+
+ parm.title = G_define_option();
+ parm.title->key = "title";
+ parm.title->key_desc = "\"phrase\"";
+ parm.title->type = TYPE_STRING;
+ parm.title->required = NO;
+ parm.title->description = _("Title for resultant raster map");
+ parm.title->guisection = _("Metadata");
+
+ flag_o = G_define_flag();
+ flag_o->key = 'o';
+ flag_o->description =
+ _("Override projection (use location's projection)");
+
+ flag_e = G_define_flag();
+ flag_e->key = 'e';
+ flag_e->description = _("Extend location extents based on new dataset");
+
+ flag_r = G_define_flag();
+ flag_r->key = 'r';
+ flag_r->description = _("Require exact range");
+
+ flag_f = G_define_flag();
+ flag_f->key = 'f';
+ flag_f->description = _("List supported formats and exit");
+ flag_f->guisection = _("Print");
+
+ if (G_parser(argc, argv))
+ exit(EXIT_FAILURE);
+
+ GDALAllRegister();
+
+ if (flag_f->answer) {
+ list_formats();
+ exit(EXIT_SUCCESS);
+ }
+
+ input = parm.input->answer;
+ source = parm.source->answer;
+ output = parm.output->answer;
+
+ if (parm.title->answer) {
+ title = G_store(parm.title->answer);
+ G_strip(title);
+ }
+ else
+ title = NULL;
+
+ if (parm.band->answer)
+ band = atoi(parm.band->answer);
+ else
+ band = 1;
+
+ if (!input && !source)
+ G_fatal_error(_("Name for input source not specified"));
+
+ if (input && source)
+ G_fatal_error(_("input= and source= are mutually exclusive"));
+
+ if (!output)
+ G_fatal_error(_("Name for output raster map not specified"));
+
+ if (input && !G_is_absolute_path(input)) {
+ char path[GPATH_MAX];
+ getcwd(path, sizeof(path));
+ strcat(path, "/");
+ strcat(path, input);
+ input = G_store(path);
+ }
+
+ if (!input)
+ input = source;
+
+ hDS = GDALOpen(input, GA_ReadOnly);
+ if (hDS == NULL)
+ return 1;
+
+ setup_window(&cellhd, hDS);
+
+ check_projection(&cellhd, hDS, flag_o->answer);
+
+ G_verbose_message(_("Proceeding with import..."));
+
+ hBand = GDALGetRasterBand(hDS, band);
+ if (!hBand)
+ G_fatal_error(_("Selected band (%d) does not exist"), band);
+
+ if (G_set_window(&cellhd) < 0)
+ G_fatal_error(_("Unable to set window"));
+
+ query_band(hBand, output, flag_r->answer, &cellhd, &info);
+ create_map(input, band, output, &cellhd, &info, title);
+
+ if (flag_e->answer)
+ update_default_window(&cellhd);
+
+ G_done_msg(" ");
+
+ exit(EXIT_SUCCESS);
+}
+
Property changes on: grass/branches/develbranch_6/raster/r.external/main.c
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the grass-commit
mailing list