diff options
29 files changed, 534 insertions, 826 deletions
diff --git a/Build/source/WARNING b/Build/source/WARNING index 68237e932ec..8b24239a4ae 100644 --- a/Build/source/WARNING +++ b/Build/source/WARNING @@ -1,16 +1,25 @@ CONSTRUCTION WORK ================= -The TeX Live build system is currently under reconstruction. +The TeX Live build system is currently under reconstruction. It is now +nearly complete, except for the directory + utils/xindy/ +and a few features not yet available. Moreover the directory + texk/xdvik/ +still needs some work, and building in that subdirectory may fail. -At the moment the `Build' script should succeed, but might as well fail. +My builds on i686-linux and i686-Darwin both went through without any +problems. -Please inform me of any failures! +Please try ./Build for your system and tell me about any failures. -The new build system is nearly complete, except for the directory +If building a particular subdirectory, e.g., texk/xdvik/ fails, try + TL_CONFIGURE_ARGS='--disable-xdvik' ./Build +(assuming a bourne compatible shell). - utils/xindy +If there are problems with the cxx-runtime-hack (gcc only), please try adding +'--disable-cxx-runtime-hack' to TL_CONFIGURE_ARGS. -and a few features not yet available. +Good luck! -Peter Breitenlohner 2009-04-21 10:00 UTC +Peter Breitenlohner <peb@mppmu.mpg.de> 2009-04-24 15:00 UTC diff --git a/Build/source/configure b/Build/source/configure index 418f9db811a..d8b0bd7985c 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -916,8 +916,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_all_pkgs -enable_cxx_runtime_hack +enable_native_texlive_build enable_multiplatform +enable_cxx_runtime_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1688,9 +1689,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-all-pkgs do not build packages unless explicitly enabled - --enable-cxx-runtime-hack link C++ runtime statically + --disable-native-texlive-build + do not build for the TeX Live binary distribution --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM + --enable-cxx-runtime-hack link C++ runtime statically --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2428,11 +2431,36 @@ if test "${enable_all_pkgs+set}" = set; then enableval=$enable_all_pkgs; fi test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes -# Check whether --enable-cxx-runtime-hack was given. -if test "${enable_cxx_runtime_hack+set}" = set; then - enableval=$enable_cxx_runtime_hack; +# Check whether --enable-native-texlive-build was given. +if test "${enable_native_texlive_build+set}" = set; then + enableval=$enable_native_texlive_build; fi +case $enable_native_texlive_build in + yes | no) : ;; + *) enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;; +esac + +if test "x$enable_native_texlive_build" = xyes; then + case $enable_multiplatform in + yes | no) : ;; + *) enable_multiplatform=yes + ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;; +esac + case $enable_cxx_runtime_hack in + yes | no) : ;; + *) enable_cxx_runtime_hack=yes + ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; +esac + + case $enable_shared in + yes | no) : ;; + *) enable_shared=no + ac_configure_args="$ac_configure_args '--disable-shared'" ;; +esac + +fi # Check whether --enable-multiplatform was given. if test "${enable_multiplatform+set}" = set; then enableval=$enable_multiplatform; @@ -2448,6 +2476,11 @@ if test "x$enable_multiplatform" = xyes; then fi fi +# Check whether --enable-cxx-runtime-hack was given. +if test "${enable_cxx_runtime_hack+set}" = set; then + enableval=$enable_cxx_runtime_hack; +fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level @@ -5898,13 +5931,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:5901: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5934: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5904: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5937: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5907: output\"" >&5) + (eval echo "\"\$as_me:5940: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7110,7 +7143,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7113 "configure"' > conftest.$ac_ext + echo '#line 7146 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9157,11 +9190,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:9160: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9193: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9164: \$? = $ac_status" >&5 + echo "$as_me:9197: \$? = $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. @@ -9496,11 +9529,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:9499: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9532: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9503: \$? = $ac_status" >&5 + echo "$as_me:9536: \$? = $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. @@ -9601,11 +9634,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:9604: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9637: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9608: \$? = $ac_status" >&5 + echo "$as_me:9641: \$? = $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 @@ -9656,11 +9689,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:9659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9692: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9663: \$? = $ac_status" >&5 + echo "$as_me:9696: \$? = $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 @@ -12456,7 +12489,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12459 "configure" +#line 12492 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12552,7 +12585,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12555 "configure" +#line 12588 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18948,11 +18981,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:18951: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18984: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18955: \$? = $ac_status" >&5 + echo "$as_me:18988: \$? = $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. @@ -19047,11 +19080,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:19050: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19083: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19054: \$? = $ac_status" >&5 + echo "$as_me:19087: \$? = $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 @@ -19099,11 +19132,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:19102: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19135: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19106: \$? = $ac_status" >&5 + echo "$as_me:19139: \$? = $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 diff --git a/Build/source/libs/configure b/Build/source/libs/configure index f1b2ab33847..bf70dce517b 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -682,8 +682,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_all_pkgs -enable_cxx_runtime_hack +enable_native_texlive_build enable_multiplatform +enable_cxx_runtime_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1441,9 +1442,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-all-pkgs do not build packages unless explicitly enabled - --enable-cxx-runtime-hack link C++ runtime statically + --disable-native-texlive-build + do not build for the TeX Live binary distribution --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM + --enable-cxx-runtime-hack link C++ runtime statically --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2152,11 +2155,36 @@ if test "${enable_all_pkgs+set}" = set; then enableval=$enable_all_pkgs; fi test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes -# Check whether --enable-cxx-runtime-hack was given. -if test "${enable_cxx_runtime_hack+set}" = set; then - enableval=$enable_cxx_runtime_hack; -fi +# Check whether --enable-native-texlive-build was given. +if test "${enable_native_texlive_build+set}" = set; then + enableval=$enable_native_texlive_build; +fi +case $enable_native_texlive_build in + yes | no) : ;; + *) enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;; +esac + +if test "x$enable_native_texlive_build" = xyes; then + case $enable_multiplatform in + yes | no) : ;; + *) enable_multiplatform=yes + ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;; +esac + case $enable_cxx_runtime_hack in + yes | no) : ;; + *) enable_cxx_runtime_hack=yes + ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; +esac + + case $enable_shared in + yes | no) : ;; + *) enable_shared=no + ac_configure_args="$ac_configure_args '--disable-shared'" ;; +esac + +fi # Check whether --enable-multiplatform was given. if test "${enable_multiplatform+set}" = set; then enableval=$enable_multiplatform; @@ -2172,6 +2200,11 @@ if test "x$enable_multiplatform" = xyes; then fi fi +# Check whether --enable-cxx-runtime-hack was given. +if test "${enable_cxx_runtime_hack+set}" = set; then + enableval=$enable_cxx_runtime_hack; +fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4 index 5a093fc2ec5..53163208aab 100644 --- a/Build/source/m4/kpse-cxx-hack.m4 +++ b/Build/source/m4/kpse-cxx-hack.m4 @@ -41,7 +41,7 @@ if test "x$kpse_cv_cxx_hack" = xok; then set -- $CXX \"\$[]@\" $CXX_HACK_LIBS echo \"\$[]0:\" \"\$[]@\" exec \"\$[]@\"" - AC_CONFIG_FILES([CXXLD.sh:Makefile.in], + AC_CONFIG_FILES([CXXLD.sh:README], [echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh], [cxxld_sh='$cxxld_sh']) else diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index a135351f0bb..ba91141435b 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -23,8 +23,29 @@ AC_ARG_ENABLE([all-pkgs], AS_HELP_STRING([--disable-all-pkgs], [do not build packages unless explicitly enabled]))[]dnl test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes -KPSE_ENABLE_CXX_HACK +AC_ARG_ENABLE([native-texlive-build], + AS_HELP_STRING([--disable-native-texlive-build], + [do not build for the TeX Live binary distribution]))[]dnl +AS_CASE([$enable_native_texlive_build], + [yes | no], [:], + [enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'"]) +if test "x$enable_native_texlive_build" = xyes; then + AS_CASE([$enable_multiplatform], + [yes | no], [:], + [enable_multiplatform=yes + ac_configure_args="$ac_configure_args '--enable-multiplatform'"]) + AS_CASE([$enable_cxx_runtime_hack], + [yes | no], [:], + [enable_cxx_runtime_hack=yes + ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'"]) + AS_CASE([$enable_shared], + [yes | no], [:], + [enable_shared=no + ac_configure_args="$ac_configure_args '--disable-shared'"]) +fi KPSE_OPTIONS +KPSE_ENABLE_CXX_HACK KPSE_LIBS_PREPARE KPSE_WEB2C_PREPARE m4_sinclude(kpse_TL[ac/withenable.ac]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index f00c9d22282..0e95e1f2fd8 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -682,8 +682,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_all_pkgs -enable_cxx_runtime_hack +enable_native_texlive_build enable_multiplatform +enable_cxx_runtime_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1460,9 +1461,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-all-pkgs do not build packages unless explicitly enabled - --enable-cxx-runtime-hack link C++ runtime statically + --disable-native-texlive-build + do not build for the TeX Live binary distribution --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM + --enable-cxx-runtime-hack link C++ runtime statically --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2171,11 +2174,36 @@ if test "${enable_all_pkgs+set}" = set; then enableval=$enable_all_pkgs; fi test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes -# Check whether --enable-cxx-runtime-hack was given. -if test "${enable_cxx_runtime_hack+set}" = set; then - enableval=$enable_cxx_runtime_hack; -fi +# Check whether --enable-native-texlive-build was given. +if test "${enable_native_texlive_build+set}" = set; then + enableval=$enable_native_texlive_build; +fi +case $enable_native_texlive_build in + yes | no) : ;; + *) enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;; +esac + +if test "x$enable_native_texlive_build" = xyes; then + case $enable_multiplatform in + yes | no) : ;; + *) enable_multiplatform=yes + ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;; +esac + case $enable_cxx_runtime_hack in + yes | no) : ;; + *) enable_cxx_runtime_hack=yes + ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; +esac + + case $enable_shared in + yes | no) : ;; + *) enable_shared=no + ac_configure_args="$ac_configure_args '--disable-shared'" ;; +esac + +fi # Check whether --enable-multiplatform was given. if test "${enable_multiplatform+set}" = set; then enableval=$enable_multiplatform; @@ -2191,6 +2219,11 @@ if test "x$enable_multiplatform" = xyes; then fi fi +# Check whether --enable-cxx-runtime-hack was given. +if test "${enable_cxx_runtime_hack+set}" = set; then + enableval=$enable_cxx_runtime_hack; +fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 0dc0392fe90..ea8b86f8fba 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -152,10 +152,6 @@ EXTRA_DIST += \ ## EXTRA_DIST += m4/gs-device.m4 -## Eventually delete this file (temporary fix to build without FT2) -## -EXTRA_DIST += fontmap.c.temp - ## Eventually delete these files ## EXTRA_DIST += Makefile.in.orig acinclude.m4.orig configure.ac.orig diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 842a1cf6d1d..9139836c718 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -330,10 +330,9 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.TL INSTALL README RELEASE \ ft.c-$(DVIPNG_VERSION) misc.c-$(DVIPNG_VERSION) \ pk.c-$(DVIPNG_VERSION) set.c-$(DVIPNG_VERSION) \ special.c-$(DVIPNG_VERSION) t1.c-$(DVIPNG_VERSION) \ - tfm.c-$(DVIPNG_VERSION) m4/gs-device.m4 fontmap.c.temp \ - Makefile.in.orig acinclude.m4.orig configure.ac.orig \ - Makefile.am.demo Makefile.in.work configure.ac.demo \ - configure.ac.work + tfm.c-$(DVIPNG_VERSION) m4/gs-device.m4 Makefile.in.orig \ + acinclude.m4.orig configure.ac.orig Makefile.am.demo \ + Makefile.in.work configure.ac.demo configure.ac.work dist_noinst_SCRIPTS = texi2pod.pl all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/dvipng/fontmap.c.temp b/Build/source/texk/dvipng/fontmap.c.temp deleted file mode 100644 index e06275f88d6..00000000000 --- a/Build/source/texk/dvipng/fontmap.c.temp +++ /dev/null @@ -1,340 +0,0 @@ -/* fontmap.c */ - -/************************************************************************ - - Part of the dvipng distribution - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/>. - - Copyright (C) 2002-2008 Jan-Åke Larsson - -************************************************************************/ - -#include "dvipng.h" - -static struct filemmap psfont_mmap; -#ifdef HAVE_FT2 -static struct filemmap ttfont_mmap; -#endif -static struct psfontmap *psfontmap=NULL; - -char* newword(char** buffer, char* end) -{ - char *word,*pos=*buffer; - - while(pos<end && *pos!=' ' && *pos!='\t' && *pos!='"') pos++; - if ((word=malloc(pos-*buffer+1))==NULL) - Fatal("cannot malloc space for string"); - strncpy(word,*buffer,pos-*buffer); - word[pos-*buffer]='\0'; - *buffer=pos; - return(word); -} - -char* copyword(char* orig) -{ - char *word; - - if (orig==NULL) - return(NULL); - if ((word=malloc(strlen(orig)+1))==NULL) - Fatal("cannot malloc space for string"); - strcpy(word,orig); - return(word); -} - -char* find_format(char* name) -{ - /* Cater for both new (first case) and old (second case) kpathsea */ - char* format = - kpse_find_file(name,kpse_fontmap_format,false); - - if (format==NULL) - format = kpse_find_file(name,kpse_dvips_config_format,false); - return(format); -} - -void InitPSFontMap(void) -{ - char* psfont_name=NULL; - /* Prefer ps2pk.map, fonts are present more often */ - psfont_name=find_format("ps2pk.map"); - if (psfont_name==NULL) - psfont_name=find_format("psfonts.map"); - if (psfont_name==NULL) { - Warning("cannot find ps2pk.map, nor psfonts.map"); - } else { - DEBUG_PRINT((DEBUG_FT|DEBUG_T1), - ("\n OPEN PSFONT MAP:\t'%s'", psfont_name)); - if (MmapFile(psfont_name,&psfont_mmap)) { - Warning("psfonts map %s could not be opened", psfont_name); - } - free(psfont_name); - } -#ifdef HAVE_FT2 - psfont_name=find_format("ttfonts.map"); - if (psfont_name!=NULL) { - DEBUG_PRINT(DEBUG_FT,("\n OPEN TTFONT MAP:\t'%s'", psfont_name)); - if (MmapFile(psfont_name,&ttfont_mmap)) { - Warning("ttfonts map %s could not be opened", psfont_name); - } - free(psfont_name); - } -#endif -} - -struct psfontmap *NewPSFont(struct psfontmap* copyfrom) -{ - struct psfontmap *newentry=NULL; - if ((newentry=malloc(sizeof(struct psfontmap)))==NULL) - Fatal("cannot malloc psfontmap space"); - if (copyfrom!=NULL) { - newentry->line = copyfrom->line; - newentry->tfmname = copyword(copyfrom->tfmname); - newentry->psfile = copyword(copyfrom->psfile); - newentry->encname = copyword(copyfrom->encname); - newentry->encoding = copyfrom->encoding; -#ifdef HAVE_LIBT1 - newentry->t1_transformp = copyfrom->t1_transformp; -#endif -#ifdef HAVE_FT2 - newentry->ft_transformp = copyfrom->ft_transformp; - newentry->subfont = copyfrom->subfont; -#endif - newentry->end = copyfrom->end; - } else { - newentry->line = NULL; - newentry->tfmname = NULL; - newentry->psfile = NULL; - newentry->encname = NULL; - newentry->encoding = NULL; -#ifdef HAVE_LIBT1 - newentry->t1_transformp = NULL; -#endif -#ifdef HAVE_FT2 - newentry->ft_transformp = NULL; - newentry->subfont = NULL; -#endif - newentry->end = NULL; - } - newentry->next=psfontmap; - psfontmap=newentry; - return(newentry); -} - -struct psfontmap *SearchPSFontMap(char* fontname, - struct filemmap* search_mmap) -{ - static char *pos=NULL,*end=NULL; - static struct filemmap* searching_mmap=NULL; - struct psfontmap *entry=NULL; - - if (pos==end && search_mmap!=searching_mmap) { - searching_mmap=search_mmap; - pos=searching_mmap->data; - end=searching_mmap->data+searching_mmap->size; - } - while(pos<end && (entry==NULL || strcmp(entry->tfmname,fontname)!=0)) { - while(pos < end - && (*pos=='\n' || *pos==' ' || *pos=='\t' - || *pos=='%' || *pos=='*' || *pos==';' || *pos=='#')) { - while(pos < end && *pos!='\n') pos++; /* skip comments/empty rows */ - pos++; - } - if (pos < end) { - entry=NewPSFont(NULL); - entry->line = pos; - /* skip <something and quoted entries */ - while(pos < end && (*pos=='<' || *pos=='"')) { - if (*pos=='<') - while(pos < end && *pos!=' ' && *pos!='\t') pos++; - else - while(pos < end && *pos!='"') pos++; - while(pos < end && (*pos==' ' || *pos=='\t')) pos++; - } - /* first word is font name */ - entry->tfmname = newword(&pos,end); - while(pos < end && *pos!='\n') pos++; - entry->end = pos; - } - pos++; - } - if (entry!=NULL && strcmp(entry->tfmname,fontname)!=0) - entry=NULL; - return(entry); -} - -void ClearPSFontMap(void) -{ - struct psfontmap *entry; - - while(psfontmap!=NULL) { - entry=psfontmap; - psfontmap=psfontmap->next; - free(entry->tfmname); - if (entry->psfile!=NULL) - free(entry->psfile); - if (entry->encname!=NULL) - free(entry->encname); - free(entry); - } - UnMmapFile(&psfont_mmap); -#ifdef HAVE_FT2 - UnMmapFile(&ttfont_mmap); -#endif -} - -void ReadPSFontMap(struct psfontmap *entry) -{ - char *pos,*end,*psname; - int nameno = 0; - - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("\n PSFONTMAP: %s ",entry->tfmname)); - pos=entry->line; - end=entry->end; - while(pos < end) { - if (*pos=='<') { /* filename follows */ - pos++; - if (pos<end && *pos=='<') { /* <<download.font */ - pos++; - entry->psfile = newword((char**)&pos,end); - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("<%s ",entry->psfile)); - } else if (pos<end && *pos=='[') { /* <[encoding.file */ - pos++; - entry->encname = newword((char**)&pos,end); - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("<[%s ",entry->encname)); - } else { /* <some.file */ - char* word =newword((char**)&pos,end); - if (strncmp(word+strlen(word)-4,".enc",4)==0) {/* <some.enc */ - entry->encname=word; - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("<[%s ",entry->encname)); - } else { /* <font */ - entry->psfile=word; - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("<%s ",entry->psfile)); - } - } - } else if (*pos=='"') { /* PS code: reencoding/tranformation exists */ - char *word; - double cxx=1.0,cxy=0.0; - pos++; - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("\"")); - while(pos < end && *pos!='"') { - word=newword((char**)&pos,end); - while(pos < end && (*pos==' ' || *pos=='\t')) pos++; - if (pos+10<end && strncmp(pos,"ExtendFont",10)==0) { - cxx=strtod(word,NULL); - pos+=10; - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("%f ExtendFont ",cxx)); - } else if (pos+9<end && strncmp(pos,"SlantFont",9)==0) { - pos+=9; - cxy=strtod(word,NULL); - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("%f SlantFont ",cxy)); - } else if (pos+12<end && strncmp(pos,"ReEncodeFont",12)==0) { - pos+=12; - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("%s ReEncodeFont ",word)); - } else { - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("(?:%s) ",word)); - } - free(word); - } -#ifdef HAVE_FT2 - entry->ft_transformp=&(entry->ft_transform); - entry->ft_transform.xx=(FT_Fixed)(cxx*0x10000); - entry->ft_transform.xy=(FT_Fixed)(cxy*0x10000); - entry->ft_transform.yx=0; - entry->ft_transform.yy=0x10000; -#endif -#ifdef HAVE_LIBT1 - entry->t1_transformp=&(entry->t1_transform); - entry->t1_transform.cxx=cxx; - entry->t1_transform.cxy=cxy; - entry->t1_transform.cyx=0.0; - entry->t1_transform.cyy=1.0; -#endif - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("\" ")); - pos++; - } else { /* bare word */ - switch (++nameno) { - case 1: /* first word is tfmname and perhaps psname, NOT psfile */ - while(pos<end && *pos!=' ' && *pos!='\t') pos++; - psname=entry->tfmname; - break; - case 2: /* second word is psname, NOT psfile */ - psname = newword((char**)&pos,end); - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("(%s) ",psname)); - free(psname); - break; - case 3: /* third word is encoding */ - entry->encname = newword((char**)&pos,end); - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),("<[%s ",entry->encname)); - break; - default: - while(pos<end && *pos!=' ' && *pos!='\t') pos++; - Warning("more than three bare words in font map entry"); - } - } - while(pos < end && (*pos==' ' || *pos=='\t')) pos++; - } - if (entry->psfile==NULL) { - /* No psfile-name given, use tfmname */ - entry->psfile=copyword(entry->tfmname); - DEBUG_PRINT((DEBUG_FT|DEBUG_T1),(" <%s ",entry->psfile)); - } - if (entry->encname!=NULL - && (entry->encoding=FindEncoding(entry->encname))==NULL) - Warning("unable to load font encoding '%s' for %s", - entry->encname,entry->tfmname); -} - - -struct psfontmap* FindPSFontMap(char* fontname) -{ - struct psfontmap *entry; - static struct filemmap* search_mmap_p=&psfont_mmap; - - entry=psfontmap; - while(entry!=NULL && strcmp(entry->tfmname,fontname)!=0) - entry=entry->next; - if(entry==NULL) { - entry=SearchPSFontMap(fontname,search_mmap_p); -#ifdef HAVE_FT2 - if(entry==NULL && search_mmap_p!=&ttfont_mmap) { - search_mmap_p=&ttfont_mmap; - entry=SearchPSFontMap(fontname,search_mmap_p); - } -#endif - } - if(entry==NULL) { - struct psfontmap* entry_subfont=NULL; - entry=psfontmap; - while(entry!=NULL && strcmp(entry->tfmname,fontname)!=0) { - while(entry!=NULL && strchr(entry->tfmname,'@')==NULL) - entry=entry->next; - if (entry!=NULL) { - entry_subfont=FindSubFont(entry,fontname); - if (entry_subfont!=NULL) - entry=entry_subfont; - else - entry=entry->next; - } - } - } - if (entry!=NULL && entry->psfile==NULL) - ReadPSFontMap(entry); - if (entry!=NULL && entry->encname!=NULL && entry->encoding==NULL) - /* Encoding given but it cannot be found. Unusable font */ - return(NULL); - return(entry); -} diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index 1eb6e9291a5..d06999d4119 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -39,7 +39,7 @@ DIST_COMMON = README $(am__configure_deps) \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/Makefile.in $(srcdir)/README $(srcdir)/config.h.in \ $(top_srcdir)/configure ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ @@ -62,7 +62,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = CXXLD.sh SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -312,6 +312,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 351a7938fdf..b35e3d44bf3 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -17588,7 +17588,7 @@ if test "x$kpse_cv_cxx_hack" = xok; then set -- $CXX \"\$@\" $CXX_HACK_LIBS echo \"\$0:\" \"\$@\" exec \"\$@\"" - ac_config_files="$ac_config_files CXXLD.sh:Makefile.in" + ac_config_files="$ac_config_files CXXLD.sh:README" else CXXLD='$(CXX)' @@ -24033,7 +24033,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:Makefile.in" ;; + "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES liblcdf/Makefile" ;; "libefont/Makefile") CONFIG_FILES="$CONFIG_FILES libefont/Makefile" ;; diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 407782f8d36..b71663fcf50 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -67,7 +67,7 @@ install-links: for p in $(shell_scripts); do \ rm -f $$p; \ echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \ - $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \ + $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \ done uninstall-hook: diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index f56c6e38df7..4e868e06f51 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -746,7 +746,7 @@ install-links: for p in $(shell_scripts); do \ rm -f $$p; \ echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \ - $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \ + $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \ done uninstall-hook: diff --git a/Build/source/texk/texlive/c-auto.in b/Build/source/texk/texlive/c-auto.in deleted file mode 100644 index 31830b403a8..00000000000 --- a/Build/source/texk/texlive/c-auto.in +++ /dev/null @@ -1,179 +0,0 @@ -/* c-auto.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if the `closedir' function returns void instead of `int'. */ -#undef CLOSEDIR_VOID - -/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if - you have to add this by hand because configure failed to detect it. */ -#undef GETCWD_FORKS - -/* Define to 1 if you have the <assert.h> header file. */ -#undef HAVE_ASSERT_H - -/* Define to 1 if you have the `bcmp' function. */ -#undef HAVE_BCMP - -/* Define to 1 if you have the `bcopy' function. */ -#undef HAVE_BCOPY - -/* Define to 1 if you have the `bzero' function. */ -#undef HAVE_BZERO - -/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. - */ -#undef HAVE_DECL_STRSTR - -/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the <float.h> header file. */ -#undef HAVE_FLOAT_H - -/* Define to 1 if you have the `getcwd' function. */ -#undef HAVE_GETCWD - -/* Define to 1 if you have the `getwd' function. */ -#undef HAVE_GETWD - -/* Define to 1 if you have the `index' function. */ -#undef HAVE_INDEX - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM - -/* Define to 1 if you have the <limits.h> header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if you have the `memcmp' function. */ -#undef HAVE_MEMCMP - -/* Define to 1 if you have the `memcpy' function. */ -#undef HAVE_MEMCPY - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define to 1 if you are using GNU libc or otherwise have global variables - `program_invocation_name' and `program_invocation_short_name'. */ -#undef HAVE_PROGRAM_INVOCATION_NAME - -/* Define to 1 if your compiler understands prototypes. */ -#undef HAVE_PROTOTYPES - -/* Define to 1 if you have the `putenv' function. */ -#undef HAVE_PUTENV - -/* Define to 1 if you have the <pwd.h> header file. */ -#undef HAVE_PWD_H - -/* Define to 1 if you have the `rindex' function. */ -#undef HAVE_RINDEX - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if `st_mtim' is member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_MTIM - -/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - -/* Define to 1 if you have the <sys/param.h> header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you - don't. */ -#undef MAKE_OMEGA_OCP_BY_DEFAULT - -/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you - don't. */ -#undef MAKE_OMEGA_OFM_BY_DEFAULT - -/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if - you don't. */ -#undef MAKE_TEX_FMT_BY_DEFAULT - -/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if - you don't. */ -#undef MAKE_TEX_MF_BY_DEFAULT - -/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you - don't. */ -#undef MAKE_TEX_PK_BY_DEFAULT - -/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if - you don't. */ -#undef MAKE_TEX_TEX_BY_DEFAULT - -/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if - you don't. */ -#undef MAKE_TEX_TFM_BY_DEFAULT - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 26c5b1b3441..f92d0c80216 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -54,11 +54,11 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/alephdir/am/aleph.am \ - $(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \ - $(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \ - $(srcdir)/etexdir/am/etex.am $(srcdir)/libmd5/am/md5.am \ - $(srcdir)/luatexdir/am/liblua51.am \ + $(srcdir)/Makefile.in $(srcdir)/README \ + $(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \ + $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \ + $(srcdir)/c-auto.in $(srcdir)/etexdir/am/etex.am \ + $(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/liblua51.am \ $(srcdir)/luatexdir/am/libluatex.am \ $(srcdir)/luatexdir/am/libzzip.am \ $(srcdir)/luatexdir/am/luafontforge.am \ @@ -187,7 +187,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h ff-config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = CXXLD.sh ARFLAGS = cru libff_a_AR = $(AR) $(ARFLAGS) libff_a_LIBADD = @@ -1990,6 +1990,8 @@ stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/con distclean-hdr: -rm -f c-auto.h stamp-h1 ff-config.h stamp-h2 +CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README + cd $(top_builddir) && $(SHELL) ./config.status $@ libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) -rm -f libff.a $(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index e69855d8a81..f0be8c5f5b3 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -17457,7 +17457,7 @@ if test "x$kpse_cv_cxx_hack" = xok; then set -- $CXX \"\$@\" $CXX_HACK_LIBS echo \"\$0:\" \"\$@\" exec \"\$@\"" - ac_config_files="$ac_config_files CXXLD.sh:Makefile.in" + ac_config_files="$ac_config_files CXXLD.sh:README" else CXXLD='$(CXX)' @@ -25316,7 +25316,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:Makefile.in" ;; + "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;; "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; "ff-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ff-config.h:luatexdir/luafontloader/ff-config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index adaccc54b1b..c52b51f6fc1 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -13888,8 +13888,7 @@ if test "${xdvi_cv_func_good_vsnprintf+set}" = set; then $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then - # safe value for cross-compiling -xdvi_cv_func_good_vsnprintf=no + xdvi_cv_func_good_vsnprintf=no # safe value for cross-compiling else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -13902,12 +13901,14 @@ cat >>conftest.$ac_ext <<_ACEOF #define _XOPEN_SOURCE 500 #endif #include <stdio.h> -int main() +int +main () { - char s[2]; +char s[2]; int retval = snprintf(s, 2, "test"); if (retval > -1 && retval != 4) /* neither negative nor desired size, not OK */ return 1; + ; return 0; } _ACEOF @@ -13950,13 +13951,14 @@ fi fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_func_good_vsnprintf" >&5 $as_echo "$xdvi_cv_func_good_vsnprintf" >&6; } -if test $xdvi_cv_func_good_vsnprintf = yes; then +if test "x$xdvi_cv_func_good_vsnprintf" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_GOOD_VSNPRINTF 1 _ACEOF fi + { $as_echo "$as_me:$LINENO: checking for memicmp" >&5 $as_echo_n "checking for memicmp... " >&6; } if test "${xdvi_cv_memicmp+set}" = set; then @@ -13969,7 +13971,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <string.h> - int main () { @@ -14013,13 +14014,14 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_memicmp" >&5 $as_echo "$xdvi_cv_memicmp" >&6; } -if test $xdvi_cv_memicmp = yes; then +if test "x$xdvi_cv_memicmp" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_MEMICMP 1 _ACEOF fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 @@ -16540,15 +16542,14 @@ _ACEOF fi -if test $ac_cv_func_vfork_works = yes; then -{ $as_echo "$as_me:$LINENO: checking for whether setsid() is allowed within vfork()" >&5 +if test "x$ac_cv_func_vfork_works" = xyes; then + { $as_echo "$as_me:$LINENO: checking for whether setsid() is allowed within vfork()" >&5 $as_echo_n "checking for whether setsid() is allowed within vfork()... " >&6; } if test "${xdvi_cv_setsid_in_vfork+set}" = set; then $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then - # safe value for cross-compiling -xdvi_cv_setsid_in_vfork=no + xdvi_cv_setsid_in_vfork=no # safe value for cross-compiling else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16556,6 +16557,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + /* Test adapted from Gnu autoconf */ /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -16568,7 +16570,9 @@ cat >>conftest.$ac_ext <<_ACEOF #include <vfork.h> #endif int -main() { +main () +{ + pid_t parent = getpid (); pid_t child; @@ -16591,6 +16595,8 @@ main() { || status ); } + ; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -16632,7 +16638,7 @@ fi fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_setsid_in_vfork" >&5 $as_echo "$xdvi_cv_setsid_in_vfork" >&6; } -if test $xdvi_cv_setsid_in_vfork = yes; then +if test "x$xdvi_cv_setsid_in_vfork" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_GOOD_SETSID_VFORK 1 @@ -16640,6 +16646,8 @@ _ACEOF fi fi + + { $as_echo "$as_me:$LINENO: checking whether C compiler supports string concatenation" >&5 $as_echo_n "checking whether C compiler supports string concatenation... " >&6; } if test "${xdvi_cv_cc_concat+set}" = set; then @@ -16652,12 +16660,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <stdio.h> - int main () { puts("Testing" " string" " concatenation"); - ; return 0; } @@ -16692,13 +16698,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_cc_concat" >&5 $as_echo "$xdvi_cv_cc_concat" >&6; } -if test $xdvi_cv_cc_concat = yes; then +if test "x$xdvi_cv_cc_concat" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_CC_CONCAT 1 _ACEOF fi + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -18175,7 +18182,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <stropts.h> - int main () { @@ -18223,53 +18229,56 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_sys_streams" >&5 $as_echo "$xdvi_cv_sys_streams" >&6; } -if test $xdvi_cv_sys_streams = yes; then +if test "x$xdvi_cv_sys_streams" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STREAMS 1 _ACEOF fi + { $as_echo "$as_me:$LINENO: checking for SunOS 4" >&5 $as_echo_n "checking for SunOS 4... " >&6; } if test "${xdvi_cv_sys_sunos_4+set}" = set; then $as_echo_n "(cached) " >&6 else case "`(uname -sr) 2>/dev/null`" in -"SunOS 4."*) - xdvi_cv_sys_sunos_4=yes ;; -*) xdvi_cv_sys_sunos_4=no ;; + "SunOS 4."*) xdvi_cv_sys_sunos_4=yes ;; + *) xdvi_cv_sys_sunos_4=no ;; esac + fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_sys_sunos_4" >&5 $as_echo "$xdvi_cv_sys_sunos_4" >&6; } -if test $xdvi_cv_sys_sunos_4 = yes; then +if test "x$xdvi_cv_sys_sunos_4" = xyes; then cat >>confdefs.h <<\_ACEOF #define SUNOS4 1 _ACEOF fi + { $as_echo "$as_me:$LINENO: checking for certain old versions of Linux" >&5 $as_echo_n "checking for certain old versions of Linux... " >&6; } if test "${xdvi_cv_sys_old_linux+set}" = set; then $as_echo_n "(cached) " >&6 else case "`(uname -sr) 2>/dev/null`" in -"Linux 2."[01].* | "Linux 2.2."[0-8] | "Linux 2.2."[0-8]-*) - xdvi_cv_sys_old_linux=yes ;; -*) xdvi_cv_sys_old_linux=no ;; + "Linux 2."[01].* | "Linux 2.2."[0-8] | "Linux 2.2."[0-8]-*) xdvi_cv_sys_old_linux=yes ;; + *) xdvi_cv_sys_old_linux=no ;; esac + fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_sys_old_linux" >&5 $as_echo "$xdvi_cv_sys_old_linux" >&6; } -if test $xdvi_cv_sys_old_linux = yes; then +if test "x$xdvi_cv_sys_old_linux" = xyes; then cat >>confdefs.h <<\_ACEOF #define FLAKY_SIGPOLL 1 _ACEOF fi + { $as_echo "$as_me:$LINENO: checking for poll.h and poll()" >&5 $as_echo_n "checking for poll.h and poll()... " >&6; } if test "${xdvi_cv_func_poll+set}" = set; then @@ -18282,7 +18291,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <poll.h> - int main () { @@ -18326,7 +18334,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_func_poll" >&5 $as_echo "$xdvi_cv_func_poll" >&6; } -if test $xdvi_cv_func_poll = yes; then +if test "x$xdvi_cv_func_poll" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_POLL 1 @@ -18490,27 +18498,25 @@ fi + { $as_echo "$as_me:$LINENO: checking whether linker supports the --allow-multiple-definition flag" >&5 $as_echo_n "checking whether linker supports the --allow-multiple-definition flag... " >&6; } if test "${xdvi_cv_linker_multiple_defns+set}" = set; then $as_echo_n "(cached) " >&6 else - xdvi_save_LDFLAGS="$LDFLAGS" -LDFLAGS="-Xlinker --allow-multiple-definition" -x_linker_options="" -cat >conftest.$ac_ext <<_ACEOF + xdvi_save_LDFLAGS=$LDFLAGS + LDFLAGS="-Xlinker --allow-multiple-definition" + 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> - int main () { void foo(void); - ; return 0; } @@ -18542,40 +18548,33 @@ else sed 's/^/| /' conftest.$ac_ext >&5 xdvi_cv_linker_multiple_defns=no - fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - + LDFLAGS=$xdvi_save_LDFLAGS fi { $as_echo "$as_me:$LINENO: result: $xdvi_cv_linker_multiple_defns" >&5 $as_echo "$xdvi_cv_linker_multiple_defns" >&6; } -if test $xdvi_cv_linker_multiple_defns = yes; then - x_linker_options="-Xlinker --allow-multiple-definition" - LDFLAGS="$xdvi_save_LDFLAGS" -cat >>confdefs.h <<\_ACEOF -#define LD_ALLOWS_MULTIPLE_DEFINITIONS 1 -_ACEOF - -else - LDFLAGS="$xdvi_save_LDFLAGS" +x_linker_options="" +case $xdvi_cv_linker_multiple_defns in + yes) x_linker_options="-Xlinker --allow-multiple-definition" ;; + "by default") : ;; + *) { $as_echo "$as_me:$LINENO: checking whether linker supports multiple definitions" >&5 +$as_echo_n "checking whether linker supports multiple definitions... " >&6; } - xdvi_ld_save_LIBS="$LIBS" - xdvi_ld_save_CFLAGS="$CFLAGS" - xdvi_ld_save_CPPFLAGS="$CPPFLAGS" - xdvi_ld_save_LDFLAGS="$LDFLAGS" + xdvi_ld_save_LIBS=$LIBS + xdvi_ld_save_CFLAGS=$CFLAGS + xdvi_ld_save_CPPFLAGS=$CPPFLAGS + xdvi_ld_save_LDFLAGS=$LDFLAGS LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS" CFLAGS="$X_CFLAGS $CFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS" LDFLAGS="$X_LIBS $LDFLAGS" - { $as_echo "$as_me:$LINENO: checking whether linker supports multiple definitions by default" >&5 -$as_echo_n "checking whether linker supports multiple definitions by default... " >&6; } - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18584,22 +18583,19 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <X11/Intrinsic.h> - XtIntervalId XtAppAddTimeOut(XtAppContext app, + XtIntervalId XtAppAddTimeOut(XtAppContext app, unsigned long interval, XtTimerCallbackProc proc, XtPointer closure) - { - (void)app; (void)interval; (void)proc; (void)closure; - return (XtIntervalId)0; - } + { + (void)app; (void)interval; (void)proc; (void)closure; + return (XtIntervalId)0; + } int main () { - - XtIntervalId i = 0; - XtRemoveTimeOut(i); - +XtIntervalId i = 0; XtRemoveTimeOut(i); ; return 0; } @@ -18625,12 +18621,11 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - xdvi_cv_linker_multiple_defns=yes + xdvi_cv_linker_multiple_defns="by default" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - xdvi_cv_linker_multiple_defns=no fi @@ -18638,17 +18633,23 @@ rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - if test $xdvi_cv_linker_multiple_defns = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - cat >>confdefs.h <<\_ACEOF + LIBS=$xdvi_ld_save_LIBS + CFLAGS=$xdvi_ld_save_CFLAGS + CPPFLAGS=$xdvi_ld_save_CPPFLAGS + LDFLAGS=$xdvi_ld_save_LDFLAGS + + { $as_echo "$as_me:$LINENO: result: $xdvi_cv_linker_multiple_defns" >&5 +$as_echo "$xdvi_cv_linker_multiple_defns" >&6; } ;; +esac + +if test "x$xdvi_cv_linker_multiple_defns" != xno; then + +cat >>confdefs.h <<\_ACEOF #define LD_ALLOWS_MULTIPLE_DEFINITIONS 1 _ACEOF - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: WARNING: Linker does not allow multiple definitions. +else + { $as_echo "$as_me:$LINENO: WARNING: Linker does not allow multiple definitions. ***************************************************************** * Warning: Your linker does not allow multiple definitions. * * This does not make xdvik unusable, but it will cause problems * @@ -18664,16 +18665,12 @@ $as_echo "$as_me: WARNING: Linker does not allow multiple definitions. * tooltips, statusline messages and hyperlink location markers * * will not be updated until the mouse is moved. * *****************************************************************" >&2;} - fi - LIBS="$xdvi_ld_save_LIBS" - CFLAGS="$xdvi_ld_save_CFLAGS" - CPPFLAGS="$xdvi_ld_save_CPPFLAGS" - LDFLAGS="$xdvi_ld_save_LDFLAGS" fi + for ac_header in stdint.h inttypes.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 b/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 index ca6da408555..5a6b372fc26 100644 --- a/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 @@ -1,5 +1,10 @@ -dnl ### Determine integer type to use for bitmaps - +# Autoconf macros for xdvik. +# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # XDVI_C_BITMAP_TYPE # ------------------ diff --git a/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4 b/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4 index a37cbb2eb98..27d203dcab3 100644 --- a/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4 @@ -1,13 +1,21 @@ -dnl ### Check for whether the C compiler does string concatenation +# Autoconf macros for xdvik. +# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# XDVI_CC_CONCAT +# -------------- +# Check whether the C compiler does string concatenation. AC_DEFUN([XDVI_CC_CONCAT], -[AC_CACHE_CHECK([whether C compiler supports string concatenation], xdvi_cv_cc_concat, -[AC_TRY_COMPILE( -[#include <stdio.h> -], [puts("Testing" " string" " concatenation"); -], [xdvi_cv_cc_concat=yes], [xdvi_cv_cc_concat=no])]) -if test $xdvi_cv_cc_concat = yes; then +[AC_CACHE_CHECK([whether C compiler supports string concatenation], + [xdvi_cv_cc_concat], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], + [[puts("Testing" " string" " concatenation");]])], + [xdvi_cv_cc_concat=yes], + [xdvi_cv_cc_concat=no])]) +if test "x$xdvi_cv_cc_concat" = xyes; then AC_DEFINE([HAVE_CC_CONCAT], 1, [Define if your C compiler can do string concatenation]) -fi]) - - +fi +]) # XDVI_CC_CONCAT diff --git a/Build/source/texk/xdvik/m4/xdvi-func-memicmp.m4 b/Build/source/texk/xdvik/m4/xdvi-func-memicmp.m4 index 29db674b096..b9915a3957e 100644 --- a/Build/source/texk/xdvik/m4/xdvi-func-memicmp.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-func-memicmp.m4 @@ -1,11 +1,21 @@ -dnl ### Check for memicmp(), which some installations have in string.h +# Autoconf macros for xdvik. +# Copyright (C) 2002 - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# XDVI_FUNC_MEMICMP +# ----------------- +# Check for memicmp(), which some installations have in <string.h>. AC_DEFUN([XDVI_FUNC_MEMICMP], -[AC_CACHE_CHECK([for memicmp], xdvi_cv_memicmp, -[AC_TRY_LINK( -[#include <string.h> -], [(void)memicmp((char *)NULL, (char *)NULL, 0);], -xdvi_cv_memicmp=yes, xdvi_cv_memicmp=no)]) -if test $xdvi_cv_memicmp = yes; then +[AC_CACHE_CHECK([for memicmp], + [xdvi_cv_memicmp], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], + [[(void)memicmp((char *)NULL, (char *)NULL, 0);]])], + [xdvi_cv_memicmp=yes], + [xdvi_cv_memicmp=no])]) +if test "x$xdvi_cv_memicmp" = xyes; then AC_DEFINE([HAVE_MEMICMP], 1, [Define if the memicmp() function is in <string.h>]) -fi]) - +fi +]) # XDVI_FUNC_MEMICMP diff --git a/Build/source/texk/xdvik/m4/xdvi-func-poll.m4 b/Build/source/texk/xdvik/m4/xdvi-func-poll.m4 index df70d821428..30dfcf9542b 100644 --- a/Build/source/texk/xdvik/m4/xdvi-func-poll.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-func-poll.m4 @@ -1,15 +1,23 @@ -dnl ### Check for poll() +# Autoconf macros for xdvik. +# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# XDVI_FUNC_POLL +# -------------- +# Check for poll(). AC_DEFUN([XDVI_FUNC_POLL], -[AC_CACHE_CHECK([for poll.h and poll()], xdvi_cv_func_poll, -[AC_TRY_LINK( -[#include <poll.h> -], [poll((struct pollfd *) 0, 0, 0);], -xdvi_cv_func_poll=yes, xdvi_cv_func_poll=no)]) -if test $xdvi_cv_func_poll = yes; then +[AC_CACHE_CHECK([for poll.h and poll()], + [xdvi_cv_func_poll], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <poll.h>]], + [[poll((struct pollfd *) 0, 0, 0);]])], + [xdvi_cv_func_poll=yes], + [xdvi_cv_func_poll=no])]) +if test "x$xdvi_cv_func_poll" = xyes; then AC_DEFINE([HAVE_POLL], 1, [Define if your system has <poll.h> and poll().]) else - AC_CHECK_HEADERS(sys/select.h select.h) -fi]) - - + AC_CHECK_HEADERS([sys/select.h select.h]) +fi +]) # XDVI_FUNC_POLL diff --git a/Build/source/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4 b/Build/source/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4 index 8d7c6651691..8fa2fcb9dc2 100644 --- a/Build/source/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4 @@ -1,12 +1,20 @@ -dnl ### Check for whether setsid() is allowed within vfork() -dnl (Mac OS X 10.3 (Panther, 11/2003) is one O/S which does not allow this.) +# Autoconf macros for xdvik. +# Copyright (C) 2002 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# XDVI_FUNC_SETSID_IN_VFORK +# ------------------------- +# Check for whether setsid() is allowed within vfork() +# (Mac OS X 10.3 (Panther, 11/2003) is one O/S which does not allow this). AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK], -[if test $ac_cv_func_vfork_works = yes; then -AC_CACHE_CHECK([for whether setsid() is allowed within vfork()], -xdvi_cv_setsid_in_vfork, -[AC_TRY_RUN( -[/* Test adapted from Gnu autoconf */ +[AS_IF([test "x$ac_cv_func_vfork_works" = xyes], +[AC_CACHE_CHECK([for whether setsid() is allowed within vfork()], + [xdvi_cv_setsid_in_vfork], + [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +/* Test adapted from Gnu autoconf */ /* Thanks to Paul Eggert for this test. */ #include <stdio.h> #include <sys/types.h> @@ -16,9 +24,8 @@ xdvi_cv_setsid_in_vfork, #endif #ifdef HAVE_VFORK_H #include <vfork.h> -#endif -int -main() { +#endif]], + [[ pid_t parent = getpid (); pid_t child; @@ -40,15 +47,12 @@ main() { /* Did the child fail? (This shouldn't happen.) */ || status ); - } -}], -xdvi_cv_setsid_in_vfork=yes, -xdvi_cv_setsid_in_vfork=no, -# safe value for cross-compiling -xdvi_cv_setsid_in_vfork=no)]) -if test $xdvi_cv_setsid_in_vfork = yes; then + }]])], + [xdvi_cv_setsid_in_vfork=yes], + [xdvi_cv_setsid_in_vfork=no], + [xdvi_cv_setsid_in_vfork=no # safe value for cross-compiling])]) +if test "x$xdvi_cv_setsid_in_vfork" = xyes; then AC_DEFINE([HAVE_GOOD_SETSID_VFORK], 1, [Define if your system allows setsid() within vfork().]) -fi] -fi) - +fi]) +]) # XDVI_FUNC_SETSID_IN_VFORK diff --git a/Build/source/texk/xdvik/m4/xdvi-func-working-vsnprintf.m4 b/Build/source/texk/xdvik/m4/xdvi-func-working-vsnprintf.m4 index 8671e1a1d5b..857452941e2 100644 --- a/Build/source/texk/xdvik/m4/xdvi-func-working-vsnprintf.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-func-working-vsnprintf.m4 @@ -1,28 +1,31 @@ -dnl ### Check for a working implementation of (v)snprintf() -dnl ### which should either return a negative result or the size actually needed -dnl ### (latter is C99 standard). +# Autoconf macros for xdvik. +# Copyright (C) 2000 - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# XDVI_FUNC_WORKING_VSNPRINTF +# --------------------------- +# Check for a working implementation of (v)snprintf() +# which should either return a negative result or the size actually needed +# (latter is C99 standard). AC_DEFUN([XDVI_FUNC_WORKING_VSNPRINTF], [AC_CACHE_CHECK([for a working implementation of (v)snprintf()], -xdvi_cv_func_good_vsnprintf, -[AC_TRY_RUN( -[ + [xdvi_cv_func_good_vsnprintf], + [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #ifdef IRIX #define _XOPEN_SOURCE 500 #endif -#include <stdio.h> -int main() -{ - char s[2]; +#include <stdio.h>]], + [[char s[2]; int retval = snprintf(s, 2, "test"); if (retval > -1 && retval != 4) /* neither negative nor desired size, not OK */ - return 1; - return 0; -}], -xdvi_cv_func_good_vsnprintf=yes, -xdvi_cv_func_good_vsnprintf=no, -# safe value for cross-compiling -xdvi_cv_func_good_vsnprintf=no)]) -if test $xdvi_cv_func_good_vsnprintf = yes; then + return 1;]])], + [xdvi_cv_func_good_vsnprintf=yes], + [xdvi_cv_func_good_vsnprintf=no], + [xdvi_cv_func_good_vsnprintf=no # safe value for cross-compiling])]) +if test "x$xdvi_cv_func_good_vsnprintf" = xyes; then AC_DEFINE([HAVE_GOOD_VSNPRINTF], 1, [Define if the vsnprintf function works.]) -fi]) - +fi +]) # XDVI_FUNC_WORKING_VSNPRINTF diff --git a/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 b/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 index 20d65877ea5..4c6e74e760f 100644 --- a/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 @@ -1,3 +1,11 @@ +# Autoconf macros for xdvik. +# Copyright (C) 2004 - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # XDVI_ICONV_CHAR_PPTR_TYPE # ------------------------- # Check whether iconv takes a 'const char **' or a 'char **' input argument. diff --git a/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 b/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 index 3de54de5b89..5c67903a2b9 100644 --- a/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 @@ -1,66 +1,70 @@ -dnl ### Check if the --allow-multiple-definition linker flag is -dnl ### available (assuming that we need to use it if it is). -dnl ### If it isn't, check if the linker accepts multiple definitions, -dnl ### and if it doesn't, don't define LD_ALLOWS_MULTIPLE_DEFINITIONS. +# Autoconf macros for xdvik. +# Copyright (C) 2002 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# XDVI_LINKER_MULTIPLE_DEFNS +# -------------------------- +# Check if the --allow-multiple-definition linker flag is +# available (assuming that we need to use it if it is). +# If it isn't, check if the linker accepts multiple definitions, +# and if it doesn't, don't define LD_ALLOWS_MULTIPLE_DEFINITIONS. AC_DEFUN([XDVI_LINKER_MULTIPLE_DEFNS], [AC_CACHE_CHECK([whether linker supports the --allow-multiple-definition flag], -xdvi_cv_linker_multiple_defns, -xdvi_save_LDFLAGS="$LDFLAGS" -LDFLAGS="-Xlinker --allow-multiple-definition" + [xdvi_cv_linker_multiple_defns], + [xdvi_save_LDFLAGS=$LDFLAGS + LDFLAGS="-Xlinker --allow-multiple-definition" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], + [[void foo(void);]])], + [xdvi_cv_linker_multiple_defns=yes], + [xdvi_cv_linker_multiple_defns=no]) + LDFLAGS=$xdvi_save_LDFLAGS]) + x_linker_options="" -[AC_TRY_LINK( - [#include <stdio.h> - ], - [void foo(void); - ], - [xdvi_cv_linker_multiple_defns=yes], [xdvi_cv_linker_multiple_defns=no] -)] -) -if test $xdvi_cv_linker_multiple_defns = yes; then - x_linker_options="-Xlinker --allow-multiple-definition" - LDFLAGS="$xdvi_save_LDFLAGS" - AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1, - [Define if your system allows multiple definitions of functions.]) -else - LDFLAGS="$xdvi_save_LDFLAGS" +AS_CASE([$xdvi_cv_linker_multiple_defns], + [yes], [x_linker_options="-Xlinker --allow-multiple-definition"], + ["by default"], [], + [AC_MSG_CHECKING([whether linker supports multiple definitions]) - xdvi_ld_save_LIBS="$LIBS" - xdvi_ld_save_CFLAGS="$CFLAGS" - xdvi_ld_save_CPPFLAGS="$CPPFLAGS" - xdvi_ld_save_LDFLAGS="$LDFLAGS" + xdvi_ld_save_LIBS=$LIBS + xdvi_ld_save_CFLAGS=$CFLAGS + xdvi_ld_save_CPPFLAGS=$CPPFLAGS + xdvi_ld_save_LDFLAGS=$LDFLAGS LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS" CFLAGS="$X_CFLAGS $CFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS" LDFLAGS="$X_LIBS $LDFLAGS" - AC_MSG_CHECKING([whether linker supports multiple definitions by default]) - - AC_TRY_LINK( - [#include <X11/Intrinsic.h> + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h> - XtIntervalId XtAppAddTimeOut(XtAppContext app, + XtIntervalId XtAppAddTimeOut(XtAppContext app, unsigned long interval, XtTimerCallbackProc proc, XtPointer closure) - { - (void)app; (void)interval; (void)proc; (void)closure; - return (XtIntervalId)0; - } - ],[ - XtIntervalId i = 0; - XtRemoveTimeOut(i); - ], - [xdvi_cv_linker_multiple_defns=yes], [xdvi_cv_linker_multiple_defns=no] - ) + { + (void)app; (void)interval; (void)proc; (void)closure; + return (XtIntervalId)0; + } + ]], + [[XtIntervalId i = 0; XtRemoveTimeOut(i);]])], + [xdvi_cv_linker_multiple_defns="by default"]) - if test $xdvi_cv_linker_multiple_defns = yes; then - AC_MSG_RESULT(yes) - AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1) - else - AC_MSG_RESULT(no) - AC_MSG_WARN([Linker does not allow multiple definitions. + LIBS=$xdvi_ld_save_LIBS + CFLAGS=$xdvi_ld_save_CFLAGS + CPPFLAGS=$xdvi_ld_save_CPPFLAGS + LDFLAGS=$xdvi_ld_save_LDFLAGS + + AC_MSG_RESULT([$xdvi_cv_linker_multiple_defns])]) +if test "x$xdvi_cv_linker_multiple_defns" != xno; then + AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1, + [Define if your system allows multiple definitions of functions.]) +else + AC_MSG_WARN([Linker does not allow multiple definitions. ***************************************************************** * Warning: Your linker does not allow multiple definitions. * * This does not make xdvik unusable, but it will cause problems * @@ -68,12 +72,6 @@ else * tooltips, statusline messages and hyperlink location markers * * will not be updated until the mouse is moved. * *****************************************************************]) - fi - LIBS="$xdvi_ld_save_LIBS" - CFLAGS="$xdvi_ld_save_CFLAGS" - CPPFLAGS="$xdvi_ld_save_CPPFLAGS" - LDFLAGS="$xdvi_ld_save_LDFLAGS" fi -AC_SUBST(x_linker_options)]) - - +AC_SUBST([x_linker_options]) +]) # XDVI_LINKER_MULTIPLE_DEFNS diff --git a/Build/source/texk/xdvik/m4/xdvi-sys-old-linux.m4 b/Build/source/texk/xdvik/m4/xdvi-sys-old-linux.m4 index 7d7fe046fc6..7b7f80ee483 100644 --- a/Build/source/texk/xdvik/m4/xdvi-sys-old-linux.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-sys-old-linux.m4 @@ -1,14 +1,22 @@ -dnl ### Check for certain broken versions of Linux +# Autoconf macros for xdvik. +# Copyright (C) 2001 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# XDVI_SYS_OLD_LINUX +# ------------------ +# Check for certain broken versions of Linux. AC_DEFUN([XDVI_SYS_OLD_LINUX], -[AC_CACHE_CHECK([for certain old versions of Linux], xdvi_cv_sys_old_linux, -[case "`(uname -sr) 2>/dev/null`" in -"Linux 2."[[01]].* | "Linux 2.2."[[0-8]] | "Linux 2.2."[[0-8]]-*) - xdvi_cv_sys_old_linux=yes ;; -*) xdvi_cv_sys_old_linux=no ;; -esac]) -if test $xdvi_cv_sys_old_linux = yes; then +[AC_CACHE_CHECK([for certain old versions of Linux], + [xdvi_cv_sys_old_linux], + [AS_CASE(["`(uname -sr) 2>/dev/null`"], + [["Linux 2."[01].* | "Linux 2.2."[0-8] | "Linux 2.2."[0-8]-*]], + [xdvi_cv_sys_old_linux=yes], + [xdvi_cv_sys_old_linux=no])]) +if test "x$xdvi_cv_sys_old_linux" = xyes; then AC_DEFINE([FLAKY_SIGPOLL], 1, [Define if you are using Linux 2.1.xxx -- 2.2.8, or if you find it necessary.]) -fi]) - +fi +]) # XDVI_SYS_OLD_LINUX diff --git a/Build/source/texk/xdvik/m4/xdvi-sys-streams.m4 b/Build/source/texk/xdvik/m4/xdvi-sys-streams.m4 index 2548c5d96c4..b347b4d9223 100644 --- a/Build/source/texk/xdvik/m4/xdvi-sys-streams.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-sys-streams.m4 @@ -1,16 +1,25 @@ -dnl ### Check for at-least-pretend Streams capability +# Autoconf macros for xdvik. +# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# XDVI_SYS_STREAMS +# ---------------- +# Check for at-least-pretend Streams capability. AC_DEFUN([XDVI_SYS_STREAMS], -[AC_CACHE_CHECK([for stropts.h and isastream()], xdvi_cv_sys_streams, -[AC_TRY_LINK( -[#include <stropts.h> -], [#ifndef I_SETSIG +[AC_CACHE_CHECK([for stropts.h and isastream()], + [xdvi_cv_sys_streams], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stropts.h>]], + [[#ifndef I_SETSIG choke me #else isastream(0); -#endif], xdvi_cv_sys_streams=yes, xdvi_cv_sys_streams=no)]) -if test $xdvi_cv_sys_streams = yes; then +#endif]])], + [xdvi_cv_sys_streams=yes], + [xdvi_cv_sys_streams=no])]) +if test "x$xdvi_cv_sys_streams" = xyes; then AC_DEFINE([HAVE_STREAMS], 1, [Define if your system has STREAMS (and if X uses it).]) -fi]) - - +fi +]) # XDVI_SYS_STREAMS diff --git a/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4 b/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4 index 3d19e3b2a4e..45e52761355 100644 --- a/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4 @@ -1,13 +1,21 @@ -dnl ### Check for SunOS 4 +# Autoconf macros for xdvik. +# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# +# This file is free software; the copyright holder +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# XDVI_SYS_SUNOS_4 +# ---------------- +# Check for SunOS 4. AC_DEFUN([XDVI_SYS_SUNOS_4], -[AC_CACHE_CHECK([for SunOS 4], xdvi_cv_sys_sunos_4, -[case "`(uname -sr) 2>/dev/null`" in -"SunOS 4."*) - xdvi_cv_sys_sunos_4=yes ;; -*) xdvi_cv_sys_sunos_4=no ;; -esac]) -if test $xdvi_cv_sys_sunos_4 = yes; then +[AC_CACHE_CHECK([for SunOS 4], + [xdvi_cv_sys_sunos_4], + [AS_CASE(["`(uname -sr) 2>/dev/null`"], + ["SunOS 4."*], + [xdvi_cv_sys_sunos_4=yes], + [xdvi_cv_sys_sunos_4=no])]) +if test "x$xdvi_cv_sys_sunos_4" = xyes; then AC_DEFINE([SUNOS4], 1, [Define if you are using SunOS 4.x.]) -fi]) - +fi +]) # XDVI_SYS_SUNOS_4 diff --git a/Build/source/utils/configure b/Build/source/utils/configure index bfdf78ebb1f..d1f18da8f67 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -682,8 +682,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_all_pkgs -enable_cxx_runtime_hack +enable_native_texlive_build enable_multiplatform +enable_cxx_runtime_hack enable_dialog enable_pdfopen enable_ps2eps @@ -1437,9 +1438,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-all-pkgs do not build packages unless explicitly enabled - --enable-cxx-runtime-hack link C++ runtime statically + --disable-native-texlive-build + do not build for the TeX Live binary distribution --enable-multiplatform put executables into bin/PLATFORM and libraries into lib/PLATFORM + --enable-cxx-runtime-hack link C++ runtime statically --disable-dialog do not build the dialog package --disable-pdfopen do not build the pdfopen package --disable-ps2eps do not build the ps2eps package @@ -2148,11 +2151,36 @@ if test "${enable_all_pkgs+set}" = set; then enableval=$enable_all_pkgs; fi test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes -# Check whether --enable-cxx-runtime-hack was given. -if test "${enable_cxx_runtime_hack+set}" = set; then - enableval=$enable_cxx_runtime_hack; -fi +# Check whether --enable-native-texlive-build was given. +if test "${enable_native_texlive_build+set}" = set; then + enableval=$enable_native_texlive_build; +fi +case $enable_native_texlive_build in + yes | no) : ;; + *) enable_native_texlive_build=yes + ac_configure_args="$ac_configure_args '--enable-native-texlive-build'" ;; +esac + +if test "x$enable_native_texlive_build" = xyes; then + case $enable_multiplatform in + yes | no) : ;; + *) enable_multiplatform=yes + ac_configure_args="$ac_configure_args '--enable-multiplatform'" ;; +esac + case $enable_cxx_runtime_hack in + yes | no) : ;; + *) enable_cxx_runtime_hack=yes + ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'" ;; +esac + + case $enable_shared in + yes | no) : ;; + *) enable_shared=no + ac_configure_args="$ac_configure_args '--disable-shared'" ;; +esac + +fi # Check whether --enable-multiplatform was given. if test "${enable_multiplatform+set}" = set; then enableval=$enable_multiplatform; @@ -2168,6 +2196,11 @@ if test "x$enable_multiplatform" = xyes; then fi fi +# Check whether --enable-cxx-runtime-hack was given. +if test "${enable_cxx_runtime_hack+set}" = set; then + enableval=$enable_cxx_runtime_hack; +fi + ## ac/withenable.ac: configure.ac fragment for the TeX Live top-level |