[fdo-commits] r2632 - trunk/Providers/GDAL
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Sun Mar 4 01:12:01 EST 2007
Author: gregboone
Date: 2007-03-04 01:12:00 -0500 (Sun, 04 Mar 2007)
New Revision: 2632
Modified:
trunk/Providers/GDAL/config.status
trunk/Providers/GDAL/configure
trunk/Providers/GDAL/configure.in
Log:
Ticket #5: Update to GDAL 1.4
Modified: trunk/Providers/GDAL/config.status
===================================================================
--- trunk/Providers/GDAL/config.status 2007-03-04 05:38:55 UTC (rev 2631)
+++ trunk/Providers/GDAL/config.status 2007-03-04 06:12:00 UTC (rev 2632)
@@ -259,7 +259,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by FDORASTER $as_me 3.2.0, which was
+This file was extended by FDOGDAL $as_me 3.3.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -296,7 +296,7 @@
Report bugs to <bug-autoconf at gnu.org>."
ac_cs_version="\
-FDORASTER config.status 3.2.0
+FDOGDAL config.status 3.3.0
configured by ./configure, generated by GNU Autoconf 2.59,
with options \"\"
@@ -453,11 +453,11 @@
s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
s, at SHELL@,/bin/sh,;t t
s, at PATH_SEPARATOR@,:,;t t
-s, at PACKAGE_NAME@,FDORASTER,;t t
-s, at PACKAGE_TARNAME@,fdoraster,;t t
-s, at PACKAGE_VERSION@,3.2.0,;t t
-s, at PACKAGE_STRING@,FDORASTER 3.2.0,;t t
-s, at PACKAGE_BUGREPORT@,https://www.fdoraster.osgeo.org,;t t
+s, at PACKAGE_NAME@,FDOGDAL,;t t
+s, at PACKAGE_TARNAME@,fdogdal,;t t
+s, at PACKAGE_VERSION@,3.3.0,;t t
+s, at PACKAGE_STRING@,FDOGDAL 3.3.0,;t t
+s, at PACKAGE_BUGREPORT@,http://fdo.osgeo.org,;t t
s, at exec_prefix@,${prefix},;t t
s, at prefix@,/usr/local/fdo-3.3.0,;t t
s, at program_transform_name@,s,x,x,,;t t
@@ -476,7 +476,7 @@
s, at build_alias@,,;t t
s, at host_alias@,,;t t
s, at target_alias@,,;t t
-s, at DEFS@,-DPACKAGE_NAME=\"FDORASTER\" -DPACKAGE_TARNAME=\"fdoraster\" -DPACKAGE_VERSION=\"3.2.0\" -DPACKAGE_STRING=\"FDORASTER\ 3.2.0\" -DPACKAGE_BUGREPORT=\"https://www.fdoraster.osgeo.org\" -DPACKAGE=\"fdoraster\" -DVERSION=\"3.2.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 ,;t t
+s, at DEFS@,-DPACKAGE_NAME=\"FDOGDAL\" -DPACKAGE_TARNAME=\"fdogdal\" -DPACKAGE_VERSION=\"3.3.0\" -DPACKAGE_STRING=\"FDOGDAL\ 3.3.0\" -DPACKAGE_BUGREPORT=\"http://fdo.osgeo.org\" -DPACKAGE=\"fdogdal\" -DVERSION=\"3.3.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 ,;t t
s, at ECHO_C@,,;t t
s, at ECHO_N@,-n,;t t
s, at ECHO_T@,,;t t
@@ -485,14 +485,14 @@
s, at INSTALL_SCRIPT@,${INSTALL},;t t
s, at INSTALL_DATA@,${INSTALL} -m 644,;t t
s, at CYGPATH_W@,echo,;t t
-s, at PACKAGE@,fdoraster,;t t
-s, at VERSION@,3.2.0,;t t
-s, at ACLOCAL@,aclocal-1.9,;t t
-s, at AUTOCONF@,autoconf,;t t
-s, at AUTOMAKE@,automake-1.9,;t t
-s, at AUTOHEADER@,autoheader,;t t
-s, at MAKEINFO@,makeinfo,;t t
-s, at install_sh@,/home/gregb/Granite/Providers/GDAL/install-sh,;t t
+s, at PACKAGE@,fdogdal,;t t
+s, at VERSION@,3.3.0,;t t
+s, at ACLOCAL@,${SHELL} /home/gregb/Marble_Trunk/Providers/GDAL/missing --run aclocal-1.9,;t t
+s, at AUTOCONF@,${SHELL} /home/gregb/Marble_Trunk/Providers/GDAL/missing --run autoconf,;t t
+s, at AUTOMAKE@,${SHELL} /home/gregb/Marble_Trunk/Providers/GDAL/missing --run automake-1.9,;t t
+s, at AUTOHEADER@,${SHELL} /home/gregb/Marble_Trunk/Providers/GDAL/missing --run autoheader,;t t
+s, at MAKEINFO@,${SHELL} /home/gregb/Marble_Trunk/Providers/GDAL/missing --run makeinfo,;t t
+s, at install_sh@,/home/gregb/Marble_Trunk/Providers/GDAL/install-sh,;t t
s, at STRIP@,strip,;t t
s, at ac_ct_STRIP@,strip,;t t
s, at INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
@@ -500,7 +500,7 @@
s, at AWK@,gawk,;t t
s, at SET_MAKE@,,;t t
s, at am__leading_dot@,.,;t t
-s, at AMTAR@,tar,;t t
+s, at AMTAR@,${SHELL} /home/gregb/Marble_Trunk/Providers/GDAL/missing --run tar,;t t
s, at am__tar@,${AMTAR} chof - "$$tardir",;t t
s, at am__untar@,${AMTAR} xf -,;t t
s, at CC@,gcc,;t t
@@ -547,9 +547,10 @@
s, at FFLAGS@,-g -O2,;t t
s, at ac_ct_F77@,f95,;t t
s, at LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
-s, at FDO@,/home/gregb/Granite/Fdo,;t t
-s, at FDOUTILITIES@,/home/gregb/Granite/Utilities,;t t
-s, at FDOTHIRDPARTY@,/home/gregb/Granite/Thirdparty,;t t
+s, at FDO@,/home/gregb/Marble_Trunk/Fdo,;t t
+s, at FDOUTILITIES@,/home/gregb/Marble_Trunk/Utilities,;t t
+s, at FDOTHIRDPARTY@,/home/gregb/Marble_Trunk/Providers/GDAL/Thirdparty/gdal,;t t
+s, at FDOGDAL@,/usr/local,;t t
s, at LIBOBJS@,,;t t
s, at LTLIBOBJS@,,;t t
CEOF
Modified: trunk/Providers/GDAL/configure
===================================================================
--- trunk/Providers/GDAL/configure 2007-03-04 05:38:55 UTC (rev 2631)
+++ trunk/Providers/GDAL/configure 2007-03-04 06:12:00 UTC (rev 2632)
@@ -466,7 +466,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL FDO FDOUTILITIES FDOTHIRDPARTY LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL FDO FDOUTILITIES FDOTHIRDPARTY FDOGDAL LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1053,6 +1053,8 @@
default=DEFAULT
--with-fdo-thirdparty specifies directory for FDO API Thirdparty files
default=DEFAULT
+ --with-fdo-gdal specifies directory for thirdparty GDAL files
+ default=DEFAULT
Some influential environment variables:
CC C compiler command
@@ -4200,7 +4202,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4203 "configure"' > conftest.$ac_ext
+ echo '#line 4205 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5335,7 +5337,7 @@
# Provide some information about the compiler.
-echo "$as_me:5338:" \
+echo "$as_me:5340:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6398,11 +6400,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6401: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6403: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6405: \$? = $ac_status" >&5
+ echo "$as_me:6407: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6666,11 +6668,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6669: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6671: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6673: \$? = $ac_status" >&5
+ echo "$as_me:6675: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6770,11 +6772,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6773: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6777: \$? = $ac_status" >&5
+ echo "$as_me:6779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8239,7 +8241,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8242 "configure"' > conftest.$ac_ext
+ echo '#line 8244 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9136,7 +9138,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9139 "configure"
+#line 9141 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9236,7 +9238,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9239 "configure"
+#line 9241 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11576,11 +11578,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11579: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11581: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11583: \$? = $ac_status" >&5
+ echo "$as_me:11585: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11680,11 +11682,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11683: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11685: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11687: \$? = $ac_status" >&5
+ echo "$as_me:11689: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12216,7 +12218,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12219 "configure"' > conftest.$ac_ext
+ echo '#line 12221 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13271,11 +13273,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13274: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13278: \$? = $ac_status" >&5
+ echo "$as_me:13280: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13375,11 +13377,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13378: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13380: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13382: \$? = $ac_status" >&5
+ echo "$as_me:13384: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14824,7 +14826,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14827 "configure"' > conftest.$ac_ext
+ echo '#line 14829 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15599,11 +15601,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15602: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15604: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15606: \$? = $ac_status" >&5
+ echo "$as_me:15608: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15867,11 +15869,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15870: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15872: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15874: \$? = $ac_status" >&5
+ echo "$as_me:15876: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15971,11 +15973,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15974: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15976: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15978: \$? = $ac_status" >&5
+ echo "$as_me:15980: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17440,7 +17442,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17443 "configure"' > conftest.$ac_ext
+ echo '#line 17445 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18675,24 +18677,24 @@
fi;
if test $custom_fdo = "DEFAULT"; then
- if test -d $FDO && test ! $FDO = ""; then
- { echo "$as_me:$LINENO: Building with default location of FDO API files at $FDO" >&5
+ if test -d $FDO && test ! $FDO = ""; then
+ { echo "$as_me:$LINENO: Building with default location of FDO API files at $FDO" >&5
echo "$as_me: Building with default location of FDO API files at $FDO" >&6;}
- else
- { { echo "$as_me:$LINENO: error: The default FDO API path $FDO is not a valid directory. Please use the custom option" >&5
+ else
+ { { echo "$as_me:$LINENO: error: The default FDO API path $FDO is not a valid directory. Please use the custom option" >&5
echo "$as_me: error: The default FDO API path $FDO is not a valid directory. Please use the custom option" >&2;}
{ (exit 1); exit 1; }; }
- fi
+fi
else
- if test -d $custom_fdo; then
- FDO="$custom_fdo"
- { echo "$as_me:$LINENO: Building with custom location of FDO API directory at $FDO" >&5
+ if test -d $custom_fdo; then
+ FDO="$custom_fdo"
+ { echo "$as_me:$LINENO: Building with custom location of FDO API directory at $FDO" >&5
echo "$as_me: Building with custom location of FDO API directory at $FDO" >&6;}
- else
- { { echo "$as_me:$LINENO: error: The specified FDO API path $custom_fdo is not a valid directory" >&5
+ else
+ { { echo "$as_me:$LINENO: error: The specified FDO API path $custom_fdo is not a valid directory" >&5
echo "$as_me: error: The specified FDO API path $custom_fdo is not a valid directory" >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
fi
@@ -18705,24 +18707,24 @@
fi;
if test $custom_fdo_utilities = "DEFAULT"; then
- if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
- { echo "$as_me:$LINENO: Building with default location of FDO Utility files at $FDOUTILITIES" >&5
+ if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
+ { echo "$as_me:$LINENO: Building with default location of FDO Utility files at $FDOUTILITIES" >&5
echo "$as_me: Building with default location of FDO Utility files at $FDOUTILITIES" >&6;}
- else
- { { echo "$as_me:$LINENO: error: the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option" >&5
+ else
+ { { echo "$as_me:$LINENO: error: the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option" >&5
echo "$as_me: error: the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option" >&2;}
{ (exit 1); exit 1; }; }
- fi
+fi
else
- if test -d $custom_fdo_utilities; then
- FDOUTILITIES="$custom_fdo_utilities"
- { echo "$as_me:$LINENO: Building with custom location of FDO Utilities directory at $FDOUTILITIES" >&5
+ if test -d $custom_fdo_utilities; then
+ FDOUTILITIES="$custom_fdo_utilities"
+ { echo "$as_me:$LINENO: Building with custom location of FDO Utilities directory at $FDOUTILITIES" >&5
echo "$as_me: Building with custom location of FDO Utilities directory at $FDOUTILITIES" >&6;}
- else
- { { echo "$as_me:$LINENO: error: The specified FDO Utilities path $custom_fdo_utilities is not a valid directory" >&5
+ else
+ { { echo "$as_me:$LINENO: error: The specified FDO Utilities path $custom_fdo_utilities is not a valid directory" >&5
echo "$as_me: error: The specified FDO Utilities path $custom_fdo_utilities is not a valid directory" >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
fi
@@ -18735,30 +18737,62 @@
fi;
if test $custom_fdo_thirdparty = "DEFAULT"; then
- if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
- { echo "$as_me:$LINENO: Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY" >&5
+ if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
+ { echo "$as_me:$LINENO: Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY" >&5
echo "$as_me: Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY" >&6;}
- else
- { { echo "$as_me:$LINENO: error: The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option" >&5
+ else
+ { { echo "$as_me:$LINENO: error: The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option" >&5
echo "$as_me: error: The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option" >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
else
- if test -d $custom_fdo_thirdparty; then
- FDOTHIRDPARTY="$custom_fdo_thirdparty"
- { echo "$as_me:$LINENO: Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY" >&5
+ if test -d $custom_fdo_thirdparty; then
+ FDOTHIRDPARTY="$custom_fdo_thirdparty"
+ { echo "$as_me:$LINENO: Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY" >&5
echo "$as_me: Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY" >&6;}
- else
- { { echo "$as_me:$LINENO: error: The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory" >&5
+ else
+ { { echo "$as_me:$LINENO: error: The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory" >&5
echo "$as_me: error: The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory" >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
fi
+# Check whether --with-fdo-gdal or --without-fdo-gdal was given.
+if test "${with_fdo_gdal+set}" = set; then
+ withval="$with_fdo_gdal"
+ custom_fdo_gdal=$withval
+else
+ custom_fdo_gdal=DEFAULT
+fi;
+if test $custom_fdo_gdal = "DEFAULT"; then
+ FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
+ if test -d $FDOGDAL; then
+ { echo "$as_me:$LINENO: Building with default location of thirdparty GDAL files at $FDOGDAL" >&5
+echo "$as_me: Building with default location of thirdparty GDAL files at $FDOGDAL" >&6;}
+ else
+ { { echo "$as_me:$LINENO: error: The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option" >&5
+echo "$as_me: error: The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+else
+ if test -d $custom_fdo_gdal; then
+ FDOTHIRDPARTY="$custom_fdo_gdal"
+ { echo "$as_me:$LINENO: Building with custom location of thirdparty GDAL files at $FDOGDAL" >&5
+echo "$as_me: Building with custom location of thirdparty GDAL files at $FDOGDAL" >&6;}
+ else
+ { { echo "$as_me:$LINENO: error: The specified GDAL path $custom_fdo_gdal is not a valid directory" >&5
+echo "$as_me: error: The specified GDAL path $custom_fdo_gdal is not a valid directory" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+
+
+
# Check for Debug or Release build settings
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -18769,16 +18803,16 @@
fi;
if test $enable_debug = yes; then
- { echo "$as_me:$LINENO: Using debug configuration" >&5
+ { echo "$as_me:$LINENO: Using debug configuration" >&5
echo "$as_me: Using debug configuration" >&6;}
- CXXFLAGS="-g -MMD -MT "
- CXXFLAGS="-g -MMD -MT "
+ CXXFLAGS="-g -MMD -MT "
+ CXXFLAGS="-g -MMD -MT "
else
- { echo "$as_me:$LINENO: Using optimized configuration" >&5
+ { echo "$as_me:$LINENO: Using optimized configuration" >&5
echo "$as_me: Using optimized configuration" >&6;}
- CXXFLAGS="-MMD -MT "
- CXXFLAGS="-MMD -MT "
+ CXXFLAGS="-MMD -MT "
+ CXXFLAGS="-MMD -MT "
fi
@@ -19536,6 +19570,7 @@
s, at FDO@,$FDO,;t t
s, at FDOUTILITIES@,$FDOUTILITIES,;t t
s, at FDOTHIRDPARTY@,$FDOTHIRDPARTY,;t t
+s, at FDOGDAL@,$FDOGDAL,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
@@ -20008,4 +20043,3 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
-
Modified: trunk/Providers/GDAL/configure.in
===================================================================
--- trunk/Providers/GDAL/configure.in 2007-03-04 05:38:55 UTC (rev 2631)
+++ trunk/Providers/GDAL/configure.in 2007-03-04 06:12:00 UTC (rev 2632)
@@ -1,163 +1,162 @@
-##
-## Copyright (C) 2004-2006 Autodesk, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of version 2.1 of the GNU Lesser
-## General Public License as published by the Free Software Foundation.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-#------------------configure.in----------------------------------------
-dnl Configure.in for OSGeo FDO GDAL Raster Provider
-#----------------------------------------------------------------------
-# Variables
-# Following are the makefile directories
-#----------------------------------------------------------------------
-AC_INIT(FDOGDAL,3.3.0,http://fdo.osgeo.org)
-AC_CONFIG_SRCDIR(configure.in)
-AM_INIT_AUTOMAKE
-
-AC_PREFIX_DEFAULT(/usr/local/fdo-3.3.0)
-
-AC_LANG_C
-AC_PROG_CC
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AC_PROG_YACC
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-
-AC_SUBST(VERSION, "3.3.0")
-
-dnl *******************************************************
-dnl FDO 3.3.0 Configuration
-dnl FDO / Utilities / Thirdpary / GDAL paths
-dnl *******************************************************
-# custom Fdo path specification
-
-AC_ARG_WITH([fdo],
- FDO_HELP_STRING([--with-fdo], [specifies directory for FDO API files [[default=DEFAULT]]]),
- [custom_fdo=$withval],
- [custom_fdo=DEFAULT])
-
-if test $custom_fdo = "DEFAULT"; then
- if test -d $FDO && test ! $FDO = ""; then
- AC_MSG_NOTICE([Building with default location of FDO API files at $FDO])
- else
- AC_MSG_ERROR([The default FDO API path $FDO is not a valid directory. Please use the custom option])
-fi
-else
- if test -d $custom_fdo; then
- FDO="$custom_fdo"
- AC_MSG_NOTICE([Building with custom location of FDO API directory at $FDO])
- else
- AC_MSG_ERROR([The specified FDO API path $custom_fdo is not a valid directory])
- fi
-fi
-
-AC_ARG_WITH([fdo-utilities],
- FDO_HELP_STRING([--with-fdo-utilities],[specifies directory for FDO API Utility files [[default=DEFAULT]]]),
- [custom_fdo_utilities=$withval],
- [custom_fdo_utilities=DEFAULT])
-
-if test $custom_fdo_utilities = "DEFAULT"; then
- if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
- AC_MSG_NOTICE([Building with default location of FDO Utility files at $FDOUTILITIES])
- else
- AC_MSG_ERROR([the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option])
-fi
-else
- if test -d $custom_fdo_utilities; then
- FDOUTILITIES="$custom_fdo_utilities"
- AC_MSG_NOTICE([Building with custom location of FDO Utilities directory at $FDOUTILITIES])
- else
- AC_MSG_ERROR([The specified FDO Utilities path $custom_fdo_utilities is not a valid directory])
- fi
-fi
-
-AC_ARG_WITH([fdo-thirdparty],
- FDO_HELP_STRING([--with-fdo-thirdparty], [specifies directory for FDO API Thirdparty files [[default=DEFAULT]]]),
- [custom_fdo_thirdparty=$withval],
- [custom_fdo_thirdparty=DEFAULT])
-
-if test $custom_fdo_thirdparty = "DEFAULT"; then
- if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
- AC_MSG_NOTICE([Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY])
- else
- AC_MSG_ERROR([The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option])
- fi
-else
- if test -d $custom_fdo_thirdparty; then
- FDOTHIRDPARTY="$custom_fdo_thirdparty"
- AC_MSG_NOTICE([Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY])
- else
- AC_MSG_ERROR([The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory])
- fi
-fi
-
-AC_ARG_WITH([fdo-gdal],
- FDO_HELP_STRING([--with-fdo-gdal],
- [specifies directory for thirdparty GDAL files [[default=DEFAULT]]]),
- [custom_fdo_gdal=$withval],
- [custom_fdo_gdal=DEFAULT])
-
-if test $custom_fdo_gdal = "DEFAULT"; then
- FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
- if test -d $FDOGDAL; then
- AC_MSG_NOTICE([Building with default location of thirdparty GDAL files at $FDOGDAL])
- else
- AC_MSG_ERROR([The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option])
- fi
-else
- if test -d $custom_fdo_gdal; then
- FDOTHIRDPARTY="$custom_fdo_gdal"
- AC_MSG_NOTICE([Building with custom location of thirdparty GDAL files at $FDOGDAL])
- else
- AC_MSG_ERROR([The specified GDAL path $custom_fdo_gdal is not a valid directory])
- fi
-fi
-
-AC_SUBST(FDO)
-AC_SUBST(FDOUTILITIES)
-AC_SUBST(FDOTHIRDPARTY)
-AC_SUBST(FDOGDAL)
-
-# Check for Debug or Release build settings
-AC_ARG_ENABLE([debug],
- MAP_HELP_STRING([--enable-debug], [enable debug build [[default=no]]]),
- [enable_debug=$enableval],
- [enable_debug=no])
-
-if test $enable_debug = yes; then
- AC_MSG_NOTICE([Using debug configuration])
- CXXFLAGS="-g -MMD -MT "
- AC_SUBST(CXXFLAGS, ["-g -MMD -MT "])
-else
- AC_MSG_NOTICE([Using optimized configuration])
- CXXFLAGS="-MMD -MT "
- AC_SUBST(CXXFLAGS, ["-MMD -MT "])
-fi
-
-##output Makefiles##
-AC_CONFIG_FILES(Makefile)
-
-AC_CONFIG_FILES([\
-Inc/Makefile \
-Src/Makefile \
-Src/Message/Makefile \
-Src/Overrides/Makefile \
-Src/Provider/Makefile \
-Src/UnitTest/Makefile])
-
-AC_CONFIG_FILES(Docs/Makefile)
-
-AC_OUTPUT
-
+##
+## Copyright (C) 2004-2006 Autodesk, Inc.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of version 2.1 of the GNU Lesser
+## General Public License as published by the Free Software Foundation.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+#------------------configure.in----------------------------------------
+dnl Configure.in for OSGeo FDO GDAL Raster Provider
+#----------------------------------------------------------------------
+# Variables
+# Following are the makefile directories
+#----------------------------------------------------------------------
+AC_INIT(FDOGDAL,3.3.0,http://fdo.osgeo.org)
+AC_CONFIG_SRCDIR(configure.in)
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT(/usr/local/fdo-3.3.0)
+
+AC_LANG_C
+AC_PROG_CC
+AC_LANG_CPLUSPLUS
+AC_PROG_CXX
+AC_PROG_YACC
+AC_DISABLE_STATIC
+AM_PROG_LIBTOOL
+
+AC_SUBST(VERSION, "3.3.0")
+
+dnl *******************************************************
+dnl FDO 3.3.0 Configuration
+dnl FDO / Utilities / Thirdpary / GDAL paths
+dnl *******************************************************
+# custom Fdo path specification
+
+AC_ARG_WITH([fdo],
+ FDO_HELP_STRING([--with-fdo], [specifies directory for FDO API files [[default=DEFAULT]]]),
+ [custom_fdo=$withval],
+ [custom_fdo=DEFAULT])
+
+if test $custom_fdo = "DEFAULT"; then
+ if test -d $FDO && test ! $FDO = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO API files at $FDO])
+ else
+ AC_MSG_ERROR([The default FDO API path $FDO is not a valid directory. Please use the custom option])
+fi
+else
+ if test -d $custom_fdo; then
+ FDO="$custom_fdo"
+ AC_MSG_NOTICE([Building with custom location of FDO API directory at $FDO])
+ else
+ AC_MSG_ERROR([The specified FDO API path $custom_fdo is not a valid directory])
+ fi
+fi
+
+AC_ARG_WITH([fdo-utilities],
+ FDO_HELP_STRING([--with-fdo-utilities],[specifies directory for FDO API Utility files [[default=DEFAULT]]]),
+ [custom_fdo_utilities=$withval],
+ [custom_fdo_utilities=DEFAULT])
+
+if test $custom_fdo_utilities = "DEFAULT"; then
+ if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO Utility files at $FDOUTILITIES])
+ else
+ AC_MSG_ERROR([the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option])
+fi
+else
+ if test -d $custom_fdo_utilities; then
+ FDOUTILITIES="$custom_fdo_utilities"
+ AC_MSG_NOTICE([Building with custom location of FDO Utilities directory at $FDOUTILITIES])
+ else
+ AC_MSG_ERROR([The specified FDO Utilities path $custom_fdo_utilities is not a valid directory])
+ fi
+fi
+
+AC_ARG_WITH([fdo-thirdparty],
+ FDO_HELP_STRING([--with-fdo-thirdparty], [specifies directory for FDO API Thirdparty files [[default=DEFAULT]]]),
+ [custom_fdo_thirdparty=$withval],
+ [custom_fdo_thirdparty=DEFAULT])
+
+if test $custom_fdo_thirdparty = "DEFAULT"; then
+ if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY])
+ else
+ AC_MSG_ERROR([The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option])
+ fi
+else
+ if test -d $custom_fdo_thirdparty; then
+ FDOTHIRDPARTY="$custom_fdo_thirdparty"
+ AC_MSG_NOTICE([Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY])
+ else
+ AC_MSG_ERROR([The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory])
+ fi
+fi
+
+AC_ARG_WITH([fdo-gdal],
+ FDO_HELP_STRING([--with-fdo-gdal],
+ [specifies directory for thirdparty GDAL files [[default=DEFAULT]]]),
+ [custom_fdo_gdal=$withval],
+ [custom_fdo_gdal=DEFAULT])
+
+if test $custom_fdo_gdal = "DEFAULT"; then
+ FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
+ if test -d $FDOGDAL; then
+ AC_MSG_NOTICE([Building with default location of thirdparty GDAL files at $FDOGDAL])
+ else
+ AC_MSG_ERROR([The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option])
+ fi
+else
+ if test -d $custom_fdo_gdal; then
+ FDOTHIRDPARTY="$custom_fdo_gdal"
+ AC_MSG_NOTICE([Building with custom location of thirdparty GDAL files at $FDOGDAL])
+ else
+ AC_MSG_ERROR([The specified GDAL path $custom_fdo_gdal is not a valid directory])
+ fi
+fi
+
+AC_SUBST(FDO)
+AC_SUBST(FDOUTILITIES)
+AC_SUBST(FDOTHIRDPARTY)
+AC_SUBST(FDOGDAL)
+
+# Check for Debug or Release build settings
+AC_ARG_ENABLE([debug],
+ MAP_HELP_STRING([--enable-debug], [enable debug build [[default=no]]]),
+ [enable_debug=$enableval],
+ [enable_debug=no])
+
+if test $enable_debug = yes; then
+ AC_MSG_NOTICE([Using debug configuration])
+ CXXFLAGS="-g -MMD -MT "
+ AC_SUBST(CXXFLAGS, ["-g -MMD -MT "])
+else
+ AC_MSG_NOTICE([Using optimized configuration])
+ CXXFLAGS="-MMD -MT "
+ AC_SUBST(CXXFLAGS, ["-MMD -MT "])
+fi
+
+##output Makefiles##
+AC_CONFIG_FILES(Makefile)
+
+AC_CONFIG_FILES([\
+Inc/Makefile \
+Src/Makefile \
+Src/Message/Makefile \
+Src/Overrides/Makefile \
+Src/Provider/Makefile \
+Src/UnitTest/Makefile])
+
+AC_CONFIG_FILES(Docs/Makefile)
+
+AC_OUTPUT
More information about the fdo-commits
mailing list