diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-29 15:40:00 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-29 15:40:00 +0000 |
commit | 2b049d253dc2dfcbddc656ee3bffedf9f65a67b2 (patch) | |
tree | 11d05560a28146f8bb03fe436ae00e5e5ffd2712 /Build/source/texk/dvipdfm | |
parent | b18fbbf19bcc21a491e8c0145b1d7b2d3507ef21 (diff) |
next step in autotools update
add autoheader in reautoconf script and maintainer rules
(maintainer mode still has some problems)
remove need for acconfig.h (templates via AC_DEFINE)
svn:ignore atom4te.cache directories
reautoconf of the whole tree
git-svn-id: svn://tug.org/texlive/trunk@6773 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm')
-rw-r--r-- | Build/source/texk/dvipdfm/ChangeLog | 16 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/acconfig.h.dist (renamed from Build/source/texk/dvipdfm/acconfig.h) | 0 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/acinclude.m4 | 22 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/c-auto.in | 108 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/config.h | 11 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm/configure | 39 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/configure.in | 27 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/dvipdfm.c | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/stamp-aclocal | 1 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm/stamp-auto.in | 2 |
10 files changed, 181 insertions, 49 deletions
diff --git a/Build/source/texk/dvipdfm/ChangeLog b/Build/source/texk/dvipdfm/ChangeLog index e5de7e75e7d..c67fc2301bf 100644 --- a/Build/source/texk/dvipdfm/ChangeLog +++ b/Build/source/texk/dvipdfm/ChangeLog @@ -1,3 +1,19 @@ +2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + The Makefile.in uses `kpse_include ../make/config.mk'; thus + autoheader most generate c-auto.in. + * config.h (new): includes the autogenerated c-auto.h. + * configure.in: removed `--enable-maint', added AC_DEFINES's + third arg to provide autoheader templates ... + * acinclude.m4: added AC_DEFINES's third arg to provide autoheader + templates ... + * acconfig.h (removed): ... renamed ... + * acconfig.h.dist (new): ... into this. + + * configure.in: don't (re-)define KPATHSEA (defined as some + kpathsea version number). + * dvipdfm.c: use `#ifdef HAVE_KPATHSEA', noy `#ifdef KPATHSEA'. + 2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/dvipdfm/acconfig.h b/Build/source/texk/dvipdfm/acconfig.h.dist index ee49123b348..ee49123b348 100644 --- a/Build/source/texk/dvipdfm/acconfig.h +++ b/Build/source/texk/dvipdfm/acconfig.h.dist diff --git a/Build/source/texk/dvipdfm/acinclude.m4 b/Build/source/texk/dvipdfm/acinclude.m4 index aa1ec43fb6f..879c18301f2 100644 --- a/Build/source/texk/dvipdfm/acinclude.m4 +++ b/Build/source/texk/dvipdfm/acinclude.m4 @@ -4,7 +4,9 @@ AC_DEFUN([AC_EXT_TIMEZONE], [AC_MSG_CHECKING([whether time.h defines timezone as an external variable]) AC_TRY_LINK([#include <time.h>], [ -timezone; ], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIMEZONE)], [AC_MSG_RESULT(no)])]) + [AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_TIMEZONE], 1, [define if <time.h> has timezone as an external variable])], + [AC_MSG_RESULT(no)])]) AC_DEFUN([AC_HAVE_BASENAME], [AC_MSG_CHECKING([whether basename is in either libgen.h or string.h]) AC_TRY_COMPILE([#include <libgen.h> @@ -13,7 +15,9 @@ AC_DEFUN([AC_HAVE_BASENAME], AC_DEFUN([AC_TZ_HAS_TM_GMTOFF], [AC_MSG_CHECKING([whether struct tz has tm_gmtoff as a member]) AC_TRY_COMPILE([#include <time.h>], [struct tm *tp; tp->tm_gmtoff], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TM_GMTOFF)], [AC_MSG_RESULT(no)])]) + [AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_TM_GMTOFF], 1, [define if struct tm has tm_gmtoff as a member])], + [AC_MSG_RESULT(no)])]) # AC_DEFUN([AC_HAS_KPSE_FORMATS], [AC_MSG_CHECKING([whether you have kpathsea headers and they whether they know about the required file formats]) @@ -21,7 +25,8 @@ AC_DEFUN([AC_HAS_KPSE_FORMATS], #include <kpathsea/tex-file.h>], [kpse_tex_ps_header_format; kpse_type1_format;kpse_vf_format], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_KPSE_FORMATS)], + [AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats])], [AC_MSG_RESULT(no); AC_MSG_ERROR([PS_HEADER and/or VF formats not found in Kpathsea header files. @@ -38,7 +43,8 @@ AC_DEFUN([AC_HAS_OMEGA_FORMATS], AC_TRY_COMPILE([#include <stdio.h> #include <kpathsea/tex-file.h>], [kpse_ofm_format], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_OMEGA_FORMATS)], + [AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_OMEGA_FORMATS], 1, [Define if kpathsea understands Omega (OFM/OVF) formats])], [AC_MSG_RESULT(no)])]) AC_DEFUN([AC_HAS_TTF_FORMATS], [AC_MSG_CHECKING([whether your kpathsea supports Truetype (TTF) file formats]) @@ -46,7 +52,7 @@ AC_DEFUN([AC_HAS_TTF_FORMATS], #include <kpathsea/tex-file.h>], [kpse_truetype_format], [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_TTF_FORMATS) + AC_DEFINE([HAVE_TTF_FORMATS], 1 ,[define if kpathsea understands TrueType (TTF) formats]) TTF_OPT=''], [AC_MSG_RESULT(no)])]) # @@ -66,10 +72,10 @@ AC_MSG_CHECKING([for zlib header files]) AC_TRY_COMPILE([#include <zlib.h>], [z_stream p;], [AC_MSG_RESULT(yes) AC_CHECK_LIB(z, compress, -[AC_DEFINE(HAVE_ZLIB) +[AC_DEFINE([HAVE_ZLIB], 1, [define if you have zlib and its headers]) LIBS="$LIBS -lz" AC_CHECK_LIB(z, compress2, -[AC_DEFINE(HAVE_ZLIB_COMPRESS2)])])], +[AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [define if your zlib has the compress2 function])])])], [CPPFLAGS=$_cppflags LDDFLAGS=$_ldflags AC_MSG_RESULT(no)])]) @@ -91,7 +97,7 @@ AC_MSG_CHECKING([for png header files]) AC_TRY_COMPILE([#include <png.h>], [png_infop p;], [ AC_MSG_RESULT(yes) AC_CHECK_LIB(png, png_get_image_width, [ - AC_DEFINE(HAVE_LIBPNG) + AC_DEFINE([HAVE_LIBPNG], 1, [define if you have libpng]) LIBS="$LIBS -lpng"], , -lz)], [ AC_MSG_RESULT(no)])]) # diff --git a/Build/source/texk/dvipdfm/c-auto.in b/Build/source/texk/dvipdfm/c-auto.in index 9c30520187e..3a1dc9c6ac8 100644 --- a/Build/source/texk/dvipdfm/c-auto.in +++ b/Build/source/texk/dvipdfm/c-auto.in @@ -1,4 +1,106 @@ -/* c-auto.in. Generated automatically from configure.in by autoheader. */ +/* c-auto.in. Generated from configure.in by autoheader. */ -/* The number of bytes in a int. */ -#undef SIZEOF_INT +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* define if you have kpathsea */ +#undef HAVE_KPATHSEA + +/* define if kpathsea supports type1 and vf formats */ +#undef HAVE_KPSE_FORMATS + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* define if you have libpng */ +#undef HAVE_LIBPNG + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define if kpathsea understands Omega (OFM/OVF) formats */ +#undef HAVE_OMEGA_FORMATS + +/* 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 `strspn' function. */ +#undef HAVE_STRSPN + +/* Define to 1 if you have the `system' function. */ +#undef HAVE_SYSTEM + +/* 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 if <time.h> has timezone as an external variable */ +#undef HAVE_TIMEZONE + +/* define if struct tm has tm_gmtoff as a member */ +#undef HAVE_TM_GMTOFF + +/* define if kpathsea understands TrueType (TTF) formats */ +#undef HAVE_TTF_FORMATS + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* define if you have xbasename() in your libkpathsea instead of basename() */ +#undef HAVE_XBASENAME + +/* define if you have zlib and its headers */ +#undef HAVE_ZLIB + +/* define if your zlib has the compress2 function */ +#undef HAVE_ZLIB_COMPRESS2 + +/* Define to 1 if you have the <zlib.h> header file. */ +#undef HAVE_ZLIB_H + +/* package name */ +#undef PACKAGE + +/* 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 1 if your <sys/time.h> declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* package version */ +#undef VERSION + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#undef size_t diff --git a/Build/source/texk/dvipdfm/config.h b/Build/source/texk/dvipdfm/config.h new file mode 100644 index 00000000000..fa9f370a239 --- /dev/null +++ b/Build/source/texk/dvipdfm/config.h @@ -0,0 +1,11 @@ +/* config.h: + * In the original package this file is generated by autoheader. + * When part of the teTeX / TeX live tree, we simply include + * c-auto.h as generted by autoheader and configure. */ + +#ifndef _CONFIG_H +#define _CONFIG_H + +#include "c-auto.h" + +#endif /* _CONFIG_H */ diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure index 44de69214af..2409f64dec2 100755 --- a/Build/source/texk/dvipdfm/configure +++ b/Build/source/texk/dvipdfm/configure @@ -651,7 +651,6 @@ build_alias host_alias target_alias VERSION -MAINT CC CFLAGS LDFLAGS @@ -665,6 +664,7 @@ INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE +MAINT LD AR ARFLAGS @@ -1258,7 +1258,6 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maint enable autoconf portions of Makefile --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -1718,25 +1717,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu VERSION="0.13.2c" + cat >>confdefs.h <<\_ACEOF #define VERSION "0.13.2c" _ACEOF + cat >>confdefs.h <<\_ACEOF #define PACKAGE "dvipdfm" _ACEOF -ac_config_headers="$ac_config_headers config.h" - - -# Check whether --enable-maint was given. -if test "${enable_maint+set}" = set; then - enableval=$enable_maint; MAINT='' -else - MAINT='#' -fi - +ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" ac_ext=c @@ -4088,38 +4080,42 @@ fi # end of libpng.ac -cat >>confdefs.h <<\_ACEOF -#define KPATHSEA 1 -_ACEOF cat >>confdefs.h <<\_ACEOF #define HAVE_KPATHSEA 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_XBASENAME 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_ZLIB 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_ZLIB_COMPRESS2 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_KPSE_FORMATS 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_OMEGA_FORMATS 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_TTF_FORMATS 1 _ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_LIBPNG 1 _ACEOF @@ -4481,7 +4477,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF #define HAVE_TIMEZONE 1 _ACEOF @@ -4530,7 +4528,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF #define HAVE_TM_GMTOFF 1 _ACEOF @@ -5582,7 +5582,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "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" ;; @@ -5684,7 +5684,6 @@ build_alias!$build_alias$ac_delim host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim VERSION!$VERSION$ac_delim -MAINT!$MAINT$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -5698,6 +5697,7 @@ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim LN_S!$LN_S$ac_delim SET_MAKE!$SET_MAKE$ac_delim +MAINT!$MAINT$ac_delim LD!$LD$ac_delim AR!$AR$ac_delim ARFLAGS!$ARFLAGS$ac_delim @@ -6116,6 +6116,7 @@ echo "$as_me: $ac_file is unchanged" >&6;} case $ac_file$ac_mode in + "c-auto.h":H) date >stamp-auto ;; "Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's kpse_input=`case Makefile.in in [\\/$]*) # Absolute diff --git a/Build/source/texk/dvipdfm/configure.in b/Build/source/texk/dvipdfm/configure.in index 641843d6208..b6f749cafc0 100644 --- a/Build/source/texk/dvipdfm/configure.in +++ b/Build/source/texk/dvipdfm/configure.in @@ -5,14 +5,10 @@ define([_version_],"0.13.2c") VERSION=_version_ AC_SUBST(VERSION) -AC_DEFINE(VERSION,_version_) -AC_DEFINE(PACKAGE,"dvipdfm") +AC_DEFINE(VERSION, _version_, [package version]) +AC_DEFINE(PACKAGE, "dvipdfm", [package name]) -AC_CONFIG_HEADERS(config.h) - -AC_ARG_ENABLE([maint], [ --enable-maint enable autoconf portions of Makefile], - [MAINT=''], [MAINT='#']) -AC_SUBST(MAINT) +AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) dnl Checks for programs. AC_PROG_CC @@ -27,15 +23,14 @@ sinclude(../../libs/libpng/withenable.ac) sinclude(../../libs/zlib/zlib.ac) sinclude(../../libs/libpng/libpng.ac) -AC_DEFINE(KPATHSEA) -AC_DEFINE(HAVE_KPATHSEA) -AC_DEFINE(HAVE_XBASENAME) -AC_DEFINE(HAVE_ZLIB) -AC_DEFINE(HAVE_ZLIB_COMPRESS2) -AC_DEFINE(HAVE_KPSE_FORMATS) -AC_DEFINE(HAVE_OMEGA_FORMATS) -AC_DEFINE(HAVE_TTF_FORMATS) -AC_DEFINE(HAVE_LIBPNG) +AC_DEFINE([HAVE_KPATHSEA], 1, [define if you have kpathsea]) +AC_DEFINE([HAVE_XBASENAME], 1, [define if you have xbasename() in your libkpathsea instead of basename()]) +AC_DEFINE([HAVE_ZLIB], 1, [define if you have zlib and its headers]) +AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [define if your zlib has the compress2 function]) +AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats]) +AC_DEFINE([HAVE_OMEGA_FORMATS], 1, [Define if kpathsea understands Omega (OFM/OVF) formats]) +AC_DEFINE([HAVE_TTF_FORMATS], 1, [define if kpathsea understands TrueType (TTF) formats]) +AC_DEFINE([HAVE_LIBPNG], 1, [define if you have libpng]) TTF_OPT='' AC_SUBST(TTF_OPT) diff --git a/Build/source/texk/dvipdfm/dvipdfm.c b/Build/source/texk/dvipdfm/dvipdfm.c index 4044a6e1223..a75be847743 100644 --- a/Build/source/texk/dvipdfm/dvipdfm.c +++ b/Build/source/texk/dvipdfm/dvipdfm.c @@ -571,7 +571,7 @@ int CDECL main (int argc, char *argv[]) usage(); return 1; } -#ifdef KPATHSEA +#ifdef HAVE_KPATHSEA kpse_set_program_name (argv[0], NULL); #endif @@ -583,7 +583,7 @@ int CDECL main (int argc, char *argv[]) do_args (argc, argv); -#ifdef KPATHSEA +#ifdef HAVE_KPATHSEA kpse_init_prog ("", font_dpi, NULL, NULL); pk_set_dpi (font_dpi); kpse_set_program_enabled (kpse_pk_format, true, kpse_src_texmf_cnf); diff --git a/Build/source/texk/dvipdfm/stamp-aclocal b/Build/source/texk/dvipdfm/stamp-aclocal new file mode 100644 index 00000000000..5cc968fbbf2 --- /dev/null +++ b/Build/source/texk/dvipdfm/stamp-aclocal @@ -0,0 +1 @@ +Fri Feb 29 14:45:04 CET 2008 diff --git a/Build/source/texk/dvipdfm/stamp-auto.in b/Build/source/texk/dvipdfm/stamp-auto.in index 26524463450..2173796e0f7 100644 --- a/Build/source/texk/dvipdfm/stamp-auto.in +++ b/Build/source/texk/dvipdfm/stamp-auto.in @@ -1 +1 @@ -Mo Aug 22 08:29:58 CEST 2005 +Fri Feb 29 14:45:05 CET 2008 |