diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
commit | 14fdf58582eb34614c899048041260830bf11319 (patch) | |
tree | 24c257e172a5759d4653886820e0debc19a79e75 /Build/source/texk/dvipdfmx/configure | |
parent | 1d49a87a191295313dd1fdbce07dfb18ddd65bfc (diff) |
new build system: update
git-svn-id: svn://tug.org/texlive/trunk@12515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx/configure')
-rwxr-xr-x | Build/source/texk/dvipdfmx/configure | 376 |
1 files changed, 235 insertions, 141 deletions
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index 0f3985e37a1..5e40ad32785 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -14222,7 +14222,10 @@ $as_echo "$as_me: error: unknown endianness { $as_echo "$as_me:$LINENO: checking whether time.h defines timezone as an external variable" >&5 $as_echo_n "checking whether time.h defines timezone as an external variable... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +if test "${maw_cv_ext_timezone+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14258,51 +14261,61 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIMEZONE 1 -_ACEOF - + maw_cv_ext_timezone=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + maw_cv_ext_timezone=no fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $maw_cv_ext_timezone" >&5 +$as_echo "$maw_cv_ext_timezone" >&6; } +if test "x$maw_cv_ext_timezone" = xyes; then -{ $as_echo "$as_me:$LINENO: checking whether struct tm has tm_gmtoff as a member" >&5 -$as_echo_n "checking whether struct tm has tm_gmtoff as a member... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_TIMEZONE 1 +_ACEOF + +fi + + +{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5 +$as_echo_n "checking for struct tm.tm_gmtoff... " >&6; } +if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <time.h> + int main () { -struct tm *tp; tp->tm_gmtoff; +static struct tm ac_aggr; +if (ac_aggr.tm_gmtoff) +return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -14311,28 +14324,71 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_tm_tm_gmtoff=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF -#define HAVE_TM_GMTOFF 1 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <time.h> +int +main () +{ +static struct tm ac_aggr; +if (sizeof ac_aggr.tm_gmtoff) +return 0; + ; + return 0; +} +_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_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_cv_member_struct_tm_tm_gmtoff=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_member_struct_tm_tm_gmtoff=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 +$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; } +if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TM_GMTOFF 1 +_ACEOF + fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext # The cast to long int works around a bug in the HP C Compiler @@ -17277,31 +17333,28 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon fi -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" LIBS="$KPATHSEA_LIBS $LIBS" -{ $as_echo "$as_me:$LINENO: checking whether you have kpathsea headers and they know about the required file formats" >&5 -$as_echo_n "checking whether you have kpathsea headers and they know about the required file formats... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_truetype_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_truetype_format... " >&6; } +if test "${kpse_cv_have_truetype_format+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> -#include <kpathsea/tex-file.h> +#include <kpathsea/kpathsea.h> int main () { -kpse_tex_ps_header_format; - kpse_type1_format; - kpse_vf_format; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format; +kpse_truetype_format ; return 0; } @@ -17327,35 +17380,77 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether your kpathsea has xbasename" >&5 -$as_echo_n "checking whether your kpathsea has xbasename... " >&6; } - cat >conftest.$ac_ext <<_ACEOF + kpse_cv_have_truetype_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kpse_cv_have_truetype_format=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_truetype_format" >&5 +$as_echo "$kpse_cv_have_truetype_format" >&6; } +if test "x$kpse_cv_have_truetype_format" = xyes; then + : +else + { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&5 +$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&2;} + { (exit 1); exit 1; }; } +fi + +{ $as_echo "$as_me:$LINENO: checking whether xbasename is declared" >&5 +$as_echo_n "checking whether xbasename is declared... " >&6; } +if test "${ac_cv_have_decl_xbasename+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> -#include <kpathsea/lib.h> +#include <kpathsea/kpathsea.h> + int main () { -xbasename; +#ifndef xbasename + (void) xbasename; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -17364,75 +17459,45 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_xbasename=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&5 -$as_echo "$as_me: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&2;} - { (exit 1); exit 1; }; } + ac_cv_have_decl_xbasename=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_xbasename" >&5 +$as_echo "$ac_cv_have_decl_xbasename" >&6; } +if test "x$ac_cv_have_decl_xbasename" = x""yes; then + : else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. - -This version of dvipdfmx requires that kpathsea and its headers be available. -If you are sure they are installed and in a standard place, maybe you need a -newer version of kpathsea? You also might try setting the environment -variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing -the file \"kpathsea/tex-file.h\" - -" >&5 -$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. - -This version of dvipdfmx requires that kpathsea and its headers be available. -If you are sure they are installed and in a standard place, maybe you need a -newer version of kpathsea? You also might try setting the environment -variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing -the file \"kpathsea/tex-file.h\" - -" >&2;} + { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename in libkpathsea." >&5 +$as_echo "$as_me: error: This version of dvipdfmx requires xbasename in libkpathsea." >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: checking whether kpathsea library supports TDS version 1.1 installation" >&5 -$as_echo_n "checking whether kpathsea library supports TDS version 1.1 installation... " >&6; } -cat >conftest.$ac_ext <<_ACEOF + +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } +if test "${kpse_cv_have_opentype_format+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> #include <kpathsea/kpathsea.h> -#include <kpathsea/tex-file.h> int main () { -kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format; +kpse_opentype_format ; return 0; } @@ -17458,6 +17523,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then + kpse_cv_have_opentype_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kpse_cv_have_opentype_format=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_opentype_format" >&5 +$as_echo "$kpse_cv_have_opentype_format" >&6; } +if test "x$kpse_cv_have_opentype_format" = xyes; then tds_version_11=yes cat >>confdefs.h <<\_ACEOF @@ -17465,19 +17545,15 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - tds_version_11=no - cat >>confdefs.h <<\_ACEOF + tds_version_11=no + cat >>confdefs.h <<\_ACEOF #define __TDS_VERSION__ 0x200302L _ACEOF fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: checking whether libkpathsea supports TDS version 1.1 installation" >&5 +$as_echo_n "checking whether libkpathsea supports TDS version 1.1 installation... " >&6; } { $as_echo "$as_me:$LINENO: result: $tds_version_11" >&5 $as_echo "$tds_version_11" >&6; } if test "x$tds_version_11" = xyes; then @@ -17489,12 +17565,16 @@ else fi -CPPFLAGS="$save_CPPFLAGS $ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS $save_LIBS" + +CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES" +LIBS="$ZLIB_LIBS $LIBS" { $as_echo "$as_me:$LINENO: checking for zlib header files and library" >&5 $as_echo_n "checking for zlib header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +if test "${cho_cv_have_zlib+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17530,8 +17610,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + cho_cv_have_zlib=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_zlib=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $cho_cv_have_zlib" >&5 +$as_echo "$cho_cv_have_zlib" >&6; } +if test "x$cho_cv_have_zlib" = xyes; then for ac_func in compress do @@ -17742,24 +17835,19 @@ done fi done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" LIBS="$LIBPNG_LIBS $LIBS" -{ $as_echo "$as_me:$LINENO: checking for png header files and library" >&5 -$as_echo_n "checking for png header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking for libpng header files and library" >&5 +$as_echo_n "checking for libpng header files and library... " >&6; } +if test "${cho_cv_have_png+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17795,8 +17883,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + cho_cv_have_png=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_png=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $cho_cv_have_png" >&5 +$as_echo "$cho_cv_have_png" >&6; } +if test "x$cho_cv_have_png" = xyes; then for ac_func in png_get_image_width do @@ -17902,20 +18003,13 @@ _ACEOF fi done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS |