summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL6
-rw-r--r--Build/source/texk/xdvik/Makefile.in2
-rw-r--r--Build/source/texk/xdvik/aclocal.m42
-rw-r--r--Build/source/texk/xdvik/c-auto.in6
-rwxr-xr-xBuild/source/texk/xdvik/configure51
-rw-r--r--Build/source/texk/xdvik/configure.ac4
-rw-r--r--Build/source/texk/xdvik/m4/xdvi-cc-concat.m421
-rw-r--r--Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m421
-rw-r--r--Build/source/texk/xdvik/tests/Makefile.in2
9 files changed, 7 insertions, 108 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 5a1d106761e..ecb7fc5c9aa 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,12 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2012-02-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Drop XDVI_CC_CONCAT and XDVI_SYS_SUNOS_4, the
+ results are not used.
+ * m4/xdvi-cc-concat.m4, m4/xdvi-sys-sunos4.m4: Removed.
+
2011-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index f769593b5bb..a8a00280c86 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -55,7 +55,6 @@ bin_PROGRAMS = xdvi-bin$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
- $(top_srcdir)/m4/xdvi-cc-concat.m4 \
$(top_srcdir)/m4/xdvi-check-iconv.m4 \
$(top_srcdir)/m4/xdvi-check-langinfo.m4 \
$(top_srcdir)/m4/xdvi-check-xaw.m4 \
@@ -68,7 +67,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
$(top_srcdir)/m4/xdvi-linker-multiple-defns.m4 \
$(top_srcdir)/m4/xdvi-sys-old-linux.m4 \
$(top_srcdir)/m4/xdvi-sys-streams.m4 \
- $(top_srcdir)/m4/xdvi-sys-sunos4.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
diff --git a/Build/source/texk/xdvik/aclocal.m4 b/Build/source/texk/xdvik/aclocal.m4
index b48f70ecc98..f6b0b9a2718 100644
--- a/Build/source/texk/xdvik/aclocal.m4
+++ b/Build/source/texk/xdvik/aclocal.m4
@@ -1010,7 +1010,6 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/xdvi-c-bitmap-type.m4])
-m4_include([m4/xdvi-cc-concat.m4])
m4_include([m4/xdvi-check-iconv.m4])
m4_include([m4/xdvi-check-langinfo.m4])
m4_include([m4/xdvi-check-xaw.m4])
@@ -1023,7 +1022,6 @@ m4_include([m4/xdvi-func-working-vsnprintf.m4])
m4_include([m4/xdvi-linker-multiple-defns.m4])
m4_include([m4/xdvi-sys-old-linux.m4])
m4_include([m4/xdvi-sys-streams.m4])
-m4_include([m4/xdvi-sys-sunos4.m4])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
m4_include([../../m4/kpse-t1lib-flags.m4])
diff --git a/Build/source/texk/xdvik/c-auto.in b/Build/source/texk/xdvik/c-auto.in
index 9abc25e4a08..423290d249d 100644
--- a/Build/source/texk/xdvik/c-auto.in
+++ b/Build/source/texk/xdvik/c-auto.in
@@ -59,9 +59,6 @@
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
-/* Define if your C compiler can do string concatenation */
-#undef HAVE_CC_CONCAT
-
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -378,9 +375,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define if you are using SunOS 4.x. */
-#undef SUNOS4
-
/* Define to compile in t1lib. */
#undef T1LIB
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 76601308e2c..c1a70d1f996 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -14651,37 +14651,6 @@ $as_echo "#define HAVE_GOOD_SETSID_VFORK 1" >>confdefs.h
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler supports string concatenation" >&5
-$as_echo_n "checking whether C compiler supports string concatenation... " >&6; }
-if ${xdvi_cv_cc_concat+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-puts("Testing" " string" " concatenation");
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- xdvi_cv_cc_concat=yes
-else
- xdvi_cv_cc_concat=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdvi_cv_cc_concat" >&5
-$as_echo "$xdvi_cv_cc_concat" >&6; }
-if test "x$xdvi_cv_cc_concat" = xyes; then
-
-$as_echo "#define HAVE_CC_CONCAT 1" >>confdefs.h
-
-fi
-
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -14877,26 +14846,6 @@ $as_echo "#define HAVE_STREAMS 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SunOS 4" >&5
-$as_echo_n "checking for SunOS 4... " >&6; }
-if ${xdvi_cv_sys_sunos_4+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case "`(uname -sr) 2>/dev/null`" in #(
- "SunOS 4."*) :
- xdvi_cv_sys_sunos_4=yes ;; #(
- *) :
- xdvi_cv_sys_sunos_4=no ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdvi_cv_sys_sunos_4" >&5
-$as_echo "$xdvi_cv_sys_sunos_4" >&6; }
-if test "x$xdvi_cv_sys_sunos_4" = xyes; then
-
-$as_echo "#define SUNOS4 1" >>confdefs.h
-
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for certain old versions of Linux" >&5
$as_echo_n "checking for certain old versions of Linux... " >&6; }
if ${xdvi_cv_sys_old_linux+:} false; then :
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index e4a7b9a3593..47af960e9c5 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -93,10 +93,8 @@ AC_PATH_XTRA
dnl XDVI checks by Paul Vojta
XDVI_FUNC_SETSID_IN_VFORK
-XDVI_CC_CONCAT
XDVI_C_BITMAP_TYPE
XDVI_SYS_STREAMS
-XDVI_SYS_SUNOS_4
XDVI_SYS_OLD_LINUX
XDVI_FUNC_POLL
diff --git a/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4 b/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4
deleted file mode 100644
index 27d203dcab3..00000000000
--- a/Build/source/texk/xdvik/m4/xdvi-cc-concat.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-# Autoconf macros for xdvik.
-# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net>
-#
-# This file is free software; the copyright holder
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# XDVI_CC_CONCAT
-# --------------
-# Check whether the C compiler does string concatenation.
-AC_DEFUN([XDVI_CC_CONCAT],
-[AC_CACHE_CHECK([whether C compiler supports string concatenation],
- [xdvi_cv_cc_concat],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]],
- [[puts("Testing" " string" " concatenation");]])],
- [xdvi_cv_cc_concat=yes],
- [xdvi_cv_cc_concat=no])])
-if test "x$xdvi_cv_cc_concat" = xyes; then
- AC_DEFINE([HAVE_CC_CONCAT], 1, [Define if your C compiler can do string concatenation])
-fi
-]) # XDVI_CC_CONCAT
diff --git a/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4 b/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4
deleted file mode 100644
index 45e52761355..00000000000
--- a/Build/source/texk/xdvik/m4/xdvi-sys-sunos4.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-# Autoconf macros for xdvik.
-# Copyright (C) 1999 - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net>
-#
-# This file is free software; the copyright holder
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# XDVI_SYS_SUNOS_4
-# ----------------
-# Check for SunOS 4.
-AC_DEFUN([XDVI_SYS_SUNOS_4],
-[AC_CACHE_CHECK([for SunOS 4],
- [xdvi_cv_sys_sunos_4],
- [AS_CASE(["`(uname -sr) 2>/dev/null`"],
- ["SunOS 4."*],
- [xdvi_cv_sys_sunos_4=yes],
- [xdvi_cv_sys_sunos_4=no])])
-if test "x$xdvi_cv_sys_sunos_4" = xyes; then
- AC_DEFINE([SUNOS4], 1, [Define if you are using SunOS 4.x.])
-fi
-]) # XDVI_SYS_SUNOS_4
diff --git a/Build/source/texk/xdvik/tests/Makefile.in b/Build/source/texk/xdvik/tests/Makefile.in
index 5514e7c5ca0..d7b46dcf23d 100644
--- a/Build/source/texk/xdvik/tests/Makefile.in
+++ b/Build/source/texk/xdvik/tests/Makefile.in
@@ -39,7 +39,6 @@ check_PROGRAMS = run_tests$(EXEEXT)
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
- $(top_srcdir)/m4/xdvi-cc-concat.m4 \
$(top_srcdir)/m4/xdvi-check-iconv.m4 \
$(top_srcdir)/m4/xdvi-check-langinfo.m4 \
$(top_srcdir)/m4/xdvi-check-xaw.m4 \
@@ -52,7 +51,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
$(top_srcdir)/m4/xdvi-linker-multiple-defns.m4 \
$(top_srcdir)/m4/xdvi-sys-old-linux.m4 \
$(top_srcdir)/m4/xdvi-sys-streams.m4 \
- $(top_srcdir)/m4/xdvi-sys-sunos4.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 04:56:32 +0000