summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-21 08:43:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-21 08:43:06 +0000
commit5f1e1f1009f5ec04c87fdca8d9c1a56651f2391c (patch)
tree8a8179fca400aefbc671bd9e2afa85f4798bfb89 /Build/source/texk/kpathsea
parent5171fa05ebaf022ddbb0783e9b4874c5f587e6fe (diff)
Revert r33105: Avoid Cygwin system getopt() - incompatible with GNU version
git-svn-id: svn://tug.org/texlive/trunk@33246 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/Makefile.am6
-rw-r--r--Build/source/texk/kpathsea/Makefile.in14
-rwxr-xr-xBuild/source/texk/kpathsea/configure20
-rw-r--r--Build/source/texk/kpathsea/configure.ac4
-rw-r--r--Build/source/texk/kpathsea/getopt.h5
6 files changed, 15 insertions, 39 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 58caf311d94..b970eb1b4ad 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac, getopt.h: Revert previous change.
+ Cygwin system getopt() is incompatible with the GNU version.
+
2014-03-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Use Cygwin system getopt().
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index ff15916c27c..de98f01b5ed 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/kpathsea/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -80,11 +80,11 @@ libkpathsea_la_SOURCES = \
xstat.c \
xstrdup.c
-if !CYGWIN_OR_MINGW
+if !MINGW32
libkpathsea_la_SOURCES += \
getopt.c \
getopt1.c
-endif !CYGWIN_OR_MINGW
+endif !MINGW32
if WIN32
if MINGW32
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 1bf9458c02b..6114753f4d1 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -83,9 +83,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@have_EXEEXT_TRUE@am__append_1 = -DEXEEXT=\"$(EXEEXT)\"
-@CYGWIN_OR_MINGW_FALSE@am__append_2 = \
-@CYGWIN_OR_MINGW_FALSE@ getopt.c \
-@CYGWIN_OR_MINGW_FALSE@ getopt1.c
+@MINGW32_FALSE@am__append_2 = \
+@MINGW32_FALSE@ getopt.c \
+@MINGW32_FALSE@ getopt1.c
@MINGW32_TRUE@@WIN32_TRUE@am__append_3 = \
@MINGW32_TRUE@@WIN32_TRUE@ mingw32.c \
@@ -109,8 +109,8 @@ EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/c-auto.in strcasecmp.c \
- strstr.c strtol.c putenv.c $(dist_noinst_SCRIPTS) \
+ $(am__configure_deps) $(srcdir)/c-auto.in strstr.c strtol.c \
+ putenv.c strcasecmp.c $(dist_noinst_SCRIPTS) \
$(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \
$(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \
$(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \
@@ -190,8 +190,8 @@ am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \
xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c xstat.c \
xstrdup.c getopt.c getopt1.c mingw32.c xfseeko.c xftello.c \
win32lib.c knj.c
-@CYGWIN_OR_MINGW_FALSE@am__objects_1 = libkpathsea_la-getopt.lo \
-@CYGWIN_OR_MINGW_FALSE@ libkpathsea_la-getopt1.lo
+@MINGW32_FALSE@am__objects_1 = libkpathsea_la-getopt.lo \
+@MINGW32_FALSE@ libkpathsea_la-getopt1.lo
@MINGW32_TRUE@@WIN32_TRUE@am__objects_2 = libkpathsea_la-mingw32.lo \
@MINGW32_TRUE@@WIN32_TRUE@ libkpathsea_la-xfseeko.lo \
@MINGW32_TRUE@@WIN32_TRUE@ libkpathsea_la-xftello.lo
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index f44ffd19ad0..299689b7dda 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -638,8 +638,6 @@ LTLIBOBJS
have_EXEEXT_FALSE
have_EXEEXT_TRUE
LT_OBJDIR
-CYGWIN_OR_MINGW_FALSE
-CYGWIN_OR_MINGW_TRUE
MINGW32_FALSE
MINGW32_TRUE
WIN32_FALSE
@@ -13562,20 +13560,6 @@ else
fi
-case $host_os in #(
- cygwin* | mingw*) :
- kpse_have_cygwin_or_mingw=yes ;; #(
- *) :
- ;;
-esac
- if test "x$kpse_have_cygwin_or_mingw" = xyes; then
- CYGWIN_OR_MINGW_TRUE=
- CYGWIN_OR_MINGW_FALSE='#'
-else
- CYGWIN_OR_MINGW_TRUE='#'
- CYGWIN_OR_MINGW_FALSE=
-fi
-
LT_OBJDIR="$lt_cv_objdir"
@@ -13852,10 +13836,6 @@ if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then
as_fn_error $? "conditional \"MINGW32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${CYGWIN_OR_MINGW_TRUE}" && test -z "${CYGWIN_OR_MINGW_FALSE}"; then
- as_fn_error $? "conditional \"CYGWIN_OR_MINGW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${have_EXEEXT_TRUE}" && test -z "${have_EXEEXT_FALSE}"; then
as_fn_error $? "conditional \"have_EXEEXT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 3f0372b424e..7a8929756aa 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -60,10 +60,6 @@ fi
fi
KPSE_COND_MINGW32
-AS_CASE([$host_os],
- [cygwin* | mingw*], [kpse_have_cygwin_or_mingw=yes])
-AM_CONDITIONAL([CYGWIN_OR_MINGW],
- [test "x$kpse_have_cygwin_or_mingw" = xyes])
AC_SUBST([LT_OBJDIR], ["$lt_cv_objdir"])
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index e96881d4e6f..8acf05fb4fb 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -47,9 +47,6 @@
extern "C" {
#endif
-#if !defined (__GETOPT_H__)
-/* Avoid to redeclare the getopt API. */
-
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
the argument value is returned here.
@@ -81,8 +78,6 @@ extern KPSEDLL int opterr;
extern KPSEDLL int optopt;
-#endif /* !__GETOPT_H__ */
-
#ifndef __need_getopt
/* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector