diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2007-11-21 12:32:59 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2007-11-21 12:32:59 +0000 |
commit | 4b8d7001923647636c75949b21bea08220c444fa (patch) | |
tree | 75c036396e688923dd50e5e3cfd9a07d578b8c84 /Build/source | |
parent | 17aeed8e129118bdb3b7eb0ef3a18241dcda40eb (diff) |
configure updates for new xetex and libs
git-svn-id: svn://tug.org/texlive/trunk@5538 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-x | Build/source/configure | 225 | ||||
-rw-r--r-- | Build/source/configure.in | 13 | ||||
-rwxr-xr-x | Build/source/libs/configure | 23 | ||||
-rw-r--r-- | Build/source/libs/configure.in | 5 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 211 | ||||
-rw-r--r-- | Build/source/texk/web2c/configure.in | 2 |
6 files changed, 283 insertions, 196 deletions
diff --git a/Build/source/configure b/Build/source/configure index aac507be049..684cb16b765 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1446,6 +1446,7 @@ case "$target" in *-darwin*) : ${INSTALL='/usr/bin/install -c -p'}; export INSTALL : ${NCURSES_CPP_FIX=true}; export NCURSES_CPP_FIX + echo "$ac_t""no, but using other fixes for Darwin" 1>&6 ;; *) echo "$ac_t""no" 1>&6 @@ -1453,12 +1454,12 @@ case "$target" in esac echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1457: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1458: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1462 "configure" +#line 1463 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -1474,7 +1475,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1507,7 +1508,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1511: checking for a BSD compatible install" >&5 +echo "configure:1512: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1562,7 +1563,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1566: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1567: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1589,7 +1590,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1593: checking whether ln -s works" >&5 +echo "configure:1594: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1612,7 +1613,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1616: checking how to run the C preprocessor" >&5 +echo "configure:1617: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1627,13 +1628,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1631 "configure" +#line 1632 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1644,13 +1645,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1648 "configure" +#line 1649 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1661,13 +1662,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1665 "configure" +#line 1666 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1694,19 +1695,19 @@ echo "$ac_t""$CPP" 1>&6 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1698: checking for working alloca.h" >&5 +echo "configure:1699: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1703 "configure" +#line 1704 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1727,12 +1728,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1731: checking for alloca" >&5 +echo "configure:1732: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1736 "configure" +#line 1737 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1760,7 +1761,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1792,12 +1793,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1796: checking whether alloca needs Cray hooks" >&5 +echo "configure:1797: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1801 "configure" +#line 1802 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1822,12 +1823,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1826: checking for $ac_func" >&5 +echo "configure:1827: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1831 "configure" +#line 1832 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1850,7 +1851,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1877,7 +1878,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1881: checking stack direction for C alloca" >&5 +echo "configure:1882: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1885,7 +1886,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1889 "configure" +#line 1890 "configure" #include "confdefs.h" find_stack_direction () { @@ -1904,7 +1905,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1928,7 +1929,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1932: checking for $ac_word" >&5 +echo "configure:1933: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1961,7 +1962,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1965: checking for X" >&5 +echo "configure:1966: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2023,12 +2024,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 2027 "configure" +#line 2028 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2098,14 +2099,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 2102 "configure" +#line 2103 "configure" #include "confdefs.h" #include <${x_direct_test_include}> int main() { ${x_direct_test_function}(${x_direct_test_arguments}) ; return 0; } EOF -if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2524,7 +2525,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:2528: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:2529: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2543,7 +2544,7 @@ fi echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:2547: checking for loader (symbol LD)" >&5 +echo "configure:2548: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2557,7 +2558,7 @@ echo "$ac_t""$LD" 1>&6 echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:2561: checking for archiver (symbol AR)" >&5 +echo "configure:2562: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2571,7 +2572,7 @@ echo "$ac_t""$AR" 1>&6 echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 -echo "configure:2575: checking for archiver options (symbol ARFLAGS)" >&5 +echo "configure:2576: checking for archiver options (symbol ARFLAGS)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2641,7 +2642,7 @@ fi echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:2645: checking where the main texmf tree is located" >&5 +echo "configure:2646: checking where the main texmf tree is located" >&5 case $prefix in */) prefix=`echo "$prefix" | sed 's@/*$@@'`;; esac @@ -2775,12 +2776,12 @@ EOF # -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too? # See ac_path_xtra. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2779: checking for connect" >&5 +echo "configure:2780: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2784 "configure" +#line 2785 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -2803,7 +2804,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2824,7 +2825,7 @@ fi if test x$ac_cv_func_connect = xno; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2828: checking for connect in -lsocket" >&5 +echo "configure:2829: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2832,7 +2833,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2836 "configure" +#line 2837 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2843,7 +2844,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3417,6 +3418,7 @@ LIBXPDFDIR=libs/xpdf FREETYPEDIR=libs/freetype FREETYPE2DIR=libs/freetype2 ICUDIR=libs/icu-xetex +GRAPHITEDIR=libs/graphite-engine TECKITDIR=libs/teckit GDDIR=libs/gd LIBOBSDCOMPATDIR=libs/obsdcompat @@ -3505,6 +3507,12 @@ test "$with_xetex" != no && : ${needs_icu=yes} : ${needs_icu=no} export needs_icu +# we need graphite for xetex +test ! -d $srcdir/$GRAPHITEDIR && : ${needs_graphite=no} +test "$with_xetex" != no && : ${needs_graphite=yes} +: ${needs_graphite=no} +export needs_graphite + # we need teckit for xetex test ! -d $srcdir/$TECKITDIR && : ${needs_teckit=no} test "$with_xetex" != no && : ${needs_teckit=yes} @@ -3537,7 +3545,7 @@ else if test "$with_system_pnglib" = yes; then echo $ac_n "checking for png_set_read_fn in -lpng""... $ac_c" 1>&6 -echo "configure:3541: checking for png_set_read_fn in -lpng" >&5 +echo "configure:3549: checking for png_set_read_fn in -lpng" >&5 ac_lib_var=`echo png'_'png_set_read_fn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3545,7 +3553,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3549 "configure" +#line 3557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3556,7 +3564,7 @@ int main() { png_set_read_fn() ; return 0; } EOF -if { (eval echo configure:3560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3627,7 +3635,7 @@ else if test "$with_system_zlib" = yes; then echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:3631: checking for inflate in -lz" >&5 +echo "configure:3639: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3635,7 +3643,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 3639 "configure" +#line 3647 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3646,7 +3654,7 @@ int main() { inflate() ; return 0; } EOF -if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3682,17 +3690,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3686: checking for $ac_hdr" >&5 +echo "configure:3694: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3691 "configure" +#line 3699 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3778,7 +3786,7 @@ else CURSESCPPFLAGS= if test "$try_ncurses" = yes; then echo $ac_n "checking for wresize in -lncurses""... $ac_c" 1>&6 -echo "configure:3782: checking for wresize in -lncurses" >&5 +echo "configure:3790: checking for wresize in -lncurses" >&5 ac_lib_var=`echo ncurses'_'wresize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3786,7 +3794,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3790 "configure" +#line 3798 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3797,7 +3805,7 @@ int main() { wresize() ; return 0; } EOF -if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3828,17 +3836,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3832: checking for $ac_hdr" >&5 +echo "configure:3840: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3837 "configure" +#line 3845 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3879,17 +3887,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3883: checking for $ac_hdr" >&5 +echo "configure:3891: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3888 "configure" +#line 3896 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3937,17 +3945,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3941: checking for $ac_hdr" >&5 +echo "configure:3949: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3946 "configure" +#line 3954 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4056,7 +4064,7 @@ else if test "$with_system_t1lib" = yes; then echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6 -echo "configure:4060: checking for T1_AddFont in -lt1" >&5 +echo "configure:4068: checking for T1_AddFont in -lt1" >&5 ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4064,7 +4072,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 4068 "configure" +#line 4076 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4075,7 +4083,7 @@ int main() { T1_AddFont() ; return 0; } EOF -if { (eval echo configure:4079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4102,13 +4110,13 @@ fi LIBS="-lt1 -lm $LIBS" if test "$with_system_t1lib" = yes; then echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 -echo "configure:4106: checking whether installed T1 lib is >= v 5.0.0 " >&5 +echo "configure:4114: checking whether installed T1 lib is >= v 5.0.0 " >&5 if test "$cross_compiling" = yes; then ac_compile_t1lib=1 ] else cat > conftest.$ac_ext <<EOF -#line 4112 "configure" +#line 4120 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4140,7 +4148,7 @@ int main() { } EOF -if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_compile_t1lib=0 else @@ -4208,7 +4216,7 @@ else if test "$with_system_gd" = yes; then echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:4212: checking for gdImageCreateFromPng in -lgd" >&5 +echo "configure:4220: checking for gdImageCreateFromPng in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4216,7 +4224,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 4220 "configure" +#line 4228 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4227,7 +4235,7 @@ int main() { gdImageCreateFromPng() ; return 0; } EOF -if { (eval echo configure:4231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4260,7 +4268,7 @@ fi if test "$with_system_gd" = yes; then echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 -echo "configure:4264: checking for gdImageGif in -lgd" >&5 +echo "configure:4272: checking for gdImageGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4268,7 +4276,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 4272 "configure" +#line 4280 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4279,7 +4287,7 @@ int main() { gdImageGif() ; return 0; } EOF -if { (eval echo configure:4283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4315,17 +4323,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4319: checking for $ac_hdr" >&5 +echo "configure:4327: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4324 "configure" +#line 4332 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4404,7 +4412,7 @@ else if test "$with_system_freetype" = yes; then echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:4408: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:4416: checking for TT_Init_FreeType in -lttf" >&5 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4412,7 +4420,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lttf $LIBS" cat > conftest.$ac_ext <<EOF -#line 4416 "configure" +#line 4424 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4423,7 +4431,7 @@ int main() { TT_Init_FreeType() ; return 0; } EOF -if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4459,17 +4467,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4463: checking for $ac_hdr" >&5 +echo "configure:4471: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4468 "configure" +#line 4476 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4548,7 +4556,7 @@ else if test "$with_system_freetype2" = yes; then echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6 -echo "configure:4552: checking for FT_Init_FreeType in -lfreetype" >&5 +echo "configure:4560: checking for FT_Init_FreeType in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4556,7 +4564,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <<EOF -#line 4560 "configure" +#line 4568 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4567,7 +4575,7 @@ int main() { FT_Init_FreeType() ; return 0; } EOF -if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4603,17 +4611,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4607: checking for $ac_hdr" >&5 +echo "configure:4615: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4612 "configure" +#line 4620 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4692,7 +4700,7 @@ else if test "$with_system_icu" = yes; then echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6 -echo "configure:4696: checking for ubidi_open in -licuuc" >&5 +echo "configure:4704: checking for ubidi_open in -licuuc" >&5 ac_lib_var=`echo icuuc'_'ubidi_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4700,7 +4708,7 @@ else ac_save_LIBS="$LIBS" LIBS="-licuuc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4704 "configure" +#line 4712 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4711,7 +4719,7 @@ int main() { ubidi_open() ; return 0; } EOF -if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4747,17 +4755,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4751: checking for $ac_hdr" >&5 +echo "configure:4759: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4756 "configure" +#line 4764 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4810,6 +4818,20 @@ fi +if test "$needs_graphite" = no; then + GRAPHITECPPFLAGS= + LDGRAPHITE= + GRAPHITEDEP= +else + GRAPHITECPPFLAGS='-I$(GRAPHITESRCDIR)/include' + LDGRAPHITE='$(GRAPHITEDIR)/src/.libs/libgraphite.a' + GRAPHITEDEP='$(GRAPHITEDIR)/src/.libs/libgraphite.a' +fi + + + + + if test "$needs_teckit" = no; then TECKITCPPFLAGS= LDTECKIT= @@ -4839,7 +4861,7 @@ fi -LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $TECKITDEP $LIBOBSDDEP" +LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $GRAPHITEDEP $TECKITDEP $LIBOBSDDEP" LIBSDIRS= test "$needs_teckit" = yes \ @@ -4862,6 +4884,8 @@ test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \ && LIBSDIRS="$FREETYPE2DIR $LIBSDIRS" test "$needs_icu" = yes && test "$using_system_icu" != yes \ && LIBSDIRS="$ICUDIR $LIBSDIRS" +test "$needs_graphite" = yes \ + && LIBSDIRS="$GRAPHITEDIR $LIBSDIRS" test "$needs_obsdcompat" = yes \ && LIBSDIRS="$LIBOBSDCOMPATDIR $LIBSDIRS" @@ -5101,6 +5125,9 @@ s%@FREETYPE2DEP@%$FREETYPE2DEP%g s%@ICUCPPFLAGS@%$ICUCPPFLAGS%g s%@LDICU@%$LDICU%g s%@ICUDEP@%$ICUDEP%g +s%@GRAPHITECPPFLAGS@%$GRAPHITECPPFLAGS%g +s%@LDGRAPHITE@%$LDGRAPHITE%g +s%@GRAPHITEDEP@%$GRAPHITEDEP%g s%@TECKITCPPFLAGS@%$TECKITCPPFLAGS%g s%@LDTECKIT@%$LDTECKIT%g s%@TECKITDEP@%$TECKITDEP%g diff --git a/Build/source/configure.in b/Build/source/configure.in index 959608b50be..08876602e93 100644 --- a/Build/source/configure.in +++ b/Build/source/configure.in @@ -64,6 +64,7 @@ case "$target" in *-darwin*) : ${INSTALL='/usr/bin/install -c -p'}; export INSTALL : ${NCURSES_CPP_FIX=true}; export NCURSES_CPP_FIX + AC_MSG_RESULT([no, but using other fixes for Darwin]) ;; *) AC_MSG_RESULT(no) @@ -113,6 +114,7 @@ LIBXPDFDIR=libs/xpdf FREETYPEDIR=libs/freetype FREETYPE2DIR=libs/freetype2 ICUDIR=libs/icu-xetex +GRAPHITEDIR=libs/graphite-engine TECKITDIR=libs/teckit GDDIR=libs/gd LIBOBSDCOMPATDIR=libs/obsdcompat @@ -201,6 +203,12 @@ test "$with_xetex" != no && : ${needs_icu=yes} : ${needs_icu=no} export needs_icu +# we need graphite for xetex +test ! -d $srcdir/$GRAPHITEDIR && : ${needs_graphite=no} +test "$with_xetex" != no && : ${needs_graphite=yes} +: ${needs_graphite=no} +export needs_graphite + # we need teckit for xetex test ! -d $srcdir/$TECKITDIR && : ${needs_teckit=no} test "$with_xetex" != no && : ${needs_teckit=yes} @@ -217,10 +225,11 @@ sinclude(libs/gd/gd.ac) sinclude(libs/freetype/freetype.ac) sinclude(libs/freetype2/freetype2.ac) sinclude(libs/icu-xetex/icu-xetex.ac) +sinclude(libs/graphite-engine/graphite-engine.ac) sinclude(libs/teckit/teckit.ac) sinclude(libs/obsdcompat/libobsd-compat.ac) -LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $TECKITDEP $LIBOBSDDEP" +LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $GRAPHITEDEP $TECKITDEP $LIBOBSDDEP" LIBSDIRS= test "$needs_teckit" = yes \ @@ -243,6 +252,8 @@ test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \ && LIBSDIRS="$FREETYPE2DIR $LIBSDIRS" test "$needs_icu" = yes && test "$using_system_icu" != yes \ && LIBSDIRS="$ICUDIR $LIBSDIRS" +test "$needs_graphite" = yes \ + && LIBSDIRS="$GRAPHITEDIR $LIBSDIRS" test "$needs_obsdcompat" = yes \ && LIBSDIRS="$LIBOBSDCOMPATDIR $LIBSDIRS" diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 71520737351..3c9b48a0df7 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -3115,6 +3115,22 @@ fi +# we don't currently support use of an installed graphite lib + +if test "$needs_graphite" = no; then + GRAPHITECPPFLAGS= + LDGRAPHITE= + GRAPHITEDEP= +else + GRAPHITECPPFLAGS='-I$(GRAPHITESRCDIR)/include' + LDGRAPHITE='$(GRAPHITEDIR)/src/.libs/libgraphite.a' + GRAPHITEDEP='$(GRAPHITEDIR)/src/.libs/libgraphite.a' +fi + + + + + # The following line helps, e.g. for ncurses which properly detects the # system's terminfo definitions if configured without explicit --prefix. @@ -3149,6 +3165,10 @@ 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" @@ -3361,6 +3381,9 @@ s%@ICUDEP@%$ICUDEP%g s%@TECKITCPPFLAGS@%$TECKITCPPFLAGS%g s%@LDTECKIT@%$LDTECKIT%g s%@TECKITDEP@%$TECKITDEP%g +s%@GRAPHITECPPFLAGS@%$GRAPHITECPPFLAGS%g +s%@LDGRAPHITE@%$LDGRAPHITE%g +s%@GRAPHITEDEP@%$GRAPHITEDEP%g s%@subdirs@%$subdirs%g CEOF diff --git a/Build/source/libs/configure.in b/Build/source/libs/configure.in index 63fdaccd7d2..91b571e4bd5 100644 --- a/Build/source/libs/configure.in +++ b/Build/source/libs/configure.in @@ -29,6 +29,8 @@ sinclude(freetype2/freetype2.ac) sinclude(icu-xetex/withenable.ac) sinclude(icu-xetex/icu-xetex.ac) sinclude(teckit/teckit.ac) +sinclude(graphite-engine/withenable.ac) +sinclude(graphite-engine/graphite-engine.ac) # The following line helps, e.g. for ncurses which properly detects the # system's terminfo definitions if configured without explicit --prefix. @@ -56,6 +58,9 @@ if test "x$needs_icu" != xno && test "$using_system_icu" != yes; then ac_configure_args="$ac_configure_args --enable-static" AC_CONFIG_SUBDIRS([icu-xetex]) fi +if test "x$needs_graphite_engine" != xno; then + AC_CONFIG_SUBDIRS([graphite-engine]) +fi if test "x$needs_pnglib" != xno && test "$using_system_pnglib" != yes; then KPSE_CONFIG_FILES([libpng/Makefile]) fi diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index dacb01d1826..9ef8089e58a 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -3144,6 +3144,22 @@ fi +# we don't currently support use of an installed graphite lib + +if test "$needs_graphite" = no; then + GRAPHITECPPFLAGS= + LDGRAPHITE= + GRAPHITEDEP= +else + GRAPHITECPPFLAGS='-I$(GRAPHITESRCDIR)/include' + LDGRAPHITE='$(GRAPHITEDIR)/src/.libs/libgraphite.a' + GRAPHITEDEP='$(GRAPHITEDIR)/src/.libs/libgraphite.a' +fi + + + + + # Whether to build mf-nowin. : ${with_mf_nowin=no} # Default. @@ -3234,7 +3250,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3238: checking for $ac_word" >&5 +echo "configure:3254: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3267,7 +3283,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:3271: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:3287: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -3278,12 +3294,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 3282 "configure" +#line 3298 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -3309,12 +3325,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:3313: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:3329: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:3318: checking whether we are using GNU C++" >&5 +echo "configure:3334: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3323,7 +3339,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -3342,7 +3358,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:3346: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:3362: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3379,7 +3395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3383: checking for $ac_word" >&5 +echo "configure:3399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3412,7 +3428,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:3416: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:3432: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -3423,12 +3439,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 3427 "configure" +#line 3443 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:3432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -3454,12 +3470,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:3458: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:3474: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:3463: checking whether we are using GNU C++" >&5 +echo "configure:3479: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3468,7 +3484,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -3487,7 +3503,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:3491: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:3507: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3548,7 +3564,7 @@ if test "x$with_cxx_runtime_hack" = xyes && test "x$with_xetex" = xyes; } then echo $ac_n "checking for statically linking C++ runtime library""... $ac_c" 1>&6 -echo "configure:3552: checking for statically linking C++ runtime library" >&5 +echo "configure:3568: checking for statically linking C++ runtime library" >&5 cpp_link_hack=false old_flags=$flags @@ -3727,7 +3743,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:3731: checking host system type" >&5 +echo "configure:3747: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -3772,9 +3788,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" echo $ac_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS""... $ac_c" 1>&6 -echo "configure:3776: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +echo "configure:3792: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 cat > conftest.$ac_ext <<EOF -#line 3778 "configure" +#line 3794 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3785,7 +3801,7 @@ int main() { pthread_join() ; return 0; } EOF -if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* acx_pthread_ok=yes else @@ -3855,12 +3871,12 @@ for flag in $acx_pthread_flags; do case $flag in none) echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6 -echo "configure:3859: checking whether pthreads work without any flags" >&5 +echo "configure:3875: checking whether pthreads work without any flags" >&5 ;; -*) echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6 -echo "configure:3864: checking whether pthreads work with $flag" >&5 +echo "configure:3880: checking whether pthreads work with $flag" >&5 PTHREAD_CFLAGS="$flag" ;; @@ -3868,7 +3884,7 @@ echo "configure:3864: checking whether pthreads work with $flag" >&5 # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3872: checking for $ac_word" >&5 +echo "configure:3888: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_acx_pthread_config'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3903,7 +3919,7 @@ fi *) echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6 -echo "configure:3907: checking for the pthreads library -l$flag" >&5 +echo "configure:3923: checking for the pthreads library -l$flag" >&5 PTHREAD_LIBS="-l$flag" ;; esac @@ -3923,7 +3939,7 @@ echo "configure:3907: checking for the pthreads library -l$flag" >&5 # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. cat > conftest.$ac_ext <<EOF -#line 3927 "configure" +#line 3943 "configure" #include "confdefs.h" #include <pthread.h> int main() { @@ -3932,7 +3948,7 @@ pthread_t th; pthread_join(th, 0); pthread_create(0,0,0,0); pthread_cleanup_pop(0); ; return 0; } EOF -if { (eval echo configure:3936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* acx_pthread_ok=yes else @@ -3963,18 +3979,18 @@ if test "x$acx_pthread_ok" = xyes; then # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. echo $ac_n "checking for joinable pthread attribute""... $ac_c" 1>&6 -echo "configure:3967: checking for joinable pthread attribute" >&5 +echo "configure:3983: checking for joinable pthread attribute" >&5 attr_name=unknown for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do cat > conftest.$ac_ext <<EOF -#line 3971 "configure" +#line 3987 "configure" #include "confdefs.h" #include <pthread.h> int main() { int attr=$attr; return attr; ; return 0; } EOF -if { (eval echo configure:3978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* attr_name=$attr; break else @@ -3992,7 +4008,7 @@ EOF fi echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6 -echo "configure:3996: checking if more special flags are required for pthreads" >&5 +echo "configure:4012: checking if more special flags are required for pthreads" >&5 flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; @@ -4013,7 +4029,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4017: checking for $ac_word" >&5 +echo "configure:4033: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PTHREAD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4090,9 +4106,9 @@ if test "x$with_xetex" = xyes; then # Check for Carbon framework on Mac OS X # echo $ac_n "checking for Apple Carbon framework""... $ac_c" 1>&6 -echo "configure:4094: checking for Apple Carbon framework" >&5 +echo "configure:4110: checking for Apple Carbon framework" >&5 cat > conftest.$ac_ext <<EOF -#line 4096 "configure" +#line 4112 "configure" #include "confdefs.h" #include <Carbon/Carbon.h> @@ -4103,7 +4119,7 @@ ATSUStyle style; ; return 0; } EOF -if { (eval echo configure:4107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -4153,9 +4169,9 @@ fi fi echo $ac_n "checking for fontconfig header files""... $ac_c" 1>&6 -echo "configure:4157: checking for fontconfig header files" >&5 +echo "configure:4173: checking for fontconfig header files" >&5 cat > conftest.$ac_ext <<EOF -#line 4159 "configure" +#line 4175 "configure" #include "confdefs.h" #include <fontconfig/fontconfig.h> @@ -4166,11 +4182,11 @@ FcObjectSet *os; ; return 0; } EOF -if { (eval echo configure:4170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 echo $ac_n "checking for FcInit in -lfontconfig""... $ac_c" 1>&6 -echo "configure:4174: checking for FcInit in -lfontconfig" >&5 +echo "configure:4190: checking for FcInit in -lfontconfig" >&5 ac_lib_var=`echo fontconfig'_'FcInit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4178,7 +4194,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfontconfig $LIBS" cat > conftest.$ac_ext <<EOF -#line 4182 "configure" +#line 4198 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4189,7 +4205,7 @@ int main() { FcInit() ; return 0; } EOF -if { (eval echo configure:4193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4271,7 +4287,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:4275: checking for X" >&5 +echo "configure:4291: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4333,12 +4349,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 4337 "configure" +#line 4353 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4408,14 +4424,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 4412 "configure" +#line 4428 "configure" #include "confdefs.h" #include <${x_direct_test_include}> int main() { ${x_direct_test_function}(${x_direct_test_arguments}) ; return 0; } EOF -if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4521,17 +4537,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4525: checking whether -R must be followed by a space" >&5 +echo "configure:4541: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 4528 "configure" +#line 4544 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4547,14 +4563,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 4551 "configure" +#line 4567 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4593,7 +4609,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4597: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4613: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4601,7 +4617,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 4605 "configure" +#line 4621 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4612,7 +4628,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4634,7 +4650,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4638: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4654: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4642,7 +4658,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 4646 "configure" +#line 4662 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4653,7 +4669,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4682,12 +4698,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4686: checking for gethostbyname" >&5 +echo "configure:4702: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4691 "configure" +#line 4707 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -4710,7 +4726,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4731,7 +4747,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4735: checking for gethostbyname in -lnsl" >&5 +echo "configure:4751: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4739,7 +4755,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4743 "configure" +#line 4759 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4750,7 +4766,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4780,12 +4796,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4784: checking for connect" >&5 +echo "configure:4800: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4789 "configure" +#line 4805 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -4808,7 +4824,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:4812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4829,7 +4845,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4833: checking for connect in -lsocket" >&5 +echo "configure:4849: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4837,7 +4853,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4841 "configure" +#line 4857 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4848,7 +4864,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4872,12 +4888,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4876: checking for remove" >&5 +echo "configure:4892: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4881 "configure" +#line 4897 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -4900,7 +4916,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:4904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4921,7 +4937,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4925: checking for remove in -lposix" >&5 +echo "configure:4941: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4929,7 +4945,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 4933 "configure" +#line 4949 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4940,7 +4956,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:4944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4964,12 +4980,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4968: checking for shmat" >&5 +echo "configure:4984: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4973 "configure" +#line 4989 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -4992,7 +5008,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5013,7 +5029,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5017: checking for shmat in -lipc" >&5 +echo "configure:5033: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5021,7 +5037,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 5025 "configure" +#line 5041 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5032,7 +5048,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:5036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5065,7 +5081,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:5069: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5085: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5073,7 +5089,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5077 "configure" +#line 5093 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5084,7 +5100,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:5088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5117,7 +5133,7 @@ if test "x$with_x" = xyes; then fi if test -z "$x_ext_lib"; then # allow envvar override echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:5121: checking for XextCreateExtension in -lXext" >&5 +echo "configure:5137: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5125,7 +5141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $wlibs $X_EXTRA_LIBS $XLFLAG $LIBS" cat > conftest.$ac_ext <<EOF -#line 5129 "configure" +#line 5145 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5136,7 +5152,7 @@ int main() { XextCreateExtension() ; return 0; } EOF -if { (eval echo configure:5140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5201,7 +5217,7 @@ test -d tests || mkdir tests # Is libm present. FIXME: do we need it at all? echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:5205: checking for main in -lm" >&5 +echo "configure:5221: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5209,14 +5225,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 5213 "configure" +#line 5229 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5321,7 +5337,7 @@ if test "$cross_compiling" = yes; then # Extract the first word of "tangle", so it can be a program name with args. set dummy tangle; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5325: checking for $ac_word" >&5 +echo "configure:5341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TANGLEBOOT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5365,7 +5381,7 @@ if test "$cross_compiling" = yes; then # Extract the first word of "tangle", so it can be a program name with args. set dummy tangle; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5369: checking for $ac_word" >&5 +echo "configure:5385: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TANGLE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5409,7 +5425,7 @@ if test "$cross_compiling" = yes; then # Extract the first word of "ctangle", so it can be a program name with args. set dummy ctangle; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5413: checking for $ac_word" >&5 +echo "configure:5429: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CTANGLEBOOT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5453,7 +5469,7 @@ if test "$cross_compiling" = yes; then # Extract the first word of "ctangle", so it can be a program name with args. set dummy ctangle; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5457: checking for $ac_word" >&5 +echo "configure:5473: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CTANGLE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5497,7 +5513,7 @@ if test "$cross_compiling" = yes; then # Extract the first word of "tie", so it can be a program name with args. set dummy tie; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5501: checking for $ac_word" >&5 +echo "configure:5517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TIE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5542,7 +5558,7 @@ if test "$cross_compiling" = yes; then # Extract the first word of "otangle", so it can be a program name with args. set dummy otangle; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5546: checking for $ac_word" >&5 +echo "configure:5562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OTANGLE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5763,6 +5779,9 @@ s%@TECKITDEP@%$TECKITDEP%g s%@ICUCPPFLAGS@%$ICUCPPFLAGS%g s%@LDICU@%$LDICU%g s%@ICUDEP@%$ICUDEP%g +s%@GRAPHITECPPFLAGS@%$GRAPHITECPPFLAGS%g +s%@LDGRAPHITE@%$LDGRAPHITE%g +s%@GRAPHITEDEP@%$GRAPHITEDEP%g s%@MFN@%$MFN%g s%@OMEGA@%$OMEGA%g s%@ALEPH@%$ALEPH%g diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in index b8e2dd061f0..fe0f5aad783 100644 --- a/Build/source/texk/web2c/configure.in +++ b/Build/source/texk/web2c/configure.in @@ -102,6 +102,8 @@ sinclude(../../libs/teckit/withenable.ac) sinclude(../../libs/teckit/teckit.ac) sinclude(../../libs/icu-xetex/withenable.ac) sinclude(../../libs/icu-xetex/icu-xetex.ac) +sinclude(../../libs/graphite-engine/withenable.ac) +sinclude(../../libs/graphite-engine/graphite-engine.ac) # Whether to build mf-nowin. : ${with_mf_nowin=no} # Default. |