[mapserver-commits] r12649 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-10-08 10:04:39 -0700 (Sat, 08 Oct 2011)
New Revision: 12649

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
configure: make --with-exempi works out-of-the-box when xmp.h is installed into /usr/include/exempi-2.0/exempi

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-10-08 16:21:41 UTC (rev 12648)
+++ trunk/mapserver/configure	2011-10-08 17:04:39 UTC (rev 12649)
@@ -12630,7 +12630,11 @@
 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
+    if test -f /usr/include/exempi-2.0/exempi/xmp.h; then
+        EXEMPI_INC="-I/usr/include/exempi-2.0/exempi"
+        EXEMPI_LIB="-lexempi"
+    else
+        if test "${ac_cv_header_xmp_h+set}" = set; then
   echo "$as_me:$LINENO: checking for xmp.h" >&5
 echo $ECHO_N "checking for xmp.h... $ECHO_C" >&6
 if test "${ac_cv_header_xmp_h+set}" = set; then
@@ -12776,8 +12780,9 @@
 fi
 
 
-    EXEMPI_INC=""
-    EXEMPI_LIB="-lexempi"
+        EXEMPI_INC=""
+        EXEMPI_LIB="-lexempi"
+    fi
   else
     xmp_dir=$with_exempi
     xmp_include=$xmp_dir/include

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-10-08 16:21:41 UTC (rev 12648)
+++ trunk/mapserver/configure.in	2011-10-08 17:04:39 UTC (rev 12649)
@@ -1952,9 +1952,14 @@
 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])])
-    EXEMPI_INC=""
-    EXEMPI_LIB="-lexempi"
+    if test -f /usr/include/exempi-2.0/exempi/xmp.h; then
+        EXEMPI_INC="-I/usr/include/exempi-2.0/exempi"
+        EXEMPI_LIB="-lexempi"
+    else
+        AC_CHECK_HEADER([xmp.h],,[AC_MSG_ERROR([cannot find xmp.h])])
+        EXEMPI_INC=""
+        EXEMPI_LIB="-lexempi"
+    fi
   else
     xmp_dir=$with_exempi
     xmp_include=$xmp_dir/include