summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-04-07 12:06:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2008-04-07 12:06:18 +0000
commit41fdc70e57b74afa2a63e751e435055e5dfe7c58 (patch)
tree200d74ecd21d8b77bdcb5687576a6d7f012be322 /Build/source/configure
parent1999147223756159c17c4e47fbbaf7b7d0344f4f (diff)
respect library dependencies
git-svn-id: svn://tug.org/texlive/trunk@7345 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure1538
1 files changed, 769 insertions, 769 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 8f0b9250f7a..5f3dfad7dcd 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -696,30 +696,30 @@ ARFLAGS
texmfmain
socketlibs
LDT1LIB
-LIBPNGCPPFLAGS
-LDLIBPNG
-LIBPNGDEP
-ZLIBCPPFLAGS
-LDZLIB
-ZLIBDEP
CURSESCPPFLAGS
LDCURSESLIB
CURSESDEP
+ZLIBCPPFLAGS
+LDZLIB
+ZLIBDEP
+LIBPNGCPPFLAGS
+LDLIBPNG
+LIBPNGDEP
LIBXPDFCPPFLAGS
LDLIBXPDF
LIBXPDFDEP
LIBT1CPPFLAGS
LDLIBT1
LIBT1DEP
-GDCPPFLAGS
-LDGD
-GDDEP
FREETYPECPPFLAGS
LDFREETYPE
FREETYPEDEP
FREETYPE2CPPFLAGS
LDFREETYPE2
FREETYPE2DEP
+GDCPPFLAGS
+LDGD
+GDDEP
ICUCPPFLAGS
LDICU
ICUDEP
@@ -1441,6 +1441,11 @@ Optional Packages:
Specify directory where the ncurses library resides.
--with-ncurses-include=DIR
Specify the ncurses header files location.
+ --with-system-zlib use installed zlib library
+ --with-zlib-libdir=DIR
+ Specify directory where the zlib.a resides.
+ --with-zlib-include=DIR
+ Specify the zlib header files location.
--with-system-pnglib use installed pnglib library
--with-pnglib-libdir=DIR specify directory where the png library (libpng.a) resides.
--with-pnglib-include=DIR specify directory with the pnglib header files.
@@ -1449,16 +1454,6 @@ Optional Packages:
Specify the location of T1lib library files (libt1.a)
--with-t1lib-include=DIR
Specify the location of T1lib header files
- --with-system-zlib use installed zlib library
- --with-zlib-libdir=DIR
- Specify directory where the zlib.a resides.
- --with-zlib-include=DIR
- Specify the zlib header files location.
- --with-system-gd use installed gd library
- --with-gd-libdir=DIR
- Specify directory where the gd library resides.
- --with-gd-include=DIR
- Specify the gd header files location.
--with-system-freetype use installed freetype library
--with-freetype-libdir=DIR
Specify directory where the libfreetype resides.
@@ -1470,6 +1465,11 @@ Optional Packages:
--with-freetype2-include=DIR
Specify the freetype2 header files location.
(both DIR and DIR/freetype2 will be added to the include paths)
+ --with-system-gd use installed gd library
+ --with-gd-libdir=DIR
+ Specify directory where the gd library resides.
+ --with-gd-include=DIR
+ Specify the gd header files location.
--with-icu-libdir=DIR
Specify directory where the ICU library resides.
--with-icu-include=DIR
@@ -5314,7 +5314,7 @@ export with_cxx_runtime_hack
# withenable.ac - Written long ago by Thomas Esser and Sebastian Rahtz.
-# $Id: withenable.ac 7137 2008-03-25 00:14:10Z karl $
+# $Id: withenable.ac 7263 2008-03-31 18:52:26Z karl $
# Public domain.
@@ -6366,6 +6366,27 @@ fi
+
+# Check whether --with-system_zlib was given.
+if test "${with_system_zlib+set}" = set; then
+ withval=$with_system_zlib;
+fi
+
+
+
+# Check whether --with-zlib_libdir was given.
+if test "${with_zlib_libdir+set}" = set; then
+ withval=$with_zlib_libdir;
+fi
+
+
+
+# Check whether --with-zlib_include was given.
+if test "${with_zlib_include+set}" = set; then
+ withval=$with_zlib_include;
+fi
+
+
# beginning of libpng/withenable.ac
# public domain.
@@ -6412,48 +6433,6 @@ fi
-# Check whether --with-system_zlib was given.
-if test "${with_system_zlib+set}" = set; then
- withval=$with_system_zlib;
-fi
-
-
-
-# Check whether --with-zlib_libdir was given.
-if test "${with_zlib_libdir+set}" = set; then
- withval=$with_zlib_libdir;
-fi
-
-
-
-# Check whether --with-zlib_include was given.
-if test "${with_zlib_include+set}" = set; then
- withval=$with_zlib_include;
-fi
-
-
-
-# Check whether --with-system_gd was given.
-if test "${with_system_gd+set}" = set; then
- withval=$with_system_gd;
-fi
-
-
-
-# Check whether --with-gd_libdir was given.
-if test "${with_gd_libdir+set}" = set; then
- withval=$with_gd_libdir;
-fi
-
-
-
-# Check whether --with-gd_include was given.
-if test "${with_gd_include+set}" = set; then
- withval=$with_gd_include;
-fi
-
-
-
# Check whether --with-system_freetype was given.
if test "${with_system_freetype+set}" = set; then
withval=$with_system_freetype;
@@ -6495,6 +6474,27 @@ if test "${with_freetype2_include+set}" = set; then
fi
+
+# Check whether --with-system_gd was given.
+if test "${with_system_gd+set}" = set; then
+ withval=$with_system_gd;
+fi
+
+
+
+# Check whether --with-gd_libdir was given.
+if test "${with_gd_libdir+set}" = set; then
+ withval=$with_gd_libdir;
+fi
+
+
+
+# Check whether --with-gd_include was given.
+if test "${with_gd_include+set}" = set; then
+ withval=$with_gd_include;
+fi
+
+
# Not available because xetex uses a customized ICU layout engine
# AC_ARG_WITH(system_icu,
# [ --with-system-icu use installed ICU library])
@@ -6626,396 +6626,6 @@ test "$with_xetex" != no && : ${needs_teckit=yes}
: ${needs_teckit=no}
export needs_teckit
-# beginning of libpng.ac
-if test "$needs_pnglib" = no; then
- LIBPNGCPPFLAGS=
- LDLIBPNG=
- LIBPNGDEP=
-else
- EXTRA_LIBPNG_INCLUDE=
- EXTRA_LIBPNG_LIBDIR=
-
- if test "$with_system_pnglib" = yes; then
- if test "x$with_pnglib_libdir" != x; then
- EXTRA_LIBPNG_LIBDIR="-L$with_pnglib_libdir"
- fi
- if test "x$with_pnglib_include" != x; then
- EXTRA_LIBPNG_INCLUDE="-I$with_pnglib_include"
- fi
- fi
-
- OLD_LDFLAGS=$LDFLAGS
- OLD_CPP=$CPP
- OLD_LIBS=$LIBS
-
- LDFLAGS="$LDFLAGS $EXTRA_LIBPNG_LIBDIR"
- CPP="$CPP $EXTRA_LIBPNG_INCLUDE"
-
- if test "$with_system_pnglib" = yes; then
- { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
-echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; }
-if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng -lz -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char png_set_read_fn ();
-int
-main ()
-{
-return png_set_read_fn ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_png_png_set_read_fn=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_png_png_set_read_fn=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; }
-if test $ac_cv_lib_png_png_set_read_fn = yes; then
- pnglib=-lpng
-else
- { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
- with_system_pnglib=no
-fi
-
- fi
-
- LDFLAGS=$OLD_LDFLAGS
- CPP=$OLD_CPP
- LIBS=$OLD_LIBS
-
- if test "$with_system_pnglib" != yes; then
- LIBPNGCPPFLAGS='-I$(LIBPNGDIR) -I$(LIBPNGSRCDIR)'
- LDLIBPNG='$(LIBPNGDIR)/libpng.a'
- LIBPNGDEP='$(LIBPNGDIR)/libpng.a'
- using_system_pnglib=no
- else
- LIBPNGCPPFLAGS="$EXTRA_LIBPNG_INCLUDE"
- LDLIBPNG="$EXTRA_LIBPNG_LIBDIR -lpng"
- LIBPNGDEP=
- using_system_pnglib=yes
- fi
-fi
-
-
-
-
-# end of libpng.ac
-
-if test "$needs_zlib" = no; then
- ZLIBCPPFLAGS=
- LDZLIB=
- ZLIBDEP=
-else
- EXTRA_ZLIB_INCLUDE=
- EXTRA_ZLIB_LIBDIR=
-
- if test "$with_system_zlib" = yes; then
- if test "x$with_zlib_libdir" != x; then
- EXTRA_ZLIB_LIBDIR="-L$with_zlib_libdir"
- fi
- if test "x$with_zlib_include" != x; then
- EXTRA_ZLIB_INCLUDE="-I$with_zlib_include"
- fi
- fi
-
- OLD_LDFLAGS=$LDFLAGS
- OLD_CPP=$CPP
- OLD_LIBS=$LIBS
-
- LDFLAGS="$LDFLAGS $EXTRA_ZLIB_LIBDIR"
- CPP="$CPP $EXTRA_ZLIB_INCLUDE"
-
- if test "$with_system_zlib" = yes; then
-
-{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
-echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char inflate ();
-int
-main ()
-{
-return inflate ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_z_inflate=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_z_inflate=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
-if test $ac_cv_lib_z_inflate = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
- LIBS="-lz $LIBS"
-
-else
- { echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
- with_system_zlib=no
-fi
-
- fi
-
- if test "$with_system_zlib" = yes; then
-
-for ac_header in zlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- if test "$ac_cv_header_zlib_h" != yes; then
- { echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
-echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
- with_system_zlib=no
- fi
- fi
-
- LDFLAGS=$OLD_LDFLAGS
- CPP=$OLD_CPP
- LIBS=$OLD_LIBS
-
- if test "$with_system_zlib" != yes; then
- ZLIBCPPFLAGS='-I$(ZLIBDIR) -I$(ZLIBSRCDIR)'
- LDZLIB='$(ZLIBDIR)/libz.a'
- ZLIBDEP='$(ZLIBDIR)/libz.a'
- using_system_zlib=no
- else
- ZLIBCPPFLAGS="$EXTRA_ZLIB_INCLUDE"
- LDZLIB="$EXTRA_ZLIB_LIBDIR -lz"
- ZLIBDEP=
- using_system_zlib=yes
- fi
-fi
-
-
-
-
-
if test "$needs_ncurses" = no; then
CURSESCPPFLAGS=
LDCURSESLIB=
@@ -7616,54 +7226,39 @@ fi
-if test "$needs_libxpdf" = no; then
- LIBXPDFCPPFLAGS=
- LDLIBXPDF=
- LIBXPDFDEP=
-else
- LIBXPDFCPPFLAGS='-I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/xpdf -I$(LIBXPDFDIR)/goo -I$(LIBXPDFDIR)/fofi -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/xpdf -I$(LIBXPDFSRCDIR)/goo -I$(LIBXPDFSRCDIR)/fofi'
- LDLIBXPDF='$(LIBXPDFDIR)/xpdf/libxpdf.a $(LIBXPDFDIR)/goo/libGoo.a $(LIBXPDFDIR)/fofi/libfofi.a'
- LIBXPDFDEP='$(LIBXPDFDIR)/xpdf/libxpdf.a $(LIBXPDFDIR)/goo/libGoo.a $(LIBXPDFDIR)/fofi/libfofi.a'
-fi
-
-
-
-
-
-if test "$needs_libt1" = no; then
- LIBT1CPPFLAGS=
- LDLIBT1=
- LIBT1DEP=
+if test "$needs_zlib" = no; then
+ ZLIBCPPFLAGS=
+ LDZLIB=
+ ZLIBDEP=
else
- EXTRA_LIBT1_INCLUDE=
- EXTRA_LIBT1_LIBDIR=
+ EXTRA_ZLIB_INCLUDE=
+ EXTRA_ZLIB_LIBDIR=
- if test "$with_system_t1lib" = yes; then
- if test "x$with_t1lib_libdir" != x; then
- EXTRA_LIBT1_LIBDIR="-L$with_t1lib_libdir"
+ if test "$with_system_zlib" = yes; then
+ if test "x$with_zlib_libdir" != x; then
+ EXTRA_ZLIB_LIBDIR="-L$with_zlib_libdir"
fi
- if test "x$with_t1lib_include" != x; then
- EXTRA_LIBT1_INCLUDE="-I$with_t1lib_include"
+ if test "x$with_zlib_include" != x; then
+ EXTRA_ZLIB_INCLUDE="-I$with_zlib_include"
fi
fi
OLD_LDFLAGS=$LDFLAGS
OLD_CPP=$CPP
- OLDCPPFLAGS=$CPPFLAGS
OLD_LIBS=$LIBS
- LDFLAGS="$LDFLAGS $EXTRA_LIBT1_LIBDIR"
- CPP="$CPP $EXTRA_LIBT1_INCLUDE"
- CPPFLAGS="$CPPFLAGS $EXTRA_LIBT1_INCLUDE"
+ LDFLAGS="$LDFLAGS $EXTRA_ZLIB_LIBDIR"
+ CPP="$CPP $EXTRA_ZLIB_INCLUDE"
- if test "$with_system_t1lib" = yes; then
- { echo "$as_me:$LINENO: checking for T1_AddFont in -lt1" >&5
-echo $ECHO_N "checking for T1_AddFont in -lt1... $ECHO_C" >&6; }
-if test "${ac_cv_lib_t1_T1_AddFont+set}" = set; then
+ if test "$with_system_zlib" = yes; then
+
+{ echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6; }
+if test "${ac_cv_lib_z_inflate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lt1 -lz -lm $LIBS"
+LIBS="-lz $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7677,11 +7272,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char T1_AddFont ();
+char inflate ();
int
main ()
{
-return T1_AddFont ();
+return inflate ();
;
return 0;
}
@@ -7704,132 +7299,197 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_t1_T1_AddFont=yes
+ ac_cv_lib_z_inflate=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_t1_T1_AddFont=no
+ ac_cv_lib_z_inflate=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_AddFont" >&5
-echo "${ECHO_T}$ac_cv_lib_t1_T1_AddFont" >&6; }
-if test $ac_cv_lib_t1_T1_AddFont = yes; then
- t1lib=-lt1
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
+echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6; }
+if test $ac_cv_lib_z_inflate = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+ LIBS="-lz $LIBS"
+
else
- { echo "$as_me:$LINENO: WARNING: Standard T1 library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard T1 library not found. Compiling my own." >&2;}
- with_system_t1lib=no
+ { echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
+echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
+ with_system_zlib=no
fi
fi
- LIBS="-lt1 -lm $LIBS"
- if test "$with_system_t1lib" = yes; then
- { echo "$as_me:$LINENO: checking whether installed T1 lib is >= v 5.0.0 " >&5
-echo $ECHO_N "checking whether installed T1 lib is >= v 5.0.0 ... $ECHO_C" >&6; }
- if test "$cross_compiling" = yes; then
- ac_compile_t1lib=1
+ if test "$with_system_zlib" = yes; then
+for ac_header in zlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-#include <stdlib.h>
-#include "t1lib.h"
-#define BUFLEN 128
-int main() {
- char *t1libId = T1_GetLibIdent();
- char testbuf[BUFLEN];
- char *p = testbuf;
- int i;
- int version_num;
- /* T1_GetLibIdent() might return something like '0.8-beta2';
- convert the leading numbers to a single digit: */
- for (i = 0; i < BUFLEN - 1; i++) {
- if (t1libId[i] >= '0' && t1libId[i] <= '9')
- *p++ = t1libId[i];
- else if (t1libId[i] != '.' && t1libId[i] != '_' && t1libId[i] != '-')
- break;
- }
- *p = '\0';
- version_num = strtoul(testbuf, (char **)NULL, 10);
- /* xdvik needs >= 5.0.0.
- Try to deal with version strings with 1 or more digits. */
- if (version_num >= 500
- || (version_num < 100 && version_num >= 50)
- || (version_num < 10 && version_num >= 5))
- exit(0);
- exit(1);
-}
-
+$ac_includes_default
+#include <$ac_header>
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_compile_t1lib=0
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-ac_compile_t1lib=1
+ ac_header_preproc=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
- if test $ac_compile_t1lib = 0; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no, will compile my own version" >&5
-echo "${ECHO_T}no, will compile my own version" >&6; }
- with_system_t1lib=no
- fi
+fi
+
+done
+
+ if test "$ac_cv_header_zlib_h" != yes; then
+ { echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
+echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
+ with_system_zlib=no
+ fi
fi
LDFLAGS=$OLD_LDFLAGS
CPP=$OLD_CPP
- CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLD_LIBS
- if test "$with_system_t1lib" != yes; then
- LIBT1CPPFLAGS='-I$(LIBT1DIR) -I$(LIBT1SRCDIR) -I$(LIBT1DIR)/../type1 -I$(LIBT1SRCDIR)/../type1'
- LDLIBT1='$(LIBT1DIR)/libt1.a $(LIBT1DIR)/../type1/libtype1.a'
- LIBT1DEP='$(LIBT1DIR)/libt1.a $(LIBT1DIR)/../type1/libtype1.a'
- using_system_t1lib=no
+ if test "$with_system_zlib" != yes; then
+ ZLIBCPPFLAGS='-I$(ZLIBDIR) -I$(ZLIBSRCDIR)'
+ LDZLIB='$(ZLIBDIR)/libz.a'
+ ZLIBDEP='$(ZLIBDIR)/libz.a'
+ using_system_zlib=no
else
- LIBT1CPPFLAGS="$EXTRA_LIBT1_INCLUDE"
- LDLIBT1="$EXTRA_LIBT1_LIBDIR -lt1"
- LIBT1DEP=
- using_system_t1lib=yes
+ ZLIBCPPFLAGS="$EXTRA_ZLIB_INCLUDE"
+ LDZLIB="$EXTRA_ZLIB_LIBDIR -lz"
+ ZLIBDEP=
+ using_system_zlib=yes
fi
fi
@@ -7837,20 +7497,21 @@ fi
-if test "$needs_gd" = no; then
- GDCPPFLAGS=
- LDGD=
- GDDEP=
+# beginning of libpng.ac
+if test "$needs_pnglib" = no; then
+ LIBPNGCPPFLAGS=
+ LDLIBPNG=
+ LIBPNGDEP=
else
- EXTRA_GD_INCLUDE=
- EXTRA_GD_LIBDIR=
+ EXTRA_LIBPNG_INCLUDE=
+ EXTRA_LIBPNG_LIBDIR=
- if test "$with_system_gd" = yes; then
- if test "x$with_gd_libdir" != x; then
- EXTRA_GD_LIBDIR="-L$with_gd_libdir"
+ if test "$with_system_pnglib" = yes; then
+ if test "x$with_pnglib_libdir" != x; then
+ EXTRA_LIBPNG_LIBDIR="-L$with_pnglib_libdir"
fi
- if test "x$with_gd_include" != x; then
- EXTRA_GD_INCLUDE="-I$with_gd_include"
+ if test "x$with_pnglib_include" != x; then
+ EXTRA_LIBPNG_INCLUDE="-I$with_pnglib_include"
fi
fi
@@ -7858,18 +7519,17 @@ else
OLD_CPP=$CPP
OLD_LIBS=$LIBS
- LDFLAGS="$LDFLAGS $EXTRA_GD_LIBDIR"
- CPP="$CPP $EXTRA_GD_INCLUDE"
-
- if test "$with_system_gd" = yes; then
+ LDFLAGS="$LDFLAGS $EXTRA_LIBPNG_LIBDIR"
+ CPP="$CPP $EXTRA_LIBPNG_INCLUDE"
-{ echo "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromPng in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then
+ if test "$with_system_pnglib" = yes; then
+ { echo "$as_me:$LINENO: checking for png_set_read_fn in -lpng" >&5
+echo $ECHO_N "checking for png_set_read_fn in -lpng... $ECHO_C" >&6; }
+if test "${ac_cv_lib_png_png_set_read_fn+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgd $LIBS"
+LIBS="-lpng -lz -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7883,11 +7543,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char gdImageCreateFromPng ();
+char png_set_read_fn ();
int
main ()
{
-return gdImageCreateFromPng ();
+return png_set_read_fn ();
;
return 0;
}
@@ -7910,44 +7570,100 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_gd_gdImageCreateFromPng=yes
+ ac_cv_lib_png_png_set_read_fn=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_gd_gdImageCreateFromPng=no
+ ac_cv_lib_png_png_set_read_fn=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromPng" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateFromPng = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGD 1
-_ACEOF
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_read_fn" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_set_read_fn" >&6; }
+if test $ac_cv_lib_png_png_set_read_fn = yes; then
+ pnglib=-lpng
+else
+ { echo "$as_me:$LINENO: WARNING: Standard PNG library not found. Compiling my own." >&5
+echo "$as_me: WARNING: Standard PNG library not found. Compiling my own." >&2;}
+ with_system_pnglib=no
+fi
- LIBS="-lgd $LIBS"
+ fi
+ LDFLAGS=$OLD_LDFLAGS
+ CPP=$OLD_CPP
+ LIBS=$OLD_LIBS
+
+ if test "$with_system_pnglib" != yes; then
+ LIBPNGCPPFLAGS='-I$(LIBPNGDIR) -I$(LIBPNGSRCDIR)'
+ LDLIBPNG='$(LIBPNGDIR)/libpng.a'
+ LIBPNGDEP='$(LIBPNGDIR)/libpng.a'
+ using_system_pnglib=no
+ else
+ LIBPNGCPPFLAGS="$EXTRA_LIBPNG_INCLUDE"
+ LDLIBPNG="$EXTRA_LIBPNG_LIBDIR -lpng"
+ LIBPNGDEP=
+ using_system_pnglib=yes
+ fi
+fi
+
+
+
+
+# end of libpng.ac
+
+if test "$needs_libxpdf" = no; then
+ LIBXPDFCPPFLAGS=
+ LDLIBXPDF=
+ LIBXPDFDEP=
else
- { echo "$as_me:$LINENO: WARNING: Standard gd library not found. Compiling my own." >&5
-echo "$as_me: WARNING: Standard gd library not found. Compiling my own." >&2;}
- with_system_gd=no
+ LIBXPDFCPPFLAGS='-I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/xpdf -I$(LIBXPDFDIR)/goo -I$(LIBXPDFDIR)/fofi -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/xpdf -I$(LIBXPDFSRCDIR)/goo -I$(LIBXPDFSRCDIR)/fofi'
+ LDLIBXPDF='$(LIBXPDFDIR)/xpdf/libxpdf.a $(LIBXPDFDIR)/goo/libGoo.a $(LIBXPDFDIR)/fofi/libfofi.a'
+ LIBXPDFDEP='$(LIBXPDFDIR)/xpdf/libxpdf.a $(LIBXPDFDIR)/goo/libGoo.a $(LIBXPDFDIR)/fofi/libfofi.a'
fi
+
+
+
+
+if test "$needs_libt1" = no; then
+ LIBT1CPPFLAGS=
+ LDLIBT1=
+ LIBT1DEP=
+else
+ EXTRA_LIBT1_INCLUDE=
+ EXTRA_LIBT1_LIBDIR=
+
+ if test "$with_system_t1lib" = yes; then
+ if test "x$with_t1lib_libdir" != x; then
+ EXTRA_LIBT1_LIBDIR="-L$with_t1lib_libdir"
+ fi
+ if test "x$with_t1lib_include" != x; then
+ EXTRA_LIBT1_INCLUDE="-I$with_t1lib_include"
+ fi
fi
- if test "$with_system_gd" = yes; then
+ OLD_LDFLAGS=$LDFLAGS
+ OLD_CPP=$CPP
+ OLDCPPFLAGS=$CPPFLAGS
+ OLD_LIBS=$LIBS
-{ echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
+ LDFLAGS="$LDFLAGS $EXTRA_LIBT1_LIBDIR"
+ CPP="$CPP $EXTRA_LIBT1_INCLUDE"
+ CPPFLAGS="$CPPFLAGS $EXTRA_LIBT1_INCLUDE"
+
+ if test "$with_system_t1lib" = yes; then
+ { echo "$as_me:$LINENO: checking for T1_AddFont in -lt1" >&5
+echo $ECHO_N "checking for T1_AddFont in -lt1... $ECHO_C" >&6; }
+if test "${ac_cv_lib_t1_T1_AddFont+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgd $LIBS"
+LIBS="-lt1 -lz -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7961,11 +7677,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char gdImageGif ();
+char T1_AddFont ();
int
main ()
{
-return gdImageGif ();
+return T1_AddFont ();
;
return 0;
}
@@ -7988,197 +7704,132 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_gd_gdImageGif=yes
+ ac_cv_lib_t1_T1_AddFont=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_gd_gdImageGif=no
+ ac_cv_lib_t1_T1_AddFont=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGif" >&6; }
-if test $ac_cv_lib_gd_gdImageGif = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGD 1
-_ACEOF
-
- LIBS="-lgd $LIBS"
-
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_AddFont" >&5
+echo "${ECHO_T}$ac_cv_lib_t1_T1_AddFont" >&6; }
+if test $ac_cv_lib_t1_T1_AddFont = yes; then
+ t1lib=-lt1
else
- { echo "$as_me:$LINENO: WARNING: gd library does not have the necessary gif support. Compiling my own." >&5
-echo "$as_me: WARNING: gd library does not have the necessary gif support. Compiling my own." >&2;}
- with_system_gd=no
+ { echo "$as_me:$LINENO: WARNING: Standard T1 library not found. Compiling my own." >&5
+echo "$as_me: WARNING: Standard T1 library not found. Compiling my own." >&2;}
+ with_system_t1lib=no
fi
fi
- if test "$with_system_gd" = yes; then
+ LIBS="-lt1 -lm $LIBS"
+ if test "$with_system_t1lib" = yes; then
+ { echo "$as_me:$LINENO: checking whether installed T1 lib is >= v 5.0.0 " >&5
+echo $ECHO_N "checking whether installed T1 lib is >= v 5.0.0 ... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+ ac_compile_t1lib=1
-for ac_header in gd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+
+#include <stdlib.h>
+#include "t1lib.h"
+#define BUFLEN 128
+int main() {
+ char *t1libId = T1_GetLibIdent();
+ char testbuf[BUFLEN];
+ char *p = testbuf;
+ int i;
+ int version_num;
+ /* T1_GetLibIdent() might return something like '0.8-beta2';
+ convert the leading numbers to a single digit: */
+ for (i = 0; i < BUFLEN - 1; i++) {
+ if (t1libId[i] >= '0' && t1libId[i] <= '9')
+ *p++ = t1libId[i];
+ else if (t1libId[i] != '.' && t1libId[i] != '_' && t1libId[i] != '-')
+ break;
+ }
+ *p = '\0';
+ version_num = strtoul(testbuf, (char **)NULL, 10);
+ /* xdvik needs >= 5.0.0.
+ Try to deal with version strings with 1 or more digits. */
+ if (version_num >= 500
+ || (version_num < 100 && version_num >= 50)
+ || (version_num < 10 && version_num >= 5))
+ exit(0);
+ exit(1);
+}
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_link") 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ (eval "$ac_try") 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+ (exit $ac_status); }; }; then
+ ac_compile_t1lib=0
else
- echo "$as_me: failed program was:" >&5
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
+( exit $ac_status )
+ac_compile_t1lib=1
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-done
- if test "$ac_cv_header_gd_h" != yes; then
- { echo "$as_me:$LINENO: WARNING: gd.h not found. Using my own gd sources." >&5
-echo "$as_me: WARNING: gd.h not found. Using my own gd sources." >&2;}
- with_system_gd=no
- fi
+ if test $ac_compile_t1lib = 0; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no, will compile my own version" >&5
+echo "${ECHO_T}no, will compile my own version" >&6; }
+ with_system_t1lib=no
+ fi
fi
LDFLAGS=$OLD_LDFLAGS
CPP=$OLD_CPP
+ CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLD_LIBS
- if test "$with_system_gd" != yes; then
- GDCPPFLAGS='-I$(GDDIR) -I$(GDSRCDIR)'
- LDGD='$(GDDIR)/libgd.a'
- GDDEP='$(GDDIR)/libgd.a'
- using_system_gd=no
+ if test "$with_system_t1lib" != yes; then
+ LIBT1CPPFLAGS='-I$(LIBT1DIR) -I$(LIBT1SRCDIR) -I$(LIBT1DIR)/../type1 -I$(LIBT1SRCDIR)/../type1'
+ LDLIBT1='$(LIBT1DIR)/libt1.a $(LIBT1DIR)/../type1/libtype1.a'
+ LIBT1DEP='$(LIBT1DIR)/libt1.a $(LIBT1DIR)/../type1/libtype1.a'
+ using_system_t1lib=no
else
- GDCPPFLAGS="$EXTRA_GD_INCLUDE"
- LDGD="$EXTRA_GD_LIBDIR -lgd"
- GDDEP=
- using_system_gd=yes
+ LIBT1CPPFLAGS="$EXTRA_LIBT1_INCLUDE"
+ LDLIBT1="$EXTRA_LIBT1_LIBDIR -lt1"
+ LIBT1DEP=
+ using_system_t1lib=yes
fi
fi
@@ -8960,6 +8611,355 @@ fi
+if test "$needs_gd" = no; then
+ GDCPPFLAGS=
+ LDGD=
+ GDDEP=
+else
+ EXTRA_GD_INCLUDE=
+ EXTRA_GD_LIBDIR=
+
+ if test "$with_system_gd" = yes; then
+ if test "x$with_gd_libdir" != x; then
+ EXTRA_GD_LIBDIR="-L$with_gd_libdir"
+ fi
+ if test "x$with_gd_include" != x; then
+ EXTRA_GD_INCLUDE="-I$with_gd_include"
+ fi
+ fi
+
+ OLD_LDFLAGS=$LDFLAGS
+ OLD_CPP=$CPP
+ OLD_LIBS=$LIBS
+
+ LDFLAGS="$LDFLAGS $EXTRA_GD_LIBDIR"
+ CPP="$CPP $EXTRA_GD_INCLUDE"
+
+ if test "$with_system_gd" = yes; then
+
+{ echo "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5
+echo $ECHO_N "checking for gdImageCreateFromPng in -lgd... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromPng ();
+int
+main ()
+{
+return gdImageCreateFromPng ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_gd_gdImageCreateFromPng=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gd_gdImageCreateFromPng=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
+echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromPng" >&6; }
+if test $ac_cv_lib_gd_gdImageCreateFromPng = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGD 1
+_ACEOF
+
+ LIBS="-lgd $LIBS"
+
+else
+ { echo "$as_me:$LINENO: WARNING: Standard gd library not found. Compiling my own." >&5
+echo "$as_me: WARNING: Standard gd library not found. Compiling my own." >&2;}
+ with_system_gd=no
+fi
+
+ fi
+
+ if test "$with_system_gd" = yes; then
+
+{ echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
+echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageGif ();
+int
+main ()
+{
+return gdImageGif ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_gd_gdImageGif=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gd_gdImageGif=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5
+echo "${ECHO_T}$ac_cv_lib_gd_gdImageGif" >&6; }
+if test $ac_cv_lib_gd_gdImageGif = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGD 1
+_ACEOF
+
+ LIBS="-lgd $LIBS"
+
+else
+ { echo "$as_me:$LINENO: WARNING: gd library does not have the necessary gif support. Compiling my own." >&5
+echo "$as_me: WARNING: gd library does not have the necessary gif support. Compiling my own." >&2;}
+ with_system_gd=no
+fi
+
+ fi
+
+ if test "$with_system_gd" = yes; then
+
+for ac_header in gd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ if test "$ac_cv_header_gd_h" != yes; then
+ { echo "$as_me:$LINENO: WARNING: gd.h not found. Using my own gd sources." >&5
+echo "$as_me: WARNING: gd.h not found. Using my own gd sources." >&2;}
+ with_system_gd=no
+ fi
+ fi
+
+ LDFLAGS=$OLD_LDFLAGS
+ CPP=$OLD_CPP
+ LIBS=$OLD_LIBS
+
+ if test "$with_system_gd" != yes; then
+ GDCPPFLAGS='-I$(GDDIR) -I$(GDSRCDIR)'
+ LDGD='$(GDDIR)/libgd.a'
+ GDDEP='$(GDDIR)/libgd.a'
+ using_system_gd=no
+ else
+ GDCPPFLAGS="$EXTRA_GD_INCLUDE"
+ LDGD="$EXTRA_GD_LIBDIR -lgd"
+ GDDEP=
+ using_system_gd=yes
+ fi
+fi
+
+
+
+
+
if test "$needs_icu" = no; then
ICUCPPFLAGS=
LDICU=
@@ -9277,30 +9277,30 @@ fi
LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $GRAPHITEDEP $TECKITDEP $LIBOBSDDEP"
LIBSDIRS=
-test "$needs_teckit" = yes \
- && LIBSDIRS="$TECKITDIR $LIBSDIRS"
test "$needs_ncurses" = yes && test "$using_system_ncurses" != yes \
- && LIBSDIRS="$NCURSESDIR $LIBSDIRS"
-test "$needs_pnglib" = yes && test "$using_system_pnglib" != yes \
- && LIBSDIRS="$LIBPNGDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $NCURSESDIR"
test "$needs_zlib" = yes && test "$using_system_zlib" != yes \
- && LIBSDIRS="$ZLIBDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $ZLIBDIR"
+test "$needs_pnglib" = yes && test "$using_system_pnglib" != yes \
+ && LIBSDIRS="$LIBSDIRS $LIBPNGDIR"
test "$needs_libxpdf" = yes \
- && LIBSDIRS="$LIBXPDFDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $LIBXPDFDIR"
test "$needs_libt1" = yes && test "$using_system_t1lib" != yes \
- && LIBSDIRS="$LIBT1DIR $LIBTYPE1DIR $LIBSDIRS"
-test "$needs_gd" = yes && test "$using_system_gd" != yes \
- && LIBSDIRS="$GDDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $LIBT1DIR $LIBTYPE1DIR"
test "$needs_freetype" = yes && test "$using_system_freetype" != yes \
- && LIBSDIRS="$FREETYPEDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $FREETYPEDIR"
test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \
- && LIBSDIRS="$FREETYPE2DIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $FREETYPE2DIR"
+test "$needs_gd" = yes && test "$using_system_gd" != yes \
+ && LIBSDIRS="$LIBSDIRS $GDDIR"
test "$needs_icu" = yes && test "$using_system_icu" != yes \
- && LIBSDIRS="$ICUDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $ICUDIR"
+test "$needs_teckit" = yes \
+ && LIBSDIRS="$LIBSDIRS $TECKITDIR"
test "$needs_graphite" = yes \
- && LIBSDIRS="$GRAPHITEDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $GRAPHITEDIR"
test "$needs_obsdcompat" = yes \
- && LIBSDIRS="$LIBOBSDCOMPATDIR $LIBSDIRS"
+ && LIBSDIRS="$LIBSDIRS $LIBOBSDCOMPATDIR"
subdirs="$subdirs libs"
@@ -10092,15 +10092,15 @@ ARFLAGS!$ARFLAGS$ac_delim
texmfmain!$texmfmain$ac_delim
socketlibs!$socketlibs$ac_delim
LDT1LIB!$LDT1LIB$ac_delim
-LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim
-LDLIBPNG!$LDLIBPNG$ac_delim
-LIBPNGDEP!$LIBPNGDEP$ac_delim
-ZLIBCPPFLAGS!$ZLIBCPPFLAGS$ac_delim
-LDZLIB!$LDZLIB$ac_delim
-ZLIBDEP!$ZLIBDEP$ac_delim
CURSESCPPFLAGS!$CURSESCPPFLAGS$ac_delim
LDCURSESLIB!$LDCURSESLIB$ac_delim
CURSESDEP!$CURSESDEP$ac_delim
+ZLIBCPPFLAGS!$ZLIBCPPFLAGS$ac_delim
+LDZLIB!$LDZLIB$ac_delim
+ZLIBDEP!$ZLIBDEP$ac_delim
+LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim
+LDLIBPNG!$LDLIBPNG$ac_delim
+LIBPNGDEP!$LIBPNGDEP$ac_delim
LIBXPDFCPPFLAGS!$LIBXPDFCPPFLAGS$ac_delim
LDLIBXPDF!$LDLIBXPDF$ac_delim
LIBXPDFDEP!$LIBXPDFDEP$ac_delim
@@ -10148,15 +10148,15 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-GDCPPFLAGS!$GDCPPFLAGS$ac_delim
-LDGD!$LDGD$ac_delim
-GDDEP!$GDDEP$ac_delim
FREETYPECPPFLAGS!$FREETYPECPPFLAGS$ac_delim
LDFREETYPE!$LDFREETYPE$ac_delim
FREETYPEDEP!$FREETYPEDEP$ac_delim
FREETYPE2CPPFLAGS!$FREETYPE2CPPFLAGS$ac_delim
LDFREETYPE2!$LDFREETYPE2$ac_delim
FREETYPE2DEP!$FREETYPE2DEP$ac_delim
+GDCPPFLAGS!$GDCPPFLAGS$ac_delim
+LDGD!$LDGD$ac_delim
+GDDEP!$GDDEP$ac_delim
ICUCPPFLAGS!$ICUCPPFLAGS$ac_delim
LDICU!$LDICU$ac_delim
ICUDEP!$ICUDEP$ac_delim