Author: qboosh Date: Wed Mar 15 19:06:51 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - -lXt and -lSM are not needed
---- Files affected: SOURCES: ImageMagick-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/ImageMagick-link.patch diff -u /dev/null SOURCES/ImageMagick-link.patch:1.1 --- /dev/null Wed Mar 15 20:06:51 2006 +++ SOURCES/ImageMagick-link.patch Wed Mar 15 20:06:46 2006 @@ -0,0 +1,32 @@ +--- 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" +- LIB_X11="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" ++ LIB_X11="-lX11 $X_EXTRA_LIBS" + LIBS="$LIB_X11 $LIBS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +@@ -1290,7 +1290,7 @@ + AC_CHECK_LIB([Xext],[XShapeCombineMask],[LIB_XEXT='-lXext' ; AC_DEFINE(HasShape,1,X11 server supports shape extension)],[],[]) + + AC_CHECK_LIB(Xt,XtSetEventDispatcher,LIB_XT='-lXt',,) +- LIBS="$LIB_XEXT $LIB_XT $LIBS" ++ LIBS="$LIB_XEXT $LIBS" + fi + if test "$no_x" != 'yes' + then +@@ -2656,9 +2656,9 @@ + # + if test "$with_modules" != 'no' + then +- MAGICK_DEP_LIBS="$LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JPEG $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_XT $LIB_BZLIB $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER" ++ MAGICK_DEP_LIBS="$LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JPEG $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER" + else +- MAGICK_DEP_LIBS="$LIB_JBIG $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JP2 $LIB_JPEG $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_XT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_XML $LIB_GVC $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER" ++ MAGICK_DEP_LIBS="$LIB_JBIG $LIB_LCMS $LIB_TIFF $LIB_TTF $LIB_JP2 $LIB_JPEG $LIB_GS $LIB_PNG $LIB_FPX $LIB_WMF $LIB_DPS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $LIB_XML $LIB_GVC $LIB_ZLIB $LIB_GDI32 $LIB_THREAD $LIB_MATH $LIB_CCMALLOC $LIB_EFENCE $LIB_THREAD $LIBS_USER" + fi + AC_SUBST(MAGICK_DEP_LIBS) + ================================================================ _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit