diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-27 09:46:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-27 09:46:39 +0000 |
commit | 548c801baf05f4a158b42c8de28378a2a44bfa89 (patch) | |
tree | e2ee4779c72604a8838da3a8c6fe2e3774db0a20 /Build/source/texk/xdvipdfmx | |
parent | e4da8ade35c41f81e0f39a6fb40af0e50d1e0c8b (diff) |
change ipc default to enabled, remove obsolete files
git-svn-id: svn://tug.org/texlive/trunk@13492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog.TL | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.am.orig | 5 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.in | 15 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/configure.in.orig | 181 |
5 files changed, 20 insertions, 193 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index 8b219260c22..63465352cc1 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -1,6 +1,10 @@ ChangeLog.TL: Changes for xdvipdfmx (teTeX / TeX Live) ====================================================== +2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2009-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac, src/Makefile.am: Do not use CPPFLAGS for required -I flags, leave it for the user. diff --git a/Build/source/texk/xdvipdfmx/Makefile.am b/Build/source/texk/xdvipdfmx/Makefile.am index 74acde13f6b..df1f61b4b1e 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.am +++ b/Build/source/texk/xdvipdfmx/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dtl/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -21,7 +25,3 @@ EXTRA_DIST = \ dist-hook: rm -rf `find $(distdir) -name .svn` -## Eventually delete these files -## -EXTRA_DIST += Makefile.am.orig configure.in.orig - diff --git a/Build/source/texk/xdvipdfmx/Makefile.am.orig b/Build/source/texk/xdvipdfmx/Makefile.am.orig deleted file mode 100644 index 4e989542e83..00000000000 --- a/Build/source/texk/xdvipdfmx/Makefile.am.orig +++ /dev/null @@ -1,5 +0,0 @@ -# SUBDIRS = data src - -# skip the data subdir; we rely on dvipdfmx to provide those files -SUBDIRS = src -ACLOCAL_AMFLAGS = -I m4 diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index e523b09a62f..948a5afa2f6 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -254,9 +254,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 @build_TRUE@SUBDIRS = src -EXTRA_DIST = BUGS ChangeLog.TL contrib data doc index.html \ - style_base.css style_dflt.css style_ie.css style_plain.css \ - Makefile.am.orig configure.in.orig +EXTRA_DIST = \ + BUGS \ + ChangeLog.TL \ + contrib \ + data \ + doc \ + index.html \ + style_base.css \ + style_dflt.css \ + style_ie.css \ + style_plain.css + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/Build/source/texk/xdvipdfmx/configure.in.orig b/Build/source/texk/xdvipdfmx/configure.in.orig deleted file mode 100644 index 0f9f4a615bb..00000000000 --- a/Build/source/texk/xdvipdfmx/configure.in.orig +++ /dev/null @@ -1,181 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/dvipdfmx.c) -AM_INIT_AUTOMAKE(xdvipdfmx, 0.7.3) -AM_CONFIG_HEADER(config.h) -AM_MAINTAINER_MODE - -dnl Checks for programs. -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_LIBTOOL - -AC_SYS_LARGEFILE -AC_FUNC_FSEEKO - -# Building inside teTeX or TeX Live? -AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX installation]) - - -dnl Check for kpathsea library. (required) -if test "x$enable_tetex_build" = xyes; then - # In teTeX and TeX Live, LDFLAGS is passed by texk/Makefile and - # reserved for the user. Therefore we need another variable for the - # loader flags to find the local kpathsea. We use xdvipdfmx_LDFLAGS - # since Automake already sets that up in the link command. - xdvipdfmx_LDFLAGS= - AC_SUBST(xdvipdfmx_LDFLAGS) - - if test ! -d $srcdir/../../texk/kpathsea; then - AC_MSG_ERROR([ -========================================= - -You specified --enable-tetex-build, but I can't find the kpathsea -directory. I expected it to be in $srcdir/../../texk/kpathsea. - -=========================================]) - fi - CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/../../texk -I\$(top_srcdir)/../../texk" - xdvipdfmx_LDFLAGS="-L\$(top_builddir)/../../texk/kpathsea/.libs" - - AM_CONDITIONAL(TDS_VERSION_11, true) - AC_DEFINE([__TDS_VERSION__], 0x200406L) -else - dnl Don't bother going further if we don't have kpse installed. - AC_ARG_WITH(kpathsea, - [ --with-kpathsea=DIR use kpathsea include/library files from DIR], [ - if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - ], [ - if test -d "$prefix"; then - CPPFLAGS="$CPPFLAGS -I$prefix/include" - LDFLAGS="$LDFLAGS -L$prefix/lib" - else - CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" - fi - ]) - - AC_CHECK_LIB(kpathsea, kpse_find_file, [LIBS="-lkpathsea $LIBS"], - AC_MSG_ERROR([kpathsea library not found -This version of xdvipdfmx requires the kpathsea library and its headers. If -you know where it is you might try setting the LDFLAGS environment variable -with -L pointing to the directory containing libkpathsea.a. - ]) - ) - - dnl Check kpathsea support for required formats and funcs. - CHO_CHECK_KPSE_SUPPORT([xdvipdfmx]) - - dnl Check for TDS version kpathsea library supports. - CHO_CHECK_KPSE_TDS_VERSION - - dnl Check for libfreetype, required for xdvipdfmx features - CHO_CHECK_LIBFREETYPE([xdvipdfmx]) -fi - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(unistd.h) -AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h) - -dnl Checks for library functions. -AC_FUNC_MEMCMP -AC_CHECK_FUNCS(open close system getenv mkstemp basename) - -dnl Checks for typedefs, structures, and compiler characteristics. -MAW_EXT_TIMEZONE -MAW_TZ_HAS_TM_GMTOFF - -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_STRUCT_TM -AC_STRUCT_TIMEZONE -AC_C_BIGENDIAN - -AC_CHECK_SIZEOF(char) -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) - - -dnl Check for additonal libraries. - -JFK_HAS_APP_SERVICES -if test "x$have_app_services" = xno; then - CHO_HAS_LIBFONTCONFIG -fi - -# check that it's valid to define XETEX and possibly 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]) -else - AC_MSG_ERROR([fontconfig library or ApplicationServices framework not found. -This version of xdvipdfmx requires either ApplicationServices (on Mac OS X) -or the fontconfig library (on other platforms) to be available, otherwise it -cannot support XeTeX output using standard system-installed fonts. - ]) -fi - -if test "x$enable_tetex_build" = xyes; then - # Get these common libraries from the sources, too. - # Seems like it would be simpler to treat kpathsea this way too, but - # we're just starting from what lcdf-typetools did. - sinclude(../../libs/zlib/withenable.ac) - sinclude(../../libs/zlib/zlib.ac) - - sinclude(../../libs/libpng/withenable.ac) - sinclude(../../libs/libpng/libpng.ac) - - sinclude(../../libs/freetype2/withenable.ac) - sinclude(../../libs/freetype2/freetype2.ac) - - # yes, we have zlib and png. - AC_DEFINE(HAVE_ZLIB) - AC_DEFINE(HAVE_LIBPNG) - 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) - - # 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 - # exist at configure time). - LIBS="-lkpathsea -lm $LIBS" - xdvipdfmx_LDFLAGS="$xdvipdfmx_LDFLAGS $FONTCONFIGLDFLAGS" - AC_SUBST(xdvipdfmx_LDFLAGS) - AC_MSG_NOTICE([tetex build enabled, LIBS now: $LIBS]) -else - CHO_HAS_LIBPAPER - CHO_HAS_ZLIB - CHO_HAS_LIBPNG - -dnl these variables are defined in the tetex case and used in src/Makefile.am. -dnl just let them be empty. - AC_SUBST(LIBPNGCPPFLAGS) - AC_SUBST(LDLIBPNG) - AC_SUBST(LIBPNGDEP) - AC_SUBST(ZLIBCPPFLAGS) - AC_SUBST(LDZLIB) - AC_SUBST(ZLIBDEP) - AC_SUBST(FREETYPE2CPPFLAGS) - AC_SUBST(LDFREETYPE2) - AC_SUBST(FREETYPE2DEP) - AC_SUBST(dvipdfmx_LDFLAGS) - AC_SUBST(xdvipdfmx_LDFLAGS) -fi - -AC_CONFIG_FILES([Makefile data/Makefile src/Makefile]) -AC_OUTPUT - |