[mapserver-commits] r12636 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-10-06 21:01:46 -0700 (Thu, 06 Oct 2011)
New Revision: 12636

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fix configure to work without explicit --with-exempi or --without-exempi

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-10-07 03:38:53 UTC (rev 12635)
+++ trunk/mapserver/configure	2011-10-07 04:01:46 UTC (rev 12636)
@@ -923,6 +923,7 @@
                           OGR required).
   --with-curl-config=PATH Specify path to curl-config.
   --with-kml=                KML output Support (ARG=yes/no).
+\
   --with-exempi=DIR Specify path to exempi.
   --with-xml2-config=PATH Specify path to xml2-config.
   --with-xml-mapfile=                Include xml-mapfile Support (ARG=yes/no).
@@ -12617,6 +12618,8 @@
 fi
 
 
+echo "$as_me:$LINENO: checking if exempi support requested" >&5
+echo $ECHO_N "checking if exempi support requested... $ECHO_C" >&6
 
 # Check whether --with-exempi or --without-exempi was given.
 if test "${with_exempi+set}" = set; then
@@ -12624,7 +12627,7 @@
 
 fi;
 
-if test "$with_exempi" != "no" ; then
+if test -n "$with_exempi" -a "$with_exempi" != "no" ; then
 
   if test "$with_exempi" = "yes" ; then
     if test "${ac_cv_header_xmp_h+set}" = set; then
@@ -13004,6 +13007,9 @@
 fi
 
 
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 EXEMPI_ENABLED=$EXEMPI_ENABLED

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-10-07 03:38:53 UTC (rev 12635)
+++ trunk/mapserver/configure.in	2011-10-07 04:01:46 UTC (rev 12636)
@@ -1945,10 +1945,11 @@
 dnl Exempi support
 dnl ---------------------------------------------------------------------
 
-AC_ARG_WITH(exempi,
+AC_MSG_CHECKING(if exempi support requested)
+AC_ARG_WITH(exempi,\
 [  --with-exempi=DIR Specify path to exempi.],,)
 
-if test "$with_exempi" != "no" ; then
+if test -n "$with_exempi" -a "$with_exempi" != "no" ; then
 
   if test "$with_exempi" = "yes" ; then
     AC_CHECK_HEADER([xmp.h],,[AC_MSG_ERROR([cannot find xmp.h])])
@@ -1972,6 +1973,8 @@
 
   AC_CHECK_LIB(exempi,xmp_init,EXEMPI_ENABLED=-DUSE_EXEMPI,,$EXEMPI_LIB)
 
+else
+  AC_MSG_RESULT(no)
 fi
 
 AC_SUBST(EXEMPI_ENABLED,$EXEMPI_ENABLED)