]>
Commit | Line | Data |
---|---|---|
a3a027ee JB |
1 | --- ImageMagick-6.2.6/configure.ac.orig 2006-03-14 23:34:03.535115000 +0100 |
2 | +++ ImageMagick-6.2.6/configure.ac 2006-03-14 23:53:45.212965250 +0100 | |
3 | @@ -1260,7 +1260,7 @@ | |
04740461 JR |
4 | AC_MSG_RESULT([Checking for X11 support]) |
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" | |
a3a027ee JB |
11 | |
12 | @@ -1290,7 +1290,7 @@ | |
04740461 JR |
13 | # |
14 | AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HasShape,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" | |
a3a027ee | 18 | fi |
04740461 JR |
19 | if test "$no_x" != 'yes'; then |
20 | have_x='yes' | |
d391c9fa | 21 | @@ -2726,9 +2726,9 @@ |
04740461 | 22 | # Build library dependency list for libMagick |
a3a027ee | 23 | # |
04740461 JR |
24 | if test "$with_modules" != 'no'; then |
25 | - 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 $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS" | |
26 | + 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 $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS" | |
a3a027ee | 27 | else |
04740461 JR |
28 | - 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 $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS" |
29 | + 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 $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $GOMP_LIBS $THREAD_LIBS" | |
a3a027ee JB |
30 | fi |
31 | AC_SUBST(MAGICK_DEP_LIBS) | |
32 |