]>
Commit | Line | Data |
---|---|---|
bd13be04 | 1 | --- ImageMagick-5.4.5/configure.ac.old Mon Jul 1 22:29:23 2002 |
2 | +++ ImageMagick-5.4.5/configure.ac Mon Jul 1 22:30:03 2002 | |
3 | @@ -737,16 +737,16 @@ | |
4 | # | |
5 | have_fpx='no' | |
6 | LIB_FPX='' | |
7 | +AC_LANG_PUSH(C++) | |
8 | +AC_REQUIRE_CPP | |
9 | if test "$with_fpx" != 'no' | |
10 | then | |
11 | AC_MSG_CHECKING(for FlashPIX components ) | |
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 | |
21 | then | |
22 | @@ -765,6 +765,7 @@ | |
23 | AC_MSG_RESULT(no) | |
24 | fi | |
25 | fi | |
26 | +AC_LANG_POP | |
27 | AM_CONDITIONAL(HasFPX, test "$have_fpx" = 'yes') | |
28 | AC_SUBST(LIB_FPX) | |
29 | ||
d7101c1e PS |
30 | @@ -1935,7 +1935,6 @@ |
31 | then | |
32 | CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2" | |
33 | fi | |
34 | - LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib" | |
35 | fi | |
36 | failed=0; | |
37 | passed=0; |