]>
Commit | Line | Data |
---|---|---|
1 | --- ImageMagick-6.4.5/configure.ac.orig 2008-10-29 20:33:00.000000000 +0100 | |
2 | +++ ImageMagick-6.4.5/configure.ac 2008-10-29 20:43:12.000000000 +0100 | |
3 | @@ -1265,7 +1265,7 @@ | |
4 | AC_MSG_CHECKING([for X11]) | |
5 | AC_MSG_RESULT([]) | |
6 | LDFLAGS="$LDFLAGS $X_LIBS" | |
7 | - X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS" | |
8 | + X11_LIBS="-lX11 $X_EXTRA_LIBS" | |
9 | LIBS="$X11_LIBS $LIBS" | |
10 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | |
11 | ||
12 | @@ -1292,7 +1292,7 @@ | |
13 | # | |
14 | AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[]) | |
15 | AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,) | |
16 | - LIBS="$XEXT_LIBS $XT_LIBS $LIBS" | |
17 | + LIBS="$XEXT_LIBS $LIBS" | |
18 | fi | |
19 | if test "$no_x" != 'yes'; then | |
20 | have_x='yes' | |
21 | @@ -3134,9 +3134,9 @@ | |
22 | AC_SUBST(MAGICK_LTDLDEPS) | |
23 | ||
24 | if test "$with_modules" != 'no'; then | |
25 | - MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS" | |
26 | + MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS" | |
27 | else | |
28 | - MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS" | |
29 | + MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $THREAD_LIBS" | |
30 | fi | |
31 | AC_SUBST(MAGICK_DEP_LIBS) | |
32 |