[mapserver-commits] r7780 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-07-03 11:37:55 -0400 (Thu, 03 Jul 2008)
New Revision: 7780

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Fixed configure error related to new fribidi2 pkg-config support (#2673)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-07-03 14:20:54 UTC (rev 7779)
+++ trunk/mapserver/HISTORY.TXT	2008-07-03 15:37:55 UTC (rev 7780)
@@ -9,11 +9,15 @@
 
 For a complete change history, please see the Subversion log comments.
 
-Version 5.2.0-rc1 (2008-07-02):
----------------------------------
 
-- fix windows build problem (#2676) 
+Current Version (SVN Trunk):
+----------------------------
 
+- Fixed configure error related to new fribidi2 pkg-config support (#2673)
+
+- Fixed windows build problem (#2676)
+
+
 Version 5.2.0-beta4 (2008-07-02):
 ---------------------------------
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2008-07-03 14:20:54 UTC (rev 7779)
+++ trunk/mapserver/configure	2008-07-03 15:37:55 UTC (rev 7780)
@@ -11962,7 +11962,7 @@
 fi
 
 
-  $FRIBIDI_PKG_CONFIG = "no"
+  FRIBIDI_PKG_CONFIG="no"
   if test "$FRIBIDI_CONFIG" = "no" -a "$PKG_CONFIG" != "no" ; then
      { echo "$as_me:$LINENO: checking for fribidi pkg-config path" >&5
 echo $ECHO_N "checking for fribidi pkg-config path... $ECHO_C" >&6; }

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2008-07-03 14:20:54 UTC (rev 7779)
+++ trunk/mapserver/configure.in	2008-07-03 15:37:55 UTC (rev 7780)
@@ -1914,7 +1914,7 @@
 elif test "$with_fribidi_config" = "yes" ; then
   AC_MSG_RESULT(yes)
   AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
-  $FRIBIDI_PKG_CONFIG = "no"
+  FRIBIDI_PKG_CONFIG="no"
   if test "$FRIBIDI_CONFIG" = "no" -a "$PKG_CONFIG" != "no" ; then 
      AC_MSG_CHECKING(for fribidi pkg-config path)
      `$PKG_CONFIG --silence-errors --libs fribidi >> /dev/null`