(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 565e7b3d7670c6eeeb78fa0ed450aa3e36ca09e9..8d755eeca91f3b35129745e05b67b6ba61817042 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2009-10-03  6.5.6-8 Nick Wellnhofer <wellnhofer@aevum...>
-  * adds some missing libraries to the LIBADD entries in coders/Makefile.am,
+  * Add missing libraries to the LIBADD entries in coders/Makefile.am,
     filters/Makefile.am and wand/Makefile.am.
+  * Use LIBS rather than LDFLAGS in configure.ac for the Freetype delegate
+    library.
 
 2009-10-01  6.5.6-7 Cristy  <quetzlzacatenango@image...>
   * Don't use group4 compression if the image is truecolor.

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 03199e7f00f22a48d7a9adace8a5fcbcdaf8c321..a41517882aa8cee049f0e46e1180fb49f5f36541 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-I/usr/local/include/ImageMagick'
       ;;
     --ldflags)
-      echo '-L/usr/local/lib -lfreetype'
+      echo '-L/usr/local/lib '
       ;;
     --libs)
       echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl"

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 38ee6430125c35e311464b7a0eea8229728219a9..397d39b9d46655d2edb540254dc2d0fc5ebde2a1 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -74,10 +74,10 @@ WriteMakefile
    #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99' : $Config{'ld'},
 
    # Linker flags for building an executable
-   'LDFLAGS' =>  "-L../magick/.libs -lMagickCore $Config{'ldflags'} -lfreetype",
+   'LDFLAGS' =>  "-L../magick/.libs -lMagickCore $Config{'ldflags'} ",
 
    # Linker flags for building a dynamically loadable module
-   'LDDLFLAGS' => "-L../magick/.libs -lMagickCore $Config{'lddlflags'} -lfreetype",
+   'LDDLFLAGS' => "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ",
 
    # Install PerlMagick binary into ImageMagick bin directory
    'INSTALLBIN'        => '/usr/local/bin',

diff --git a/config/configure.xml b/config/configure.xml
index 7b5305fb63257ed4a04e4357665c01725ca03158..140e8611bc999a21e2ba9d4fde226f5f3e2cd329 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -19,7 +19,7 @@
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
-  <configure name="LDFLAGS" value="-L/usr/local/lib -lfreetype"/>
+  <configure name="LDFLAGS" value="-L/usr/local/lib "/>
   <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>

diff --git a/configure b/configure
index 93a8535cbe9e2cb598ce90c003e880ef16e2921b..cf1af14b2326c9b4f83ae02e46ca0b11408935da 100755 (executable)
--- a/configure
+++ b/configure
@@ -38456,7 +38456,7 @@ $as_echo_n "checking for FreeType 2.0... " >&6; }
 $as_echo "" >&6; }
     failed=0
     passed=0
-    PERSIST_LDFLAGS="$LDFLAGS"
+    PERSIST_LIBS="$LIBS"
     PERSIST_CPPFLAGS="$CPPFLAGS"
     if test "$enable_delegate_build" != 'no' && test -d "$builddir/freetype/include"; then
         :
@@ -38506,7 +38506,7 @@ done
         if test -n "$freetype_config"; then
             freetype_cflags=`$freetype_config --cflags`
             freetype_libs=`$freetype_config --libs`
-            LDFLAGS="$LDFLAGS $freetype_libs"
+            LIBS="$LIBS $freetype_libs"
             CPPFLAGS="$freetype_cflags $CPPFLAGS"
         fi
     fi
@@ -38585,7 +38585,7 @@ fi
             passed=`expr $passed + 1`
         else
             failed=`expr $failed + 1`
-            LDFLAGS="$PERSIST_LDFLAGS"
+            LIBS="$PERSIST_LIBS"
         fi
     fi
 

diff --git a/configure.ac b/configure.ac
index 77a4968bccec75bbdeabae4b425c7b059bb1fa2e..a353be2c3de823ed4f562a44a20d77c96c9c1d64 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1748,7 +1748,7 @@ if test "$with_freetype" != 'no'; then
     AC_MSG_RESULT([])
     failed=0
     passed=0
-    PERSIST_LDFLAGS="$LDFLAGS"
+    PERSIST_LIBS="$LIBS"
     PERSIST_CPPFLAGS="$CPPFLAGS"
     if test "$enable_delegate_build" != 'no' && test -d "$builddir/freetype/include"; then
         :
@@ -1758,7 +1758,7 @@ if test "$with_freetype" != 'no'; then
         if test -n "$freetype_config"; then
             freetype_cflags=`$freetype_config --cflags`
             freetype_libs=`$freetype_config --libs`
-            LDFLAGS="$LDFLAGS $freetype_libs"
+            LIBS="$LIBS $freetype_libs"
             CPPFLAGS="$freetype_cflags $CPPFLAGS"
         fi
     fi
@@ -1770,7 +1770,7 @@ dnl First see if there is a library
             passed=`expr $passed + 1`
         else
             failed=`expr $failed + 1`
-            LDFLAGS="$PERSIST_LDFLAGS"
+            LIBS="$PERSIST_LIBS"
         fi
     fi
 

diff --git a/magick/Magick-config b/magick/Magick-config
index a8c7e955190a260cce434885cd40fdd588b80773..67226b7a3cb8860c2b01afee02c6b266afc456ea 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -49,7 +49,7 @@ while test $# -gt 0; do
       echo '-I/usr/local/include/ImageMagick'
       ;;
     --ldflags)
-      echo '-L/usr/local/lib -lfreetype'
+      echo '-L/usr/local/lib '
       ;;
     --libs)
       echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl"

diff --git a/wand/Wand-config b/wand/Wand-config
index 8f6fb582038742bc8826c53ccbfb20c819959757..1e1d2dec971b3429aec53fc413859e7706f66832 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -49,7 +49,7 @@ while test $# -gt 0; do
       echo '-I/usr/local/include/ImageMagick'
       ;;
     --ldflags)
-      echo '-L/usr/local/lib -lfreetype'
+      echo '-L/usr/local/lib '
       ;;
     --libs)
       echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljpeg -lfftw3 -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lm -lgomp -lpthread -lltdl"