diff options
Diffstat (limited to 'Build/source/texk/ttf2pk')
-rw-r--r-- | Build/source/texk/ttf2pk/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/c-auto.h | 23 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/c-auto.in | 55 | ||||
-rwxr-xr-x | Build/source/texk/ttf2pk/configure | 153 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/configure.in | 2 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/stamp-aclocal | 1 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/stamp-auto.in | 1 |
7 files changed, 184 insertions, 56 deletions
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index 096c2572610..a84a79382ae 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -1,3 +1,8 @@ +2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.in: added AC_CONFIG_HEADERS (moved + from ../kpathsea/common.ac to here). + 2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/ttf2pk/c-auto.h b/Build/source/texk/ttf2pk/c-auto.h deleted file mode 100644 index 8dd094de2a3..00000000000 --- a/Build/source/texk/ttf2pk/c-auto.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * c-auto.h - * - * This file is part of the ttf2pk package. - * - * Copyright 1997-1999, 2000 by - * Frederic Loyer <loyer@ensta.fr> - * Werner Lemberg <wl@gnu.org> - */ - -#ifndef C_AUTO_H -#define C_AUTO_H - -/* - * We need to get kpathsea's configuration file. - */ - -#include "kpathsea/c-auto.h" - -#endif /* C_AUTO_H */ - - -/* end */ diff --git a/Build/source/texk/ttf2pk/c-auto.in b/Build/source/texk/ttf2pk/c-auto.in new file mode 100644 index 00000000000..228e6a90c43 --- /dev/null +++ b/Build/source/texk/ttf2pk/c-auto.in @@ -0,0 +1,55 @@ +/* c-auto.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the <freetype.h> header file. */ +#undef HAVE_FREETYPE_H + +/* 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 `ttf' library (-lttf). */ +#undef HAVE_LIBTTF + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* 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 <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 <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 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 diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure index f0c37c550ed..222cf2ab89c 100755 --- a/Build/source/texk/ttf2pk/configure +++ b/Build/source/texk/ttf2pk/configure @@ -1705,6 +1705,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4060,37 +4063,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - +DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= @@ -4425,6 +4398,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. config_files="$ac_config_files" +config_headers="$ac_config_headers" _ACEOF @@ -4442,10 +4416,15 @@ Usage: $0 [OPTIONS] [FILE]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Report bugs to <bug-autoconf@gnu.org>." _ACEOF @@ -4495,7 +4474,16 @@ do $ac_shift CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -4550,6 +4538,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in + "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; "Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;; @@ -4566,6 +4555,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi # Have a temporary directory for convenience. Make it in the build tree @@ -4733,7 +4723,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF fi # test -n "$CONFIG_FILES" -for ac_tag in :F $CONFIG_FILES +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; @@ -4973,7 +4963,104 @@ which seems to be undefined. Please make sure it is defined." >&2;} *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS +cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f $ac_file + mv "$tmp/config.h" $ac_file + fi + else + echo "/* $configure_input */" + cat "$ac_result" + fi + rm -f "$tmp/out12" + ;; esac diff --git a/Build/source/texk/ttf2pk/configure.in b/Build/source/texk/ttf2pk/configure.in index 06fc6a600e6..c8a32886130 100644 --- a/Build/source/texk/ttf2pk/configure.in +++ b/Build/source/texk/ttf2pk/configure.in @@ -2,6 +2,8 @@ dnl Public domain. dnl Process this file with autoconf to produce a configure script. AC_INIT(ttf2pk.c) +AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) + AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET diff --git a/Build/source/texk/ttf2pk/stamp-aclocal b/Build/source/texk/ttf2pk/stamp-aclocal new file mode 100644 index 00000000000..4df5d82d931 --- /dev/null +++ b/Build/source/texk/ttf2pk/stamp-aclocal @@ -0,0 +1 @@ +Fri Feb 29 13:37:33 CET 2008 diff --git a/Build/source/texk/ttf2pk/stamp-auto.in b/Build/source/texk/ttf2pk/stamp-auto.in new file mode 100644 index 00000000000..1c98811ae95 --- /dev/null +++ b/Build/source/texk/ttf2pk/stamp-auto.in @@ -0,0 +1 @@ +Fri Feb 29 13:37:34 CET 2008 |