diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-12-15 23:50:41 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-12-15 23:50:41 -0500 |
| commit | 5cdd65f3241ce10c66953228daef60df7b3966d1 (patch) | |
| tree | ea8cab37764b7a3eed1a5d9ae5946e145fc35527 /configure.in | |
| parent | 2a6ebe70fb2f7ec97a08dc07214fe2ca571d2780 (diff) | |
| download | postgresql-5cdd65f3241ce10c66953228daef60df7b3966d1.tar.gz | |
Fix up getopt() reset management so it works on recent mingw.
The mingw people don't appear to care about compatibility with non-GNU
versions of getopt, so force use of our own copy of getopt on Windows.
Also, ensure that we make use of optreset when using our own copy.
Per report from Andrew Dunstan. Back-patch to all versions supported
on Windows.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 3a0d43f808..b999b9481a 100644 --- a/configure.in +++ b/configure.in @@ -1328,6 +1328,13 @@ if test "$PORTNAME" = "solaris"; then AC_LIBOBJ(getopt) fi +# mingw has adopted a GNU-centric interpretation of optind/optreset, +# so always use our version on Windows. +if test "$PORTNAME" = "win32"; then + AC_LIBOBJ(getopt) + AC_LIBOBJ(getopt_long) +fi + # Cygwin's erand48() is broken (always returns zero) in some releases, # so force use of ours. if test "$PORTNAME" = "cygwin"; then @@ -1336,13 +1343,13 @@ fi # Win32 support if test "$PORTNAME" = "win32"; then -AC_REPLACE_FUNCS(gettimeofday) -AC_LIBOBJ(kill) -AC_LIBOBJ(open) -AC_LIBOBJ(win32env) -AC_LIBOBJ(win32error) -AC_DEFINE([HAVE_SYMLINK], 1, - [Define to 1 if you have the `symlink' function.]) + AC_REPLACE_FUNCS(gettimeofday) + AC_LIBOBJ(kill) + AC_LIBOBJ(open) + AC_LIBOBJ(win32env) + AC_LIBOBJ(win32error) + AC_DEFINE([HAVE_SYMLINK], 1, + [Define to 1 if you have the `symlink' function.]) fi if test "$with_readline" = yes; then |