summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-12 16:37:51 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-12 16:37:51 +0000
commiteb5da0fa2dab043786ca8eca9ed5df4453633c4f (patch)
tree2369a1de53c90e5967c83abd726d016e5adcd026 /Build/source/texk
parent1e19065af9e98c874f6b7d1a229868d9ca2f88bc (diff)
regenerated files
git-svn-id: svn://tug.org/texlive/trunk@17820 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/ChangeLog2
-rwxr-xr-xBuild/source/texk/configure16
-rwxr-xr-xBuild/source/texk/dvipng/configure15
3 files changed, 8 insertions, 25 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index 520d6125aab..c1e9486260a 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -945,7 +945,7 @@ Thu Feb 24 13:54:36 1994 Karl Berry (karl@cs.umb.edu)
Mon Feb 21 13:32:30 1994 Karl Berry (karl@cs.umb.edu)
- * Makefile.in (triptrap ...): Defpend on do-kpathsea, to help
+ * Makefile.in (triptrap ...): Depend on do-kpathsea, to help
propagate the paths. From Martyn.
* configure.in: Merge srcdir ==/!= . cases.
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index d69f255e94e..e19ea5a8ab6 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -667,7 +667,6 @@ enable_ipc
enable_omfonts
enable_tex
enable_etex
-enable_ptex
enable_aleph
enable_pdftex
enable_luatex
@@ -1458,7 +1457,6 @@ Optional Features:
versions)
--disable-tex do not compile and install TeX
--enable-etex compile and install e-TeX
- --disable-ptex do not compile and install pTeX
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
--disable-luatex do not compile and install luaTeX
@@ -2589,20 +2587,6 @@ case $enable_etex in #(
*) :
enable_etex=no ;;
esac
-# Check whether --enable-ptex was given.
-if test "${enable_ptex+set}" = set; then :
- enableval=$enable_ptex;
-fi
-case $enable_ptex in #(
- yes|no) :
- ;; #(
- *) :
- enable_ptex=yes ;;
-esac
-
-test "x$enable_web2c:$enable_ptex" = xyes:yes && {
- need_ptexenc=yes
-}
# Check whether --enable-aleph was given.
if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index bc8c5073c4d..582474e9998 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -2183,11 +2183,11 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
- enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+ 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
test_array [0] = 0
;
@@ -2198,11 +2198,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
- enum { N = $2 / 2 - 1 };
int
main ()
{
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };
+ ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
test_array [0] = 0
@@ -13260,7 +13260,6 @@ int
main ()
{
char *data, *data2, *data3;
- const char *cdata2;
int i, pagesize;
int fd, fd2;
@@ -13285,10 +13284,10 @@ main ()
fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
if (fd2 < 0)
return 4;
- cdata2 = "";
- if (write (fd2, cdata2, 1) != 1)
+ data2 = "";
+ if (write (fd2, data2, 1) != 1)
return 5;
- data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+ data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
if (data2 == MAP_FAILED)
return 6;
for (i = 0; i < pagesize; ++i)