- up to 6.3.3.0

[packages/ImageMagick.git] / ImageMagick-link.patch

--- ImageMagick-6.2.6/configure.ac.orig	2006-03-14 23:34:03.535115000 +0100
+++ ImageMagick-6.2.6/configure.ac	2006-03-14 23:53:45.212965250 +0100
@@ -1260,7 +1260,7 @@
 if test "$no_x" != 'yes'
 then
   LDFLAGS="$LDFLAGS $X_LIBS"
-  X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+  X11_LIBS="-lX11 $X_EXTRA_LIBS"
   LIBS="$X11_LIBS $LIBS"
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
@@ -1290,7 +1290,7 @@
   AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[])
 
   AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
-  LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
+  LIBS="$XEXT_LIBS $LIBS"
 fi
 if test "$no_x" != 'yes'
 then
@@ -2726,9 +2726,9 @@
 #
 if test "$with_modules" != 'no'
 then
-  MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
+  MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
 else
-  MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
+  MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $PNG_LIBS $DJVU_LIBS $FPX_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $THREAD_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $THREAD_LIBS $USER_LIBS"
 fi
 AC_SUBST(MAGICK_DEP_LIBS)