From a875749da01dde353a2839c57d7c9b81a5a973a8 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 3 Mar 2008 10:50:54 +0000 Subject: more autotools updates git-svn-id: svn://tug.org/texlive/trunk@6823 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/ChangeLog | 4 ++++ Build/source/reautoconf | 2 +- Build/source/texk/xdvipdfmx/ChangeLog | 10 ++++++++++ Build/source/texk/xdvipdfmx/acinclude.m4 | 9 ++++++--- Build/source/texk/xdvipdfmx/configure.in | 18 +++++++++++++++--- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index e6192c4fe3e..6dfd505212b 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2008-03-03 Peter Breitenlohner + + * reautoconf: run first autoheader, then autoconf. + 2008-02-29 Peter Breitenlohner * configure.in: update (AC_SET_MAKE -> AC_PROG_MAKE_SET). diff --git a/Build/source/reautoconf b/Build/source/reautoconf index 03cdfaa2ecb..b822e97ab91 100755 --- a/Build/source/reautoconf +++ b/Build/source/reautoconf @@ -106,10 +106,10 @@ do_one () { # $base=configure.{in,ac}, $dir=current, $dir/$rdir->./texk/m4 with elif grep 'm4_include(\['$rdir'/kpse_.*\.m4])' aclocal.m4 >/dev/null 2>&1; then $do_say "$0: $dir/$base ... uses KPSE macros" do_it "$TL_ACLOCAL -I $rdir && date >stamp-aclocal" - do_it $TL_AUTOCONF if grep '^kpse_include \.\./make/config.mk$' Makefile.in >/dev/null 2>&1; then do_it "$TL_AUTOHEADER && date >stamp-auto.in" fi + do_it $TL_AUTOCONF elif grep '# Generated by GNU Autoconf 2.6' configure >/dev/null 2>&1; then if test "$force" = yes; then $do_say "$0: $dir/$base ... uses modern autoconf, forced" diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index 7bdaaaad65e..e7fc048fd51 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,5 +1,15 @@ $Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.141 2006/12/11 13:01:38 chofchof Exp $ +ChangeLog: Changes for xdvipdfmx (teTeX / TeX live) +=================================================== + +2008-02-21 Peter Breitenlohner + + Allow maintainer mode to regenerate files. + * configure.in, acinclude.m4: added AC_DEFINES's third arg to + provide autoheader templates. + * configure.in: use AC_DEFINES for XETEX and XETEX_MAC. + ChangeLog: Changes for dvipdfmx =============================== diff --git a/Build/source/texk/xdvipdfmx/acinclude.m4 b/Build/source/texk/xdvipdfmx/acinclude.m4 index 80aa1f7680a..52cf0d57384 100644 --- a/Build/source/texk/xdvipdfmx/acinclude.m4 +++ b/Build/source/texk/xdvipdfmx/acinclude.m4 @@ -185,6 +185,7 @@ struct paper *p; # AC_DEFUN([AC_HAS_LIBFONTCONFIG], [ _cppflags=$CPPFLAGS _ldflags=$LDFLAGS + have_libfontconfig=no AC_ARG_WITH(fontconfig, [ --with-fontconfig=DIR use fontconfig include/library files from DIR], [ @@ -207,6 +208,7 @@ FcObjectSet *os; AC_CHECK_LIB(fontconfig, FcInit, [ AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [Define if you have libfontconfig]) LIBS="$LIBS -lfontconfig" + have_libfontconfig=yes ]) ], [ @@ -292,13 +294,14 @@ AC_DEFUN([AC_HAS_APP_SERVICES], [ ATSFontRef fontRef; ], [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_APP_SERVICES, 1, [Define if you have ApplicationServices (Mac OS X)]) + have_app_services=yes + AC_DEFINE(HAVE_APP_SERVICES, 1, [Define if you have Mac OS X ApplicationServices]) LIBS="$LIBS -framework ApplicationServices" ], [ - AC_MSG_RESULT(no) + have_app_services=no ] ) + AC_MSG_RESULT($have_app_services) ]) diff --git a/Build/source/texk/xdvipdfmx/configure.in b/Build/source/texk/xdvipdfmx/configure.in index d0afa3ddccb..41e4a263241 100644 --- a/Build/source/texk/xdvipdfmx/configure.in +++ b/Build/source/texk/xdvipdfmx/configure.in @@ -9,11 +9,15 @@ AM_MAINTAINER_MODE AC_DEFUN([AC_EXT_TIMEZONE], [AC_MSG_CHECKING([whether time.h defines timezone as an external variable]) AC_TRY_LINK([#include ], [ -timezone; ], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIMEZONE)], [AC_MSG_RESULT(no)])]) + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_TIMEZONE, [], [external timezone variable])], + [AC_MSG_RESULT(no)])]) AC_DEFUN([AC_TZ_HAS_TM_GMTOFF], [AC_MSG_CHECKING([whether struct tz has tm_gmtoff as a member]) AC_TRY_COMPILE([#include ], [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, [], [struct tz has tm_gmtoff])], + [AC_MSG_RESULT(no)])]) dnl Checks for programs. AC_PROG_CC @@ -132,13 +136,21 @@ if test "x$enable_tetex_build" = xyes; then # yes, we have zlib and png. AC_DEFINE(HAVE_ZLIB) AC_DEFINE(HAVE_LIBPNG) - AC_DEFINE(HAVE_FREETYPE2) + AC_DEFINE([HAVE_FREETYPE2], [], [Define if you have freetype2 and its headers]) # You must define HAVE_ZLIB_COMPRESS2 to enable '-z' option for controlling # zlib compression level, but zlib.ac included above does not do this test. # We assume zlib always has compress2() here although that's not always true. AC_DEFINE(HAVE_ZLIB_COMPRESS2, 1, [Define if your zlib has the compress2 function]) + # for tetex/tex live build we may need to define XETEX and XETEX_MAC + if test "x$have_app_services" = xyes; then + AC_DEFINE([XETEX], [], [Define if part of a teTeX/TeX live build.]) + AC_DEFINE([XETEX_MAC], [], [Define if part of a teTeX/TeX live build for Mac OS X.]) + elif test "x$have_libfontconfig" = xyes; then + AC_DEFINE([XETEX]) + fi + # tetex/tex live build; this always has kpathsea, xbasename, etc., # as we're building from current sources. Do this stuff at the end so # other configure tests don't try to link with kpathsea (which doesn't -- cgit v1.2.3