summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-05 14:10:40 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-05 14:10:40 +0000
commitd65aa576328f6698d7e7bf7c65119281cbca0981 (patch)
tree7318465d08d3e5d176bcb4c96a92a65dad6d71dc /Build/source/texk
parentfc6e759582a57b0d59398fb5e923157416fc0055 (diff)
build system update/cleanup
git-svn-id: svn://tug.org/texlive/trunk@18755 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/Makefile.in2
-rwxr-xr-xBuild/source/texk/configure48
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex.c5
3 files changed, 1 insertions, 54 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 852713d6fe6..8b0139a5069 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -76,8 +76,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../utils/xindy/ac/withenable.ac \
$(top_srcdir)/../utils/xindy/ac/xindy.ac \
$(top_srcdir)/../utils/xindy/ac/clisp.ac \
- $(top_srcdir)/../utils/xindy-old/ac/withenable.ac \
- $(top_srcdir)/../utils/xindy-old/ac/xindy.ac \
$(top_srcdir)/../utils/xpdfopen/ac/withenable.ac \
$(top_srcdir)/../texk/web2c/ac/withenable.ac \
$(top_srcdir)/../texk/web2c/ac/web2c.ac \
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index f2d3f76b5a7..6fcc19d5e02 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -674,7 +674,6 @@ enable_xindy_rules
enable_xindy_docs
with_clisp_runtime
with_xindy_recode
-enable_xindy_old
enable_xpdfopen
enable_web2c
with_banner_add
@@ -1472,7 +1471,6 @@ Optional Features:
--enable-xindy build the xindy package
--enable-xindy-rules build and install make-rules package
--enable-xindy-docs build and install documentation
- --enable-xindy-old build the xindy-old package
--disable-xpdfopen do not build the xpdfopen package
--disable-web2c do not build the web2c (TeX & Co.) package
--enable-auto-core cause TeX&MF to dump core, given a certain
@@ -1574,8 +1572,6 @@ Optional Packages:
installed version
--with-recode use `recode' instead of `iconv' to build xindy
[default: no]
- --with-xindy-recode For `xindy': use `recode' instead of `iconv'
- (default is NO)
--with-banner-add=STR add STR to version string appended to banner lines
--with-editor=CMD invoke CMD from the `e' option [vi +%d %s]
--without-mf-x-toolkit do not use X toolkit for METAFONT
@@ -3368,50 +3364,6 @@ fi ;;
esac
-## utils/xindy-old/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy-old/
-## configure options and TL libraries required for xindy-old
-# Check whether --enable-xindy-old was given.
-if test "${enable_xindy_old+set}" = set; then :
- enableval=$enable_xindy_old;
-fi
-case $enable_xindy_old in #(
- yes) :
- if test "x$cross_compiling" = xyes; then :
- as_fn_error "Unable to cross compile xindy-old" "$LINENO" 5
-fi ;; #(
- no) :
- ;; #(
- *) :
- if test "x$cross_compiling" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Cross compiling -> \`--disable-xindy-old'" >&5
-$as_echo "$as_me: Cross compiling -> \`--disable-xindy-old'" >&6;}
- enable_xindy_old=no
- ac_configure_args="$ac_configure_args '--disable-xindy-old'"
- else
- enable_xindy_old=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-xindy-old=$enable_xindy_old'" >&5
-$as_echo "$as_me: Assuming \`--enable-xindy-old=$enable_xindy_old'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-xindy-old=$enable_xindy_old'"
- fi ;;
-esac
-
-## utils/xindy-old/ac/xindy.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy-old/
-## configure options for xindy-old
-# Check whether --enable-xindy-rules was given.
-if test "${enable_xindy_rules+set}" = set; then :
- enableval=$enable_xindy_rules;
-fi
-# Check whether --enable-xindy-docs was given.
-if test "${enable_xindy_docs+set}" = set; then :
- enableval=$enable_xindy_docs;
-fi
-
-# Check whether --with-xindy-recode was given.
-if test "${with_xindy_recode+set}" = set; then :
- withval=$with_xindy_recode;
-fi
-
-
## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/
## configure options and TL libraries required for xpdfopen
# Check whether --enable-xpdfopen was given.
diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c
index f531a5146bc..67dc8d510bb 100644
--- a/Build/source/texk/web2c/synctexdir/synctex.c
+++ b/Build/source/texk/web2c/synctexdir/synctex.c
@@ -274,12 +274,9 @@ Latest Revision: Wed Jul 1 08:15:44 UTC 2009
/* For non-GCC compilation. */
# if !defined(__GNUC__) || (__GNUC__ < 2)
-# if !defined(__GNUC__) || (__GNUC__ < 2)
-# define __attribute__(A)
-# endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
+# define __attribute__(A)
# endif
-
/* In the header file below, TEX-OR-MF-OR-MP is replaced by the real name (tex, etex...)
* Some macros will be redefined and additional headers will be imported */
# include "synctex-TEX-OR-MF-OR-MP.h"