X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetopt.m4;h=6b98782c4bc7710e21fe0fe789cc2af20157db91;hb=95d2aaeab5b8caa01c776d3afa097220cd8982b9;hp=5ab357023e2739a4e20015c10a4038403b6f7d99;hpb=145c669af6422566bda9b408a10c8f0431848fd4;p=gnulib.git diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 5ab357023..6b98782c4 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,10 +1,8 @@ -# getopt.m4 serial 3 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# getopt.m4 serial 11 +dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +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. # The getopt module assume you want GNU getopt, with getopt_long etc, # rather than vanilla POSIX getopt. This means your your code should @@ -12,36 +10,71 @@ dnl the same distribution terms as the rest of that program. AC_DEFUN([gl_GETOPT_SUBSTITUTE], [ - GETOPT_H=getopt.h AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt1]) - AC_DEFINE([optarg], [rpl_optarg], - [Define to rpl_optarg if the replacement variable should be used.]) - AC_DEFINE([optind], [rpl_optind], - [Define to rpl_optind if the replacement variable should be used.]) - AC_DEFINE([optopt], [rpl_optopt], - [Define to rpl_optopt if the replacement variable should be used.]) - AC_DEFINE([getopt], [rpl_getopt], - [Define to rpl_getopt if the replacement function should be used.]) - AC_DEFINE([getopt_long], [rpl_getopt_long], - [Define to rpl_getopt_long if the replacement function should be used.]) - AC_DEFINE([getopt_long_only], [rpl_getopt_long_only], - [Define to rpl_getopt_long_only if the replacement function should be used.]) + gl_GETOPT_SUBSTITUTE_HEADER + gl_PREREQ_GETOPT +]) + +AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], +[ + 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]) ]) -AC_DEFUN([gl_GETOPT], +AC_DEFUN([gl_GETOPT_CHECK_HEADERS], [ - gl_PREREQ_GETOPT + if test -z "$GETOPT_H"; then + AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) + fi - GETOPT_H= - AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) - AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) + if test -z "$GETOPT_H"; then + AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) + fi + + dnl BSD getopt_long uses an incompatible method to reset option processing, + dnl and (as of 2004-10-15) mishandles optional option-arguments. + if test -z "$GETOPT_H"; then + AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include ]) + fi - if test -n "$GETOPT_H"; then - gl_GETOPT_SUBSTITUTE + dnl Solaris 10 getopt doesn't handle `+' as a leading character in an + dnl option string (as of 2005-05-05). + if test -z "$GETOPT_H"; then + AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([#include ], + [[ + char *myargv[3]; + myargv[0] = "conftest"; + myargv[1] = "-+"; + myargv[2] = 0; + return getopt (2, myargv, "+a") != '?'; + ]])], + [gl_cv_func_gnu_getopt=yes], + [gl_cv_func_gnu_getopt=no], + [dnl cross compiling - pessimistically guess based on decls + dnl Solaris 10 getopt doesn't handle `+' as a leading character in an + dnl option string (as of 2005-05-05). + AC_CHECK_DECL([getopt_clip], + [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes], + [#include ])])]) + if test "$gl_cv_func_gnu_getopt" = "no"; then + GETOPT_H=getopt.h + fi fi ]) +AC_DEFUN([gl_GETOPT_IFELSE], +[ + AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) + AS_IF([test -n "$GETOPT_H"], [$1], [$2]) +]) + +AC_DEFUN([gl_GETOPT], [gl_GETOPT_IFELSE([gl_GETOPT_SUBSTITUTE])]) + # Prerequisites of lib/getopt*. AC_DEFUN([gl_PREREQ_GETOPT], [:])