]>
Commit | Line | Data |
---|---|---|
99c71e72 | 1 | --- ImageMagick-6.6.9-4/configure.ac~ 2011-04-15 12:50:38.545397186 +0200 |
2 | +++ ImageMagick-6.6.9-4/configure.ac 2011-04-15 12:56:25.068742306 +0200 | |
3 | @@ -1369,7 +1369,7 @@ | |
1d894be7 | 4 | AC_MSG_CHECKING([for X11]) |
5 | AC_MSG_RESULT([]) | |
04740461 JR |
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" | |
a3a027ee | 11 | |
99c71e72 | 12 | @@ -1396,7 +1396,7 @@ |
04740461 | 13 | # |
406fe87e | 14 | AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[]) |
04740461 JR |
15 | AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,) |
16 | - LIBS="$XEXT_LIBS $XT_LIBS $LIBS" | |
17 | + LIBS="$XEXT_LIBS $LIBS" | |
a3a027ee | 18 | fi |
04740461 JR |
19 | if test "$no_x" != 'yes'; then |
20 | have_x='yes' | |
99c71e72 | 21 | @@ -3457,9 +3457,9 @@ |
406fe87e | 22 | AC_SUBST(MAGICK_LTDLDEPS) |
23 | ||
04740461 | 24 | if test "$with_modules" != 'no'; then |
cdb5118a | 25 | - MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS" |
99c71e72 | 26 | + MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_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 $CL_LIBS $THREAD_LIBS" |
a3a027ee | 27 | else |
99c71e72 | 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 $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_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 $CL_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 $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_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 $CL_LIBS $THREAD_LIBS" | |
a3a027ee JB |
30 | fi |
31 | AC_SUBST(MAGICK_DEP_LIBS) | |
32 |