]>
Commit | Line | Data |
---|---|---|
e02caa4c ER |
1 | --- ImageMagick-6.9.9-26/configure.ac~ 2017-12-14 19:35:05.000000000 +0200 |
2 | +++ ImageMagick-6.9.9-26/configure.ac 2017-12-14 19:40:54.689637300 +0200 | |
279f52da | 3 | @@ -1587,7 +1587,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 | |
279f52da | 12 | @@ -1614,7 +1614,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' | |
e02caa4c | 21 | @@ -3879,9 +3879,9 @@ |
8ee30ebe | 22 | # |
406fe87e | 23 | |
8ee30ebe | 24 | if test "$build_modules" != 'no'; then |
971bba46 ER |
25 | - MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" |
26 | + MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" | |
a3a027ee | 27 | else |
e02caa4c ER |
28 | - MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBPMUX_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" |
29 | + MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS" | |
a3a027ee JB |
30 | fi |
31 | AC_SUBST(MAGICK_DEP_LIBS) | |
32 |