[mapserver-commits] r7828 - branches/branch-5-2/mapserver
svn at osgeo.org
svn at osgeo.org
Tue Jul 22 14:49:59 EDT 2008
Author: dmorissette
Date: 2008-07-22 14:49:58 -0400 (Tue, 22 Jul 2008)
New Revision: 7828
Modified:
branches/branch-5-2/mapserver/HISTORY.TXT
branches/branch-5-2/mapserver/configure
branches/branch-5-2/mapserver/configure.in
Log:
Stop configure execution with an error if path to one of the -config
scripts is invalid (#2710)
Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT 2008-07-22 15:05:45 UTC (rev 7827)
+++ branches/branch-5-2/mapserver/HISTORY.TXT 2008-07-22 18:49:58 UTC (rev 7828)
@@ -13,7 +13,8 @@
Current Version (SVN branch-5-2)
--------------------------------
-- ...
+- Stop configure execution with an error if path to one of the -config
+ scripts is invalid (#2710)
Version 5.2.0 (2008-07-16):
Modified: branches/branch-5-2/mapserver/configure
===================================================================
--- branches/branch-5-2/mapserver/configure 2008-07-22 15:05:45 UTC (rev 7827)
+++ branches/branch-5-2/mapserver/configure 2008-07-22 18:49:58 UTC (rev 7828)
@@ -1419,7 +1419,7 @@
--without-tiff Disable TIFF support.
--with-tiff[=DIR] Include TIFF support (DIR is LibTIFF's install dir).
--with-postgis[=ARG] Include PostGIS Support (ARG=yes/path to pg_config)
- --with-mygis[=ARG] Include MyGIS Support (ARG=yes/path to my_config)
+ --with-mygis[=ARG] Include MyGIS Support (ARG=yes/path to mysql_config)
--with-oraclespatial[=ARG] Include OracleSpatial Support (ARG=yes/path to
Oracle home)
--with-ming[=DIR] Include MING/Flash Support (DIR=path to Ming
@@ -11255,8 +11255,15 @@
POSTGIS_INC=
POSTGIS_LIB=
else
- { echo "$as_me:$LINENO: result: yes, user supplied pg_config" >&5
-echo "${ECHO_T}yes, user supplied pg_config" >&6; }
+ if test -f "$PG_CONFIG" -a -x "$PG_CONFIG" ; then
+ { echo "$as_me:$LINENO: result: yes, user supplied pg_config ($PG_CONFIG)" >&5
+echo "${ECHO_T}yes, user supplied pg_config ($PG_CONFIG)" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: '$PG_CONFIG' is not an executable. Make sure you use --with-postgis=/path/to/pg_config" >&5
+echo "$as_me: error: '$PG_CONFIG' is not an executable. Make sure you use --with-postgis=/path/to/pg_config" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
POSTGIS_ENABLED=-DUSE_POSTGIS
POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq"
POSTGIS_INC="-I`$PG_CONFIG --includedir`"
@@ -11341,8 +11348,15 @@
MYGIS_INC=
MYGIS_LIB=
else
- { echo "$as_me:$LINENO: result: yes, user supplied my_config" >&5
-echo "${ECHO_T}yes, user supplied my_config" >&6; }
+ if test -f "$MY_CONFIG" -a -x "$MY_CONFIG" ; then
+ { echo "$as_me:$LINENO: result: yes, user supplied mysql_config ($MY_CONFIG)" >&5
+echo "${ECHO_T}yes, user supplied mysql_config ($MY_CONFIG)" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: '$MY_CONFIG' is not an executable. Make sure you use --with-mygis=/path/to/mysql_config" >&5
+echo "$as_me: error: '$MY_CONFIG' is not an executable. Make sure you use --with-mygis=/path/to/mysql_config" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
MYGIS_ENABLED=-DUSE_MYGIS
MYGIS_LIB="`$MY_CONFIG --libs` -lmysqlclient"
# MYGIS_LIB="-L/usr/lib/mysql -lmysqlclient"
@@ -11674,8 +11688,8 @@
fi
-{ echo "$as_me:$LINENO: checking for curl-config..." >&5
-echo "$as_me: checking for curl-config..." >&6;}
+{ echo "$as_me:$LINENO: checking for curl-config" >&5
+echo $ECHO_N "checking for curl-config... $ECHO_C" >&6; }
# Check whether --with-curl-config was given.
if test "${with_curl_config+set}" = set; then
@@ -11689,6 +11703,14 @@
if test "`basename xx/$with_curl_config`" = "curl-config" ; then
LIBCURL_CONFIG="$with_curl_config"
+ if test -f "$LIBCURL_CONFIG" -a -x "$LIBCURL_CONFIG" ; then
+ { echo "$as_me:$LINENO: result: yes, user supplied curl-config ($LIBCURL_CONFIG)" >&5
+echo "${ECHO_T}yes, user supplied curl-config ($LIBCURL_CONFIG)" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: '$LIBCURL_CONFIG' is not an executable. Make sure you use --with-curl-config=/path/to/curl-config" >&5
+echo "$as_me: error: '$LIBCURL_CONFIG' is not an executable. Make sure you use --with-curl-config=/path/to/curl-config" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
else
# Extract the first word of "curl-config", so it can be a program name with args.
set dummy curl-config; ac_word=$2
@@ -11810,15 +11832,20 @@
{ echo "$as_me:$LINENO: result: libxml2 not required." >&5
echo "${ECHO_T}libxml2 not required." >&6; }
fi
-else
- { echo "$as_me:$LINENO: result: --with-xml2-config=$with_xml2_config specified." >&5
-echo "${ECHO_T}--with-xml2-config=$with_xml2_config specified." >&6; }
fi
if test "$with_xml2_config" != "no" ; then
if test "`basename xx/$with_xml2_config`" = "xml2-config" ; then
LIBXML2_CONFIG="$with_xml2_config"
+ if test -f "$LIBXML2_CONFIG" -a -x "$LIBXML2_CONFIG" ; then
+ { echo "$as_me:$LINENO: result: yes, user supplied xml2-config ($LIBXML2_CONFIG)" >&5
+echo "${ECHO_T}yes, user supplied xml2-config ($LIBXML2_CONFIG)" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: '$LIBXML2_CONFIG' is not an executable. Make sure you use --with-xml2-config=/path/to/xml2-config" >&5
+echo "$as_me: error: '$LIBXML2_CONFIG' is not an executable. Make sure you use --with-xml2-config=/path/to/xml2-config" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
else
# Extract the first word of "xml2-config", so it can be a program name with args.
set dummy xml2-config; ac_word=$2
@@ -11993,8 +12020,14 @@
FRIBIDI_LIB=`$PKG_CONFIG --libs $FRIBIDI_CONFIG`
FRIBIDI_INC=`$PKG_CONFIG --cflags $FRIBIDI_CONFIG`
else
- { echo "$as_me:$LINENO: result: yes, user supplied fribidi-config" >&5
-echo "${ECHO_T}yes, user supplied fribidi-config" >&6; }
+ if test -f "$FRIBIDI_CONFIG" -a -x "$FRIBIDI_CONFIG" ; then
+ { echo "$as_me:$LINENO: result: yes, user supplied fribidi-config ($FRIBIDI_CONFIG)" >&5
+echo "${ECHO_T}yes, user supplied fribidi-config ($FRIBIDI_CONFIG)" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: '$FRIBIDI_CONFIG' is not an executable. Make sure you use --with-fribidi-config=/path/to/fribidi-config or fribidi.pc" >&5
+echo "$as_me: error: '$FRIBIDI_CONFIG' is not an executable. Make sure you use --with-fribidi-config=/path/to/fribidi-config or fribidi.pc" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
FRIBIDI_ENABLED=-DUSE_FRIBIDI
FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs`
FRIBIDI_INC=`$FRIBIDI_CONFIG --cflags`
Modified: branches/branch-5-2/mapserver/configure.in
===================================================================
--- branches/branch-5-2/mapserver/configure.in 2008-07-22 15:05:45 UTC (rev 7827)
+++ branches/branch-5-2/mapserver/configure.in 2008-07-22 18:49:58 UTC (rev 7828)
@@ -1455,7 +1455,12 @@
POSTGIS_INC=
POSTGIS_LIB=
else
- AC_MSG_RESULT([yes, user supplied pg_config])
+ if test -f "$PG_CONFIG" -a -x "$PG_CONFIG" ; then
+ AC_MSG_RESULT([yes, user supplied pg_config ($PG_CONFIG)])
+ else
+ AC_MSG_ERROR(['$PG_CONFIG' is not an executable. Make sure you use --with-postgis=/path/to/pg_config])
+ fi
+
POSTGIS_ENABLED=-DUSE_POSTGIS
POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq"
POSTGIS_INC="-I`$PG_CONFIG --includedir`"
@@ -1475,7 +1480,7 @@
AC_MSG_CHECKING(if MyGIS support requested)
-AC_ARG_WITH(mygis,[ --with-mygis[[=ARG]] Include MyGIS Support (ARG=yes/path to my_config)],,)
+AC_ARG_WITH(mygis,[ --with-mygis[[=ARG]] Include MyGIS Support (ARG=yes/path to mysql_config)],,)
if test "$with_mygis" = "no" -o "$with_mygis" = "" ; then
AC_MSG_RESULT(no)
@@ -1492,7 +1497,12 @@
MYGIS_INC=
MYGIS_LIB=
else
- AC_MSG_RESULT([yes, user supplied my_config])
+ if test -f "$MY_CONFIG" -a -x "$MY_CONFIG" ; then
+ AC_MSG_RESULT([yes, user supplied mysql_config ($MY_CONFIG)])
+ else
+ AC_MSG_ERROR(['$MY_CONFIG' is not an executable. Make sure you use --with-mygis=/path/to/mysql_config])
+ fi
+
MYGIS_ENABLED=-DUSE_MYGIS
MYGIS_LIB="`$MY_CONFIG --libs` -lmysqlclient"
# MYGIS_LIB="-L/usr/lib/mysql -lmysqlclient"
@@ -1769,7 +1779,7 @@
dnl Look for libcurl if WMS and WFS Client requested
dnl ---------------------------------------------------------------------
-AC_CHECKING(for curl-config)
+AC_MSG_CHECKING(for curl-config)
AC_ARG_WITH(curl-config,
[ --with-curl-config=PATH Specify path to curl-config.],,)
@@ -1780,6 +1790,11 @@
if test "`basename xx/$with_curl_config`" = "curl-config" ; then
LIBCURL_CONFIG="$with_curl_config"
+ if test -f "$LIBCURL_CONFIG" -a -x "$LIBCURL_CONFIG" ; then
+ AC_MSG_RESULT([yes, user supplied curl-config ($LIBCURL_CONFIG)])
+ else
+ AC_MSG_ERROR(['$LIBCURL_CONFIG' is not an executable. Make sure you use --with-curl-config=/path/to/curl-config])
+ fi
else
AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no)
fi
@@ -1851,14 +1866,17 @@
with_xml2_config=no
AC_MSG_RESULT([libxml2 not required.])
fi
-else
- AC_MSG_RESULT([--with-xml2-config=$with_xml2_config specified.])
fi
if test "$with_xml2_config" != "no" ; then
if test "`basename xx/$with_xml2_config`" = "xml2-config" ; then
LIBXML2_CONFIG="$with_xml2_config"
+ if test -f "$LIBXML2_CONFIG" -a -x "$LIBXML2_CONFIG" ; then
+ AC_MSG_RESULT([yes, user supplied xml2-config ($LIBXML2_CONFIG)])
+ else
+ AC_MSG_ERROR(['$LIBXML2_CONFIG' is not an executable. Make sure you use --with-xml2-config=/path/to/xml2-config])
+ fi
else
AC_PATH_PROG(LIBXML2_CONFIG, xml2-config, no)
fi
@@ -1941,7 +1959,11 @@
FRIBIDI_LIB=`$PKG_CONFIG --libs $FRIBIDI_CONFIG`
FRIBIDI_INC=`$PKG_CONFIG --cflags $FRIBIDI_CONFIG`
else
- AC_MSG_RESULT([yes, user supplied fribidi-config])
+ if test -f "$FRIBIDI_CONFIG" -a -x "$FRIBIDI_CONFIG" ; then
+ AC_MSG_RESULT([yes, user supplied fribidi-config ($FRIBIDI_CONFIG)])
+ else
+ AC_MSG_ERROR(['$FRIBIDI_CONFIG' is not an executable. Make sure you use --with-fribidi-config=/path/to/fribidi-config or fribidi.pc])
+ fi
FRIBIDI_ENABLED=-DUSE_FRIBIDI
FRIBIDI_LIB=`$FRIBIDI_CONFIG --libs`
FRIBIDI_INC=`$FRIBIDI_CONFIG --cflags`
More information about the mapserver-commits
mailing list