]> git.pld-linux.org Git - packages/ImageMagick.git/blob - ImageMagick-ac.patch
- rel 3
[packages/ImageMagick.git] / ImageMagick-ac.patch
1 --- ImageMagick-6.4.1/configure.ac.orig 2008-05-11 07:11:08.000000000 +0200
2 +++ ImageMagick-6.4.1/configure.ac      2008-05-27 09:28:15.000000000 +0200
3 @@ -1585,16 +1585,16 @@
4  #
5  have_fpx='no'
6  FPX_LIBS=''
7 +AC_LANG_PUSH(C++)
8 +AC_REQUIRE_CPP
9  if test "$with_fpx" != 'no'; then
10      AC_MSG_RESULT([-------------------------------------------------------------])
11      AC_MSG_RESULT([Checking for FlashPIX support])
12      AC_MSG_RESULT([-------------------------------------------------------------])
13      failed=0
14      passed=0
15 -    AC_LANG_PUSH(C++)
16      AC_CHECK_HEADER(fpxlib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
17      AC_CHECK_LIB(fpx,FPX_OpenImageByFilename,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
18 -    AC_LANG_POP
19      AC_MSG_CHECKING([if FlashPIX package is complete])
20      if test $passed -gt 0; then
21          if test $failed -gt 0; then
22 @@ -1611,6 +1611,7 @@
23          AC_MSG_RESULT([no])
24      fi
25  fi
26 +AC_LANG_POP
27  AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
28  AC_SUBST(FPX_LIBS)
29  
30 @@ -2191,9 +2192,6 @@
31          if test -d "${xml2_prefix}/include/libxml2"; then
32              CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
33          fi
34 -        if test "${xml2_prefix}" != '/usr'; then
35 -            LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
36 -        fi
37      fi
38      failed=0
39      passed=0
This page took 0.033479 seconds and 3 git commands to generate.