Changeset 12337

Timestamp:

10/05/07 17:10:03 (1 year ago)

Author:

warmerdam

Message:

fix prefix expansion on framework build (#1879)

Files:

• branches/1.4/gdal/configure (modified) (2 diffs)
• branches/1.4/gdal/configure.in (modified) (1 diff)

branches/1.4/gdal/configure

@@ -25573 +25573 @@
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+
+    # Detecting Xerces version
+    xerces_major=`cat $with_xerces_inc/xercesc/util/XercesVersion.hpp | \
+                    grep '^#define.*XERCES_VERSION_MAJOR.*[0-9]$' | \
+                    sed -e 's/#define XERCES_VERSION_MAJOR.//'`
+
+    xerces_minor=`cat $with_xerces_inc/xercesc/util/XercesVersion.hpp | \
+                    grep '^#define.*XERCES_VERSION_MINOR.*[0-9]$' | \
+                    sed -e 's/#define XERCES_VERSION_MINOR.//'`
+
+    xerces_revision=`cat $with_xerces_inc/xercesc/util/XercesVersion.hpp | \
+                    grep '^#define.*XERCES_VERSION_REVISION.*[0-9]$' | \
+                    sed -e 's/#define XERCES_VERSION_REVISION.//'`
+    XERCES_VERSION="$xerces_major.$xerces_minor.$xerces_revision"
+
+    { echo "$as_me:$LINENO: Xerces $XERCES_VERSION has been found" >&5
+echo "$as_me: Xerces $XERCES_VERSION has been found" >&6;}
-  else
-    echo "$as_me:$LINENO: result: requested, but compile or link fails!" >&5
@@ -27767 +27784 @@
-_ACEOF
-
-'/Library/Frameworks/GDAL.framework/Versions/${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR}'
+"/Library/Frameworks/GDAL.framework/Versions/${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR}"
-    exec_prefix='${prefix}'
-    includedir='${prefix}/Headers'

branches/1.4/gdal/configure.in

@@ -1876 +1876 @@
-    AC_MSG_RESULT([enabled])
-    AC_DEFINE_UNQUOTED(MACOSX_FRAMEWORK,1, [Define for Mac OSX Framework build])
-'/Library/Frameworks/GDAL.framework/Versions/${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR}'
+"/Library/Frameworks/GDAL.framework/Versions/${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR}"
-    exec_prefix='${prefix}'
-    includedir='${prefix}/Headers'