2011-01-22 00:12:10 +00:00
|
|
|
# getopt.m4 serial 33
|
2011-01-09 07:33:50 +00:00
|
|
|
dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc.
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
dnl This file is free software; the Free Software Foundation
|
|
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
# Request a POSIX compliant getopt function.
|
|
|
|
AC_DEFUN([gl_FUNC_GETOPT_POSIX],
|
|
|
|
[
|
|
|
|
m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX])
|
|
|
|
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
|
|
|
|
gl_GETOPT_IFELSE([
|
|
|
|
gl_REPLACE_GETOPT
|
|
|
|
],
|
|
|
|
[])
|
|
|
|
])
|
|
|
|
|
|
|
|
# Request a POSIX compliant getopt function with GNU extensions (such as
|
|
|
|
# options with optional arguments) and the functions getopt_long,
|
|
|
|
# getopt_long_only.
|
|
|
|
AC_DEFUN([gl_FUNC_GETOPT_GNU],
|
|
|
|
[
|
|
|
|
m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU])
|
|
|
|
|
|
|
|
AC_REQUIRE([gl_FUNC_GETOPT_POSIX])
|
|
|
|
])
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
# Request the gnulib implementation of the getopt functions unconditionally.
|
|
|
|
# argp.m4 uses this.
|
|
|
|
AC_DEFUN([gl_REPLACE_GETOPT],
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
[
|
2011-01-09 07:33:50 +00:00
|
|
|
dnl Arrange for getopt.h to be created.
|
|
|
|
gl_GETOPT_SUBSTITUTE_HEADER
|
|
|
|
dnl Arrange for unistd.h to include getopt.h.
|
|
|
|
GNULIB_UNISTD_H_GETOPT=1
|
|
|
|
dnl Arrange to compile the getopt implementation.
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
AC_LIBOBJ([getopt])
|
|
|
|
AC_LIBOBJ([getopt1])
|
|
|
|
gl_PREREQ_GETOPT
|
|
|
|
])
|
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
# emacs' configure.in uses this.
|
|
|
|
AC_DEFUN([gl_GETOPT_IFELSE],
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
[
|
2011-01-09 07:33:50 +00:00
|
|
|
AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
|
|
|
|
AS_IF([test -n "$gl_replace_getopt"], [$1], [$2])
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
])
|
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
# Determine whether to replace the entire getopt facility.
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
|
|
|
|
[
|
2011-01-09 07:33:50 +00:00
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
|
|
|
AC_REQUIRE([AC_PROG_AWK]) dnl for awk that supports ENVIRON
|
|
|
|
|
|
|
|
dnl Persuade Solaris <unistd.h> to declare optarg, optind, opterr, optopt.
|
|
|
|
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
|
|
|
|
|
|
|
|
gl_CHECK_NEXT_HEADERS([getopt.h])
|
|
|
|
if test $ac_cv_header_getopt_h = yes; then
|
|
|
|
HAVE_GETOPT_H=1
|
|
|
|
else
|
|
|
|
HAVE_GETOPT_H=0
|
|
|
|
fi
|
|
|
|
AC_SUBST([HAVE_GETOPT_H])
|
|
|
|
|
|
|
|
gl_replace_getopt=
|
|
|
|
|
|
|
|
dnl Test whether <getopt.h> is available.
|
|
|
|
if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
|
|
|
|
AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes])
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Test whether the function getopt_long is available.
|
|
|
|
if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
|
|
|
|
AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes])
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
fi
|
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
dnl BSD getopt_long uses an incompatible method to reset option processing.
|
|
|
|
dnl Existence of the variable, in and of itself, is not a reason to replace
|
|
|
|
dnl getopt, but knowledge of the variable is needed to determine how to
|
|
|
|
dnl reset and whether a reset reparses the environment.
|
|
|
|
dnl Solaris supports neither optreset nor optind=0, but keeps no state that
|
|
|
|
dnl needs a reset beyond setting optind=1; detect Solaris by getopt_clip.
|
|
|
|
if test -z "$gl_replace_getopt"; then
|
|
|
|
AC_CHECK_DECLS([optreset], [],
|
|
|
|
[AC_CHECK_DECLS([getopt_clip], [], [],
|
|
|
|
[[#include <getopt.h>]])
|
|
|
|
],
|
|
|
|
[[#include <getopt.h>]])
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
fi
|
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
dnl mingw's getopt (in libmingwex.a) does weird things when the options
|
|
|
|
dnl strings starts with '+' and it's not the first call. Some internal state
|
|
|
|
dnl is left over from earlier calls, and neither setting optind = 0 nor
|
|
|
|
dnl setting optreset = 1 get rid of this internal state.
|
|
|
|
dnl POSIX is silent on optind vs. optreset, so we allow either behavior.
|
|
|
|
dnl POSIX 2008 does not specify leading '+' behavior, but see
|
|
|
|
dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on
|
|
|
|
dnl the next version of POSIX. For now, we only guarantee leading '+'
|
|
|
|
dnl behavior with getopt-gnu.
|
|
|
|
if test -z "$gl_replace_getopt"; then
|
|
|
|
AC_CACHE_CHECK([whether getopt is POSIX compatible],
|
|
|
|
[gl_cv_func_getopt_posix],
|
|
|
|
[
|
|
|
|
dnl This test fails on mingw and succeeds on many other platforms.
|
|
|
|
AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP
|
|
|
|
# define OPTIND_MIN 0
|
|
|
|
#else
|
|
|
|
# define OPTIND_MIN 1
|
|
|
|
#endif
|
|
|
|
|
|
|
|
int
|
|
|
|
main ()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int argc = 0;
|
|
|
|
char *argv[10];
|
|
|
|
int c;
|
|
|
|
|
|
|
|
argv[argc++] = "program";
|
|
|
|
argv[argc++] = "-a";
|
|
|
|
argv[argc++] = "foo";
|
|
|
|
argv[argc++] = "bar";
|
|
|
|
argv[argc] = NULL;
|
|
|
|
optind = OPTIND_MIN;
|
|
|
|
opterr = 0;
|
|
|
|
|
|
|
|
c = getopt (argc, argv, "ab");
|
|
|
|
if (!(c == 'a'))
|
|
|
|
return 1;
|
|
|
|
c = getopt (argc, argv, "ab");
|
|
|
|
if (!(c == -1))
|
|
|
|
return 2;
|
|
|
|
if (!(optind == 2))
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
/* Some internal state exists at this point. */
|
|
|
|
{
|
|
|
|
int argc = 0;
|
|
|
|
char *argv[10];
|
|
|
|
int c;
|
|
|
|
|
|
|
|
argv[argc++] = "program";
|
|
|
|
argv[argc++] = "donald";
|
|
|
|
argv[argc++] = "-p";
|
|
|
|
argv[argc++] = "billy";
|
|
|
|
argv[argc++] = "duck";
|
|
|
|
argv[argc++] = "-a";
|
|
|
|
argv[argc++] = "bar";
|
|
|
|
argv[argc] = NULL;
|
|
|
|
optind = OPTIND_MIN;
|
|
|
|
opterr = 0;
|
|
|
|
|
|
|
|
c = getopt (argc, argv, "+abp:q:");
|
|
|
|
if (!(c == -1))
|
|
|
|
return 4;
|
|
|
|
if (!(strcmp (argv[0], "program") == 0))
|
|
|
|
return 5;
|
|
|
|
if (!(strcmp (argv[1], "donald") == 0))
|
|
|
|
return 6;
|
|
|
|
if (!(strcmp (argv[2], "-p") == 0))
|
|
|
|
return 7;
|
|
|
|
if (!(strcmp (argv[3], "billy") == 0))
|
|
|
|
return 8;
|
|
|
|
if (!(strcmp (argv[4], "duck") == 0))
|
|
|
|
return 9;
|
|
|
|
if (!(strcmp (argv[5], "-a") == 0))
|
|
|
|
return 10;
|
|
|
|
if (!(strcmp (argv[6], "bar") == 0))
|
|
|
|
return 11;
|
|
|
|
if (!(optind == 1))
|
|
|
|
return 12;
|
|
|
|
}
|
|
|
|
/* Detect MacOS 10.5, AIX 7.1 bug. */
|
|
|
|
{
|
|
|
|
char *argv[3] = { "program", "-ab", NULL };
|
|
|
|
optind = OPTIND_MIN;
|
|
|
|
opterr = 0;
|
|
|
|
if (getopt (2, argv, "ab:") != 'a')
|
|
|
|
return 13;
|
|
|
|
if (getopt (2, argv, "ab:") != '?')
|
|
|
|
return 14;
|
|
|
|
if (optopt != 'b')
|
|
|
|
return 15;
|
|
|
|
if (optind != 2)
|
|
|
|
return 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
]])],
|
|
|
|
[gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no],
|
|
|
|
[case "$host_os" in
|
|
|
|
mingw*) gl_cv_func_getopt_posix="guessing no";;
|
|
|
|
darwin* | aix*) gl_cv_func_getopt_posix="guessing no";;
|
|
|
|
*) gl_cv_func_getopt_posix="guessing yes";;
|
|
|
|
esac
|
|
|
|
])
|
|
|
|
])
|
|
|
|
case "$gl_cv_func_getopt_posix" in
|
|
|
|
*no) gl_replace_getopt=yes ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
|
|
|
|
AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_getopt_gnu],
|
|
|
|
[# Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
|
|
|
|
# optstring is necessary for programs like m4 that have POSIX-mandated
|
|
|
|
# semantics for supporting options interspersed with files.
|
|
|
|
# Also, since getopt_long is a GNU extension, we require optind=0.
|
|
|
|
# Bash ties 'set -o posix' to a non-exported POSIXLY_CORRECT;
|
|
|
|
# so take care to revert to the correct (non-)export state.
|
|
|
|
dnl GNU Coding Standards currently allow awk but not env; besides, env
|
|
|
|
dnl is ambiguous with environment values that contain newlines.
|
|
|
|
gl_awk_probe='BEGIN { if ("POSIXLY_CORRECT" in ENVIRON) print "x" }'
|
|
|
|
case ${POSIXLY_CORRECT+x}`$AWK "$gl_awk_probe" </dev/null` in
|
|
|
|
xx) gl_had_POSIXLY_CORRECT=exported ;;
|
|
|
|
x) gl_had_POSIXLY_CORRECT=yes ;;
|
|
|
|
*) gl_had_POSIXLY_CORRECT= ;;
|
|
|
|
esac
|
|
|
|
POSIXLY_CORRECT=1
|
|
|
|
export POSIXLY_CORRECT
|
|
|
|
AC_RUN_IFELSE(
|
|
|
|
[AC_LANG_PROGRAM([[#include <getopt.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <string.h>
|
|
|
|
]], [[
|
|
|
|
int result = 0;
|
|
|
|
/* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
|
|
|
|
and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
|
|
|
|
OSF/1 5.1, Solaris 10. */
|
|
|
|
{
|
|
|
|
char *myargv[3];
|
|
|
|
myargv[0] = "conftest";
|
|
|
|
myargv[1] = "-+";
|
|
|
|
myargv[2] = 0;
|
|
|
|
opterr = 0;
|
|
|
|
if (getopt (2, myargv, "+a") != '?')
|
|
|
|
result |= 1;
|
|
|
|
}
|
|
|
|
/* This code succeeds on glibc 2.8, mingw,
|
|
|
|
and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
|
|
|
|
IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */
|
|
|
|
{
|
|
|
|
char *argv[] = { "program", "-p", "foo", "bar", NULL };
|
|
|
|
|
|
|
|
optind = 1;
|
|
|
|
if (getopt (4, argv, "p::") != 'p')
|
|
|
|
result |= 2;
|
|
|
|
else if (optarg != NULL)
|
|
|
|
result |= 4;
|
|
|
|
else if (getopt (4, argv, "p::") != -1)
|
|
|
|
result |= 6;
|
|
|
|
else if (optind != 2)
|
|
|
|
result |= 8;
|
|
|
|
}
|
|
|
|
/* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */
|
|
|
|
{
|
|
|
|
char *argv[] = { "program", "foo", "-p", NULL };
|
|
|
|
optind = 0;
|
|
|
|
if (getopt (3, argv, "-p") != 1)
|
|
|
|
result |= 16;
|
|
|
|
else if (getopt (3, argv, "-p") != 'p')
|
|
|
|
result |= 32;
|
|
|
|
}
|
|
|
|
/* This code fails on glibc 2.11. */
|
|
|
|
{
|
|
|
|
char *argv[] = { "program", "-b", "-a", NULL };
|
|
|
|
optind = opterr = 0;
|
|
|
|
if (getopt (3, argv, "+:a:b") != 'b')
|
|
|
|
result |= 64;
|
|
|
|
else if (getopt (3, argv, "+:a:b") != ':')
|
|
|
|
result |= 64;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
]])],
|
|
|
|
[gl_cv_func_getopt_gnu=yes],
|
|
|
|
[gl_cv_func_getopt_gnu=no],
|
|
|
|
[dnl Cross compiling. Guess based on host and declarations.
|
|
|
|
case $host_os:$ac_cv_have_decl_optreset in
|
|
|
|
*-gnu*:* | mingw*:*) gl_cv_func_getopt_gnu=no;;
|
|
|
|
*:yes) gl_cv_func_getopt_gnu=no;;
|
|
|
|
*) gl_cv_func_getopt_gnu=yes;;
|
|
|
|
esac
|
|
|
|
])
|
|
|
|
case $gl_had_POSIXLY_CORRECT in
|
|
|
|
exported) ;;
|
|
|
|
yes) AS_UNSET([POSIXLY_CORRECT]); POSIXLY_CORRECT=1 ;;
|
|
|
|
*) AS_UNSET([POSIXLY_CORRECT]) ;;
|
|
|
|
esac
|
|
|
|
])
|
|
|
|
if test "$gl_cv_func_getopt_gnu" = "no"; then
|
|
|
|
gl_replace_getopt=yes
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2011-01-09 07:33:50 +00:00
|
|
|
# emacs' configure.in uses this.
|
|
|
|
AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
[
|
2011-01-09 07:33:50 +00:00
|
|
|
GETOPT_H=getopt.h
|
|
|
|
AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
|
|
|
|
[Define to rpl_ if the getopt replacement functions and variables
|
|
|
|
should be used.])
|
|
|
|
AC_SUBST([GETOPT_H])
|
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
2005-07-26 21:43:13 +00:00
|
|
|
])
|
|
|
|
|
|
|
|
# Prerequisites of lib/getopt*.
|
2011-01-09 07:33:50 +00:00
|
|
|
# emacs' configure.in uses this.
|
|
|
|
AC_DEFUN([gl_PREREQ_GETOPT],
|
|
|
|
[
|
|
|
|
AC_CHECK_DECLS_ONCE([getenv])
|
|
|
|
])
|