]>
Commit | Line | Data |
---|---|---|
faaa859d AM |
1 | diff -urN pdflib-4.0.0.org/configure.in pdflib-4.0.0/configure.in |
2 | --- pdflib-4.0.0.org/configure.in Sat May 12 11:19:53 2001 | |
3 | +++ pdflib-4.0.0/configure.in Sat May 12 11:20:48 2001 | |
4 | @@ -583,12 +583,11 @@ | |
5 | [ --with-tifflib use installed tifflib instead of internal (not rec.)], | |
6 | [ | |
7 | AC_CHECK_LIB(tiff, TIFFOpen, [EXTERNALLIBS="$EXTERNALLIBS -ltiff"], | |
8 | - AC_MSG_ERROR([No usable tifflib library found.])) | |
9 | + AC_MSG_ERROR([No usable tifflib library found.]),[$EXTERNALLIBS]) | |
10 | ||
de1b6a78 JB |
11 | AC_CHECK_HEADER(tiff.h, , |
12 | AC_MSG_ERROR([No usable tifflib include file found.])) | |
13 | ||
14 | - AC_MSG_RESULT([ Note: user-supplied tifflib - language bindings disabled]) | |
15 | WITH_INTERNALTIFFLIB="no" | |
16 | ],[ | |
17 | AC_C_BIGENDIAN() | |
18 | @@ -619,7 +618,6 @@ | |
19 | AC_CHECK_HEADER(zlib.h, , | |
20 | AC_MSG_ERROR([No usable zlib include file found.])) | |
21 | ||
22 | - AC_MSG_RESULT([ Note: user-supplied zlib - language bindings disabled]) | |
23 | WITH_INTERNALZLIB="no" | |
24 | ],[ | |
25 | ZLIBINC="-I../flate" | |
26 | @@ -654,7 +652,6 @@ | |
27 | AC_CHECK_HEADER(png.h, , | |
28 | AC_MSG_ERROR([No usable pnglib include file found.])) | |
29 | ||
30 | - AC_MSG_RESULT([ Note: user-supplied pnglib - language bindings disabled]) | |
31 | WITH_INTERNALPNGLIB="no" | |
32 | ],[ | |
33 | if test "$WITH_INTERNALZLIB" = "no"; then | |
34 | @@ -721,17 +718,6 @@ | |
35 | fi | |
36 | fi | |
37 | ||
38 | -# If at least one library has been substituted we disable most | |
39 | -# language bindings. | |
40 | - | |
41 | -if test "$EXTERNALLIBS" != "$MATHLIB"; then | |
42 | - WITH_JAVA=no | |
43 | - WITH_PERL=no | |
44 | - WITH_PYTHON=no | |
45 | - WITH_TCL=no | |
46 | - WITH_PHP=no | |
47 | -fi | |
48 | - | |
49 | # -------------------------------------------------------------------- | |
50 | # PDFlib C++ language binding | |
51 | # -------------------------------------------------------------------- | |
08c307e5 JB |
52 | @@ -899,7 +899,6 @@ |
53 | fi | |
54 | ||
55 | DEFINES="$CFLAGS $DEFINES $INCLUDES $PLATFORM" | |
56 | -EXTERNALLIBS="$LDFLAGS $EXTERNALLIBS" | |
57 | ||
58 | AC_SUBST(BINDINGS) | |
59 | AC_SUBST(WITH_PDI) | |
de1b6a78 JB |
60 | @@ -881,8 +867,8 @@ |
61 | ||
62 | fi | |
63 | ||
08c307e5 | 64 | -PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf_.la $INTERNALLIBS $EXTERNALLIBS" |
de1b6a78 | 65 | -PDFLIBLINKSELF="$RPATH $PDFLIBCONVENIENT" |
08c307e5 | 66 | +PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf.la $INTERNALLIBS $EXTERNALLIBS" |
4295fbeb | 67 | +PDFLIBLINKSELF="$RPATH \$(top_builddir)/pdflib/libpdf_.la $EXTERNALLIBS" |
de1b6a78 JB |
68 | PDFLIBLINK="\$(top_builddir)/pdflib/libpdf.la $EXTERNALLIBS" |
69 | ||
70 | AC_SUBST(EXTERNALLIBS) |