[mapserver-commits] r9009 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2009-05-07 17:00:33 -0400 (Thu, 07 May 2009)
New Revision: 9009

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/configure
   branches/branch-5-4/mapserver/configure.in
Log:
Fixed detection of freetype when installed in non-system directory (#3008)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-07 20:59:38 UTC (rev 9008)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-07 21:00:33 UTC (rev 9009)
@@ -1,5 +1,7 @@
 MapServer Revision History
 ==========================
+
+$Id$
  
 This is a human-readable revision history which will attempt to document
 required changes for users to migrate from one version of MapServer to the

Modified: branches/branch-5-4/mapserver/configure
===================================================================
--- branches/branch-5-4/mapserver/configure	2009-05-07 20:59:38 UTC (rev 9008)
+++ branches/branch-5-4/mapserver/configure	2009-05-07 21:00:33 UTC (rev 9009)
@@ -5258,12 +5258,12 @@
   { echo "$as_me:$LINENO: result:         using libfreetype from $FT_LIB" >&5
 echo "${ECHO_T}        using libfreetype from $FT_LIB" >&6; }
 
-  if test ""$FT_LIBDIR"" != "/usr/lib"; then
+  if test ""$FT_LIB"" != "/usr/lib"; then
 
-  if test -z ""$FT_LIBDIR"" || echo ""$FT_LIBDIR"" | grep '^/' >/dev/null ; then
-    ai_p=""$FT_LIBDIR""
+  if test -z ""$FT_LIB"" || echo ""$FT_LIB"" | grep '^/' >/dev/null ; then
+    ai_p=""$FT_LIB""
   else
-    ai_p="`pwd`/"$FT_LIBDIR""
+    ai_p="`pwd`/"$FT_LIB""
   fi
 
 
@@ -5279,8 +5279,7 @@
 
   fi
 
-else
-    { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
+elif test -z "$FT_LIBDIR" -a -z "$FT_BIN" ; then     { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
 echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
 if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6

Modified: branches/branch-5-4/mapserver/configure.in
===================================================================
--- branches/branch-5-4/mapserver/configure.in	2009-05-07 20:59:38 UTC (rev 9008)
+++ branches/branch-5-4/mapserver/configure.in	2009-05-07 21:00:33 UTC (rev 9009)
@@ -164,8 +164,8 @@
 if test -n "$FT_LIBDIR" -a -z "$FT_BIN" ; then
   FT_LIB="-L$FT_LIBDIR $FT_TYPE"
   AC_MSG_RESULT([        using libfreetype from $FT_LIB])
-  AC_ADD_RUNPATH("$FT_LIBDIR")
-else
+  AC_ADD_RUNPATH("$FT_LIB")
+elif test -z "$FT_LIBDIR" -a -z "$FT_BIN" ; then dnl replaced else by elif
   dnl check for lib in system libs  
   AC_CHECK_LIB(freetype, FT_Init_FreeType, FT_LIB="-lfreetype",,)