diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-23 16:33:37 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-23 16:33:37 +0000 |
commit | b789d9d640329830153fd0b4ec23c7545100969b (patch) | |
tree | c4a428db3de017c18afac09b8a5648162e960e8e /Build/source/texk/xdvipdfmx | |
parent | 6fe018282ebe6acac6f4c9aab818346f304e7373 (diff) |
build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@12807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r-- | Build/source/texk/xdvipdfmx/ac/withenable.ac | 2 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 64 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/configure.ac | 8 |
3 files changed, 22 insertions, 52 deletions
diff --git a/Build/source/texk/xdvipdfmx/ac/withenable.ac b/Build/source/texk/xdvipdfmx/ac/withenable.ac index 421a0b3997a..69043225dbf 100644 --- a/Build/source/texk/xdvipdfmx/ac/withenable.ac +++ b/Build/source/texk/xdvipdfmx/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for xdvipdfmx -KPSE_WITH_PROG([xdvipdfmx], [kpathsea freetype2 libpng]) +KPSE_ENABLE_PROG([xdvipdfmx], [kpathsea freetype2 libpng]) diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 4e1b5058133..47cf6788a06 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -938,8 +938,6 @@ with_system_libpng with_libpng_includes with_libpng_libdir with_system_freetype2 -with_freetype2_includes -with_freetype2_libdir with_paper with_fontconfig ' @@ -1614,10 +1612,7 @@ Optional Packages: --with-libpng-libdir=DIR libpng library installed in DIR --with-system-freetype2 use installed freetype2 headers and library - --with-freetype2-includes=DIR - freetype2 headers installed in DIR - --with-freetype2-libdir=DIR - freetype2 library installed in DIR + (requires freetype-config) --with-paper=DIR use paper include/library files from DIR --with-fontconfig=DIR use fontconfig include/library files from DIR @@ -4212,13 +4207,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4215: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4210: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4218: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4213: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4221: output\"" >&5) + (eval echo "\"\$as_me:4216: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5424,7 +5419,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5427 "configure"' > conftest.$ac_ext + echo '#line 5422 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7471,11 +7466,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7474: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7469: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7478: \$? = $ac_status" >&5 + echo "$as_me:7473: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7810,11 +7805,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7813: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7808: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7817: \$? = $ac_status" >&5 + echo "$as_me:7812: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7915,11 +7910,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7918: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7913: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7922: \$? = $ac_status" >&5 + echo "$as_me:7917: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7970,11 +7965,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7973: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7968: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7977: \$? = $ac_status" >&5 + echo "$as_me:7972: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10770,7 +10765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10773 "configure" +#line 10768 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10866,7 +10861,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10869 "configure" +#line 10864 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17262,6 +17257,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` KPATHSEA_RULE='# Rebuild libkpathsea @@ -17301,6 +17297,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz @@ -17340,6 +17337,7 @@ else -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng @@ -17447,16 +17445,6 @@ fi if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi - -# Check whether --with-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval=$with_freetype2_includes; -fi - -# Check whether --with-freetype2-libdir was given. -if test "${with_freetype2_libdir+set}" = set; then - withval=$with_freetype2_libdir; -fi if test "x$with_system_freetype2" = xyes; then if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` @@ -17467,11 +17455,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >& { (exit 1); exit 1; }; } fi else - FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \ + FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e "s,BLD/,$kpse_BLD/,g"` + FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs` + FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes` FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` FREETYPE2_RULE='# Rebuild libfreetype @@ -17480,10 +17470,6 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h ${top_builddir}/../../libs/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)' fi -if test "x$with_system_freetype2" = xno; then - FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`' - FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`' -fi kpse_save_CPPFLAGS=$CPPFLAGS @@ -18194,12 +18180,6 @@ fi -set -x -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS -eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" -eval FREETYPE2_LIBS="$FREETYPE2_LIBS" -set +x CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES" LIBS="$FREETYPE2_LIBS $LIBS" @@ -18393,8 +18373,6 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS -FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES -FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index 08fc22347a6..db6fd5ee46e 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -59,18 +59,10 @@ CHO_CHECK_ZLIB KPSE_ADD_FLAGS([libpng]) CHO_CHECK_LIBPNG -set -x -kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES -kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS -eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" -eval FREETYPE2_LIBS="$FREETYPE2_LIBS" -set +x KPSE_ADD_FLAGS([freetype2]) CHO_CHECK_LIBFREETYPE([xdvipdfmx]) KPSE_RESTORE_FLAGS -FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES -FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS dnl We do not provide the configure option '--enable-tetex-build', but may dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. |