diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-04-07 12:06:18 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-04-07 12:06:18 +0000 |
commit | 41fdc70e57b74afa2a63e751e435055e5dfe7c58 (patch) | |
tree | 200d74ecd21d8b77bdcb5687576a6d7f012be322 /Build/source/libs/configure | |
parent | 1999147223756159c17c4e47fbbaf7b7d0344f4f (diff) |
respect library dependencies
git-svn-id: svn://tug.org/texlive/trunk@7345 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/configure')
-rwxr-xr-x | Build/source/libs/configure | 1294 |
1 files changed, 647 insertions, 647 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 7ac0ac02367..bafe797de3b 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -684,27 +684,27 @@ LD AR ARFLAGS texmfmain -LIBT1CPPFLAGS -LDLIBT1 -LIBT1DEP CURSESCPPFLAGS LDCURSESLIB CURSESDEP -LIBPNGCPPFLAGS -LDLIBPNG -LIBPNGDEP ZLIBCPPFLAGS LDZLIB ZLIBDEP -GDCPPFLAGS -LDGD -GDDEP +LIBPNGCPPFLAGS +LDLIBPNG +LIBPNGDEP +LIBT1CPPFLAGS +LDLIBT1 +LIBT1DEP FREETYPECPPFLAGS LDFREETYPE FREETYPEDEP FREETYPE2CPPFLAGS LDFREETYPE2 FREETYPE2DEP +GDCPPFLAGS +LDGD +GDDEP ICUCPPFLAGS LDICU ICUDEP @@ -727,16 +727,16 @@ LDFLAGS LIBS CPPFLAGS CPP' -ac_subdirs_all='t1lib type1 -ncurses +ac_subdirs_all='ncurses xpdf +t1lib type1 freetype freetype2 gd icu-xetex +teckit graphite-engine -obsdcompat -teckit' +obsdcompat' # Initialize some variables set by options. ac_init_help= @@ -1322,29 +1322,24 @@ Optional Packages: --without-mkofm-default do not run mkofm if OFM file missing --with-mktexfmt-default run mktexfmt if format file missing --with-mktextex-default run mktextex if TeX source missing - --with-system-t1lib Use installed T1lib - --with-t1lib-libdir=DIR - Specify the location of T1lib library files (libt1.a) - --with-t1lib-include=DIR - Specify the location of T1lib header files --with-system-ncurses check for installed ncurses --with-ncurses-libdir=DIR Specify directory where the ncurses library resides. --with-ncurses-include=DIR Specify the ncurses 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. --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-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. + --with-system-t1lib Use installed T1lib + --with-t1lib-libdir=DIR + Specify the location of T1lib library files (libt1.a) + --with-t1lib-include=DIR + Specify the location of T1lib header files --with-system-freetype use installed freetype library --with-freetype-libdir=DIR Specify directory where the libfreetype resides. @@ -1356,6 +1351,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 @@ -4336,234 +4336,6 @@ echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain. fi - -# Check whether --with-system-t1lib was given. -if test "${with_system_t1lib+set}" = set; then - withval=$with_system_t1lib; -fi - - - -# Check whether --with-t1lib_libdir was given. -if test "${with_t1lib_libdir+set}" = set; then - withval=$with_t1lib_libdir; -fi - - - -# Check whether --with-t1lib_include was given. -if test "${with_t1lib_include+set}" = set; then - withval=$with_t1lib_include; -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 - - 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" - - 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="-lt1 -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 T1_AddFont (); -int -main () -{ -return T1_AddFont (); - ; - 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_t1_T1_AddFont=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - 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_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: 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 - - 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 - -else - 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); -} - -_ACEOF -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_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compile_t1lib=0 -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_compile_t1lib=1 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -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_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 - LIBT1CPPFLAGS="$EXTRA_LIBT1_INCLUDE" - LDLIBT1="$EXTRA_LIBT1_LIBDIR -lt1" - LIBT1DEP= - using_system_t1lib=yes - fi -fi - - - - - try_ncurses=no # Check whether --with-system-ncurses was given. @@ -5189,149 +4961,6 @@ fi -# beginning of libpng/withenable.ac -# public domain. - -# Check whether --with-system-pnglib was given. -if test "${with_system_pnglib+set}" = set; then - withval=$with_system_pnglib; -fi - - - -# Check whether --with-pnglib_libdir was given. -if test "${with_pnglib_libdir+set}" = set; then - withval=$with_pnglib_libdir; -fi - - - -# Check whether --with-pnglib_include was given. -if test "${with_pnglib_include+set}" = set; then - withval=$with_pnglib_include; -fi - -# end of libpng/withenable.ac - -# 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 - # Check whether --with-system_zlib was given. if test "${with_system_zlib+set}" = set; then @@ -5624,41 +5253,45 @@ fi +# beginning of libpng/withenable.ac +# public domain. -# Check whether --with-system_gd was given. -if test "${with_system_gd+set}" = set; then - withval=$with_system_gd; +# Check whether --with-system-pnglib was given. +if test "${with_system_pnglib+set}" = set; then + withval=$with_system_pnglib; fi -# Check whether --with-gd_libdir was given. -if test "${with_gd_libdir+set}" = set; then - withval=$with_gd_libdir; +# Check whether --with-pnglib_libdir was given. +if test "${with_pnglib_libdir+set}" = set; then + withval=$with_pnglib_libdir; fi -# Check whether --with-gd_include was given. -if test "${with_gd_include+set}" = set; then - withval=$with_gd_include; +# Check whether --with-pnglib_include was given. +if test "${with_pnglib_include+set}" = set; then + withval=$with_pnglib_include; fi +# end of libpng/withenable.ac -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 @@ -5666,18 +5299,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 @@ -5691,11 +5323,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; } @@ -5718,44 +5350,107 @@ 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 -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 + 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 + + +# Check whether --with-system-t1lib was given. +if test "${with_system_t1lib+set}" = set; then + withval=$with_system_t1lib; +fi + + + +# Check whether --with-t1lib_libdir was given. +if test "${with_t1lib_libdir+set}" = set; then + withval=$with_t1lib_libdir; +fi + + + +# Check whether --with-t1lib_include was given. +if test "${with_t1lib_include+set}" = set; then + withval=$with_t1lib_include; 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 @@ -5769,11 +5464,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; } @@ -5796,197 +5491,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 @@ -6810,6 +6440,376 @@ 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 + + +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 + + + + + # Not available because xetex uses a customized ICU layout engine # AC_ARG_WITH(system_icu, # [ --with-system-icu use installed ICU library]) @@ -7134,18 +7134,28 @@ fi # system's terminfo definitions if configured without explicit --prefix. # ac_configure_args=`echo "$ac_configure_args" | sed 's@--prefix=[[^ ]]*@@'` -if test "x$needs_libt1" != xno && test "$using_system_t1lib" != yes; then - subdirs="$subdirs t1lib type1" - -fi if test "x$needs_ncurses" != xno && test "$using_system_ncurses" != yes; then subdirs="$subdirs ncurses" fi +if test "x$needs_zlib" != xno && test "$using_system_zlib" != yes; then + ac_config_files="$ac_config_files zlib/Makefile.aux:zlib/Makefile.in" +ac_config_files="$ac_config_files zlib/Makefile:zlib/Makefile.aux" + +fi +if test "x$needs_pnglib" != xno && test "$using_system_pnglib" != yes; then + ac_config_files="$ac_config_files libpng/Makefile.aux:libpng/Makefile.in" +ac_config_files="$ac_config_files libpng/Makefile:libpng/Makefile.aux" + +fi if test "x$needs_libxpdf" != xno; then subdirs="$subdirs xpdf" fi +if test "x$needs_libt1" != xno && test "$using_system_t1lib" != yes; then + subdirs="$subdirs t1lib type1" + +fi if test "x$needs_freetype" != xno && test "$using_system_freetype" != yes; then subdirs="$subdirs freetype" @@ -7163,28 +7173,18 @@ if test "x$needs_icu" != xno && test "$using_system_icu" != yes; then subdirs="$subdirs icu-xetex" fi -if test "x$needs_graphite_engine" != xno; then - subdirs="$subdirs graphite-engine" - -fi -if test "x$needs_pnglib" != xno && test "$using_system_pnglib" != yes; then - ac_config_files="$ac_config_files libpng/Makefile.aux:libpng/Makefile.in" -ac_config_files="$ac_config_files libpng/Makefile:libpng/Makefile.aux" +if test "x$needs_teckit" != xno; then + subdirs="$subdirs teckit" fi -if test "x$needs_zlib" != xno && test "$using_system_zlib" != yes; then - ac_config_files="$ac_config_files zlib/Makefile.aux:zlib/Makefile.in" -ac_config_files="$ac_config_files zlib/Makefile:zlib/Makefile.aux" +if test "x$needs_graphite_engine" != xno; then + subdirs="$subdirs graphite-engine" fi if test "x$needs_obsdcompat" != xno; then subdirs="$subdirs obsdcompat" fi -if test "x$needs_teckit" != xno; then - subdirs="$subdirs teckit" - -fi # create md5 directory when building outside the srcdir: if test -d $srcdir/md5; then @@ -7759,10 +7759,10 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "libpng/Makefile.aux") CONFIG_FILES="$CONFIG_FILES libpng/Makefile.aux:libpng/Makefile.in" ;; - "libpng/Makefile") CONFIG_FILES="$CONFIG_FILES libpng/Makefile:libpng/Makefile.aux" ;; "zlib/Makefile.aux") CONFIG_FILES="$CONFIG_FILES zlib/Makefile.aux:zlib/Makefile.in" ;; "zlib/Makefile") CONFIG_FILES="$CONFIG_FILES zlib/Makefile:zlib/Makefile.aux" ;; + "libpng/Makefile.aux") CONFIG_FILES="$CONFIG_FILES libpng/Makefile.aux:libpng/Makefile.in" ;; + "libpng/Makefile") CONFIG_FILES="$CONFIG_FILES libpng/Makefile:libpng/Makefile.aux" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -7894,27 +7894,27 @@ LD!$LD$ac_delim AR!$AR$ac_delim ARFLAGS!$ARFLAGS$ac_delim texmfmain!$texmfmain$ac_delim -LIBT1CPPFLAGS!$LIBT1CPPFLAGS$ac_delim -LDLIBT1!$LDLIBT1$ac_delim -LIBT1DEP!$LIBT1DEP$ac_delim CURSESCPPFLAGS!$CURSESCPPFLAGS$ac_delim LDCURSESLIB!$LDCURSESLIB$ac_delim CURSESDEP!$CURSESDEP$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 -GDCPPFLAGS!$GDCPPFLAGS$ac_delim -LDGD!$LDGD$ac_delim -GDDEP!$GDDEP$ac_delim +LIBPNGCPPFLAGS!$LIBPNGCPPFLAGS$ac_delim +LDLIBPNG!$LDLIBPNG$ac_delim +LIBPNGDEP!$LIBPNGDEP$ac_delim +LIBT1CPPFLAGS!$LIBT1CPPFLAGS$ac_delim +LDLIBT1!$LDLIBT1$ac_delim +LIBT1DEP!$LIBT1DEP$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 @@ -8274,24 +8274,24 @@ which seems to be undefined. Please make sure it is defined." >&2;} case $ac_file$ac_mode in - "libpng/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's - kpse_input=`case libpng/Makefile.in in + "zlib/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's + kpse_input=`case zlib/Makefile.in in [\\/$]*) # Absolute - test -f "libpng/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: libpng/Makefile.in" >&5 -echo "$as_me: error: cannot find input file: libpng/Makefile.in" >&2;} + test -f "zlib/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: zlib/Makefile.in" >&5 +echo "$as_me: error: cannot find input file: zlib/Makefile.in" >&2;} { (exit 1); exit 1; }; } - echo "libpng/Makefile.in";; + echo "zlib/Makefile.in";; *) # Relative - if test -f "libpng/Makefile.in"; then + if test -f "zlib/Makefile.in"; then # Build tree - echo "libpng/Makefile.in" - elif test -f "$srcdir/libpng/Makefile.in"; then + echo "zlib/Makefile.in" + elif test -f "$srcdir/zlib/Makefile.in"; then # Source tree - echo "$srcdir/libpng/Makefile.in" + echo "$srcdir/zlib/Makefile.in" else # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: libpng/Makefile.in" >&5 -echo "$as_me: error: cannot find input file: libpng/Makefile.in" >&2;} + { { echo "$as_me:$LINENO: error: cannot find input file: zlib/Makefile.in" >&5 +echo "$as_me: error: cannot find input file: zlib/Makefile.in" >&2;} { (exit 1); exit 1; }; } fi;; esac` || { (exit 1); exit 1; } @@ -8308,16 +8308,16 @@ echo "$as_me: error: cannot find input file: libpng/Makefile.in" >&2;} # Be careful with whitespace; we need to use echo. kpse_file_substs=`sed -n '/^kpse_include/s%[ ]*\(.*\)%\1%p' "$kpse_input"` if test x"$kpse_file_substs" = x; then - { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`libpng/Makefile.in' + { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`zlib/Makefile.in' without any \`kpse_include' directives" >&5 -echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`libpng/Makefile.in' +echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`zlib/Makefile.in' without any \`kpse_include' directives" >&2;} fi # Create the sed command line ... # Input lines containing "@configure_input@" are output twice, # first with our modifications and then unmodified. kpse_substs="sed -e '/@configure_input@/ { h; \ - s,@configure_input@,libpng/Makefile.aux. Generated from `echo libpng/Makefile.in | + s,@configure_input@,zlib/Makefile.aux. Generated from `echo zlib/Makefile.in | sed 's,.*/,,'` by configure.,; G; }'" for kpse_inc in $kpse_file_substs; do kpse_read=`case $kpse_inc in @@ -8342,26 +8342,26 @@ done # ... and fix the whitespace and escaped slashes. kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \ -e 's/kpse_include /kpse_include[ ]*/g'` -(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > libpng/Makefile.aux +(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > zlib/Makefile.aux ;; - "zlib/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's - kpse_input=`case zlib/Makefile.in in + "libpng/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's + kpse_input=`case libpng/Makefile.in in [\\/$]*) # Absolute - test -f "zlib/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: zlib/Makefile.in" >&5 -echo "$as_me: error: cannot find input file: zlib/Makefile.in" >&2;} + test -f "libpng/Makefile.in" || { { echo "$as_me:$LINENO: error: cannot find input file: libpng/Makefile.in" >&5 +echo "$as_me: error: cannot find input file: libpng/Makefile.in" >&2;} { (exit 1); exit 1; }; } - echo "zlib/Makefile.in";; + echo "libpng/Makefile.in";; *) # Relative - if test -f "zlib/Makefile.in"; then + if test -f "libpng/Makefile.in"; then # Build tree - echo "zlib/Makefile.in" - elif test -f "$srcdir/zlib/Makefile.in"; then + echo "libpng/Makefile.in" + elif test -f "$srcdir/libpng/Makefile.in"; then # Source tree - echo "$srcdir/zlib/Makefile.in" + echo "$srcdir/libpng/Makefile.in" else # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: zlib/Makefile.in" >&5 -echo "$as_me: error: cannot find input file: zlib/Makefile.in" >&2;} + { { echo "$as_me:$LINENO: error: cannot find input file: libpng/Makefile.in" >&5 +echo "$as_me: error: cannot find input file: libpng/Makefile.in" >&2;} { (exit 1); exit 1; }; } fi;; esac` || { (exit 1); exit 1; } @@ -8378,16 +8378,16 @@ echo "$as_me: error: cannot find input file: zlib/Makefile.in" >&2;} # Be careful with whitespace; we need to use echo. kpse_file_substs=`sed -n '/^kpse_include/s%[ ]*\(.*\)%\1%p' "$kpse_input"` if test x"$kpse_file_substs" = x; then - { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`zlib/Makefile.in' + { echo "$as_me:$LINENO: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`libpng/Makefile.in' without any \`kpse_include' directives" >&5 -echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`zlib/Makefile.in' +echo "$as_me: WARNING: No need to use \`KPSE_CONFIG_FILES' for input \`libpng/Makefile.in' without any \`kpse_include' directives" >&2;} fi # Create the sed command line ... # Input lines containing "@configure_input@" are output twice, # first with our modifications and then unmodified. kpse_substs="sed -e '/@configure_input@/ { h; \ - s,@configure_input@,zlib/Makefile.aux. Generated from `echo zlib/Makefile.in | + s,@configure_input@,libpng/Makefile.aux. Generated from `echo libpng/Makefile.in | sed 's,.*/,,'` by configure.,; G; }'" for kpse_inc in $kpse_file_substs; do kpse_read=`case $kpse_inc in @@ -8412,7 +8412,7 @@ done # ... and fix the whitespace and escaped slashes. kpse_substs=`echo "$kpse_substs" | sed -e 's,%,\\\/,g' \ -e 's/kpse_include /kpse_include[ ]*/g'` -(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > zlib/Makefile.aux +(eval $kpse_substs -e '/^kpse_include/d' "$kpse_input") > libpng/Makefile.aux ;; esac |