aclocal: When checking for `environ', don't find `__environ'.

[cfd] / aclocal.glob

diff --git a/aclocal.glob b/aclocal.glob
index 66358fa..bce4c97 100644 (file)
--- a/aclocal.glob
+++ b/aclocal.glob
@@ -47,7 +47,7 @@ dnl           AC_CHECK_FUNCS.
 
 AC_DEFUN([mdw_CURSES],
 [mdw_CHECK_MANYLIBS([newwin], [ncurses curses],
-                    [AC_DEFINE([HAVE_CURSES], 
+                    [AC_DEFINE([HAVE_CURSES], [1],
                                [Define if you have a curses library.])])
 if test $mdw_cv_lib_newwin != no; then
 AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h curses.h], [break])
@@ -102,7 +102,7 @@ dnl         is defined as a preprocessor symbol.
 
 AC_DEFUN([mdw_DECL_ENVIRON],
 [AC_CACHE_CHECK([for declaration of \`environ'], mdw_cv_environ,
-[AC_EGREP_CPP(environ, 
+[AC_EGREP_CPP([\<environ\>], 
 [#include <sys/types.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -164,9 +164,12 @@ dnl Will fail hopelessly on Python < 1.5.2.  Nobody uses that any more,
 dnl right?
 
 AC_DEFUN([mdw__PYTHON_VERSION],
-[$1 -c 'from sys import *; v = argv[1]; vv = v.split("."); x = 0
+[changequote(<:, :>)dnl
+test -x $1 && dnl
+"$1" -c 'from sys import *; v = argv[1]; vv = v.split("."); x = 0
 for i in range(len(vv)): x = x | (int(vv[i]) << (24 - i * 8))
-exit(x > hexversion)' $2])
+exit(x > hexversion)' $2dnl
+changequote([, ])])
 
 dnl --- *@-mdw_PROG_PYTHON-@* ---
 dnl
@@ -197,7 +200,7 @@ if test -z "$PYTHON"; then
 [AC_CACHE_CHECK([for Python version $1 or later], mdw_cv_prog_python,
 [mdw_cv_prog_python="none"
 for p in `echo "$PATH:/usr/local/bin" | tr ":" " "`; do
-  case $p in /*) ;; *) p=`pwd`/$p ;; esac
+  case "$p" in /*) ;; *) p=`pwd`/$p ;; esac
   if mdw__PYTHON_VERSION(["$p/python"], $1); then
     mdw_cv_prog_python="$p/python"
     break
@@ -230,7 +233,7 @@ dnl         variable actually works and is of the right version.  If it's
 dnl            not, an error is raised and configuration is aborted.
 
 AC_DEFUN([mdw_CHECK_PYTHON],
-[mdw_REQUIRE([mdw_PROG_PYTHON], [mdw_PROG_PYTHON([$1])])
+[AC_REQUIRE([mdw_PROG_PYTHON], [mdw_PROG_PYTHON([$1])])
 AC_MSG_CHECKING([whether Python ($PYTHON) works])
 if test "$PYTHON" != "none" && mdw__PYTHON_VERSION("$PYTHON", $1); then
   AC_MSG_RESULT([yes])
@@ -246,8 +249,9 @@ dnl
 dnl AC_DEFUN relies on `[', `]' being quotes, so I have to drop down a level.
 
 AC_DEFUN([mdw__PERL_VERSION], [mdw__PERL_VERSION_hack([$1], [$2])])
-changequote(<<, >>)
-define(<<mdw__PERL_VERSION_hack>>, <<$1 -e 'exit ($] < $2);' >&5 2>&5>>)
+changequote(<:, :>)
+define(<:mdw__PERL_VERSION_hack:>, 
+<:test -x $1 && $1 -e 'exit ($] < $2);' >&5 2>&5:>)
 changequote([, ])
 
 dnl --- *@-mdw_PROG_PERL-@* ---
@@ -278,7 +282,7 @@ if test -z "$PERL"; then
 [AC_CACHE_CHECK([for Perl version $1 or later], mdw_cv_prog_perl,
 [mdw_cv_prog_perl="none"
 for p in `echo "$PATH:/usr/local/bin" | tr ":" " "`; do
-  case $p in /*) ;; *) p=`pwd`/$p ;; esac
+  case "$p" in /*) ;; *) p=`pwd`/$p ;; esac
   if mdw__PERL_VERSION(["$p/perl"], $1); then
     mdw_cv_prog_perl="$p/perl"
     break
@@ -311,7 +315,7 @@ dnl         variable actually works and is of the right version.  If it's
 dnl            not, an error is raised and configuration is aborted.
 
 AC_DEFUN([mdw_CHECK_PERL],
-[mdw_REQUIRE([mdw_PROG_PERL], [mdw_PROG_PERL([$1])])
+[AC_REQUIRE([mdw_PROG_PERL], [mdw_PROG_PERL([$1])])
 AC_MSG_CHECKING([whether Perl ($PERL) works])
 if test "$PERL" != "none" && mdw__PERL_VERSION("$PERL", $1); then
   AC_MSG_RESULT([yes])
@@ -349,7 +353,7 @@ AC_SUBST(NEEDED_PERLLIBS)dnl
 
 AC_DEFUN([mdw_PERLLIB_CHECK],
 [AC_REQUIRE([mdw__PERLLIB_INIT])
-mdw_REQUIRE([mdw_CHECK_PERL], [mdw_PROG_PERL([5])])
+AC_REQUIRE([mdw_CHECK_PERL], [mdw_PROG_PERL([5])])
 AC_CACHE_CHECK([for Perl library $1], mdw_cv_perllib_$1,
 [if $PERL -e 'use $1;' >&5 2>&5; then
   mdw_cv_perllib_$1="yes"
@@ -490,7 +494,7 @@ dnl
 dnl Use:       Configures an mgLib client program.
 
 AC_DEFUN([mdw_MGLIB],
-[mdw_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
+[AC_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
 mdw_LIB_CONFIG(mgLib, mgLib, $@)])
 
 dnl --- *@-mdw_CATACOMB-@* ---
@@ -506,7 +510,7 @@ dnl
 dnl Use:       Configures the program as a Catacomb client.
 
 AC_DEFUN([mdw_CATACOMB],
-[mdw_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
+[AC_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
 mdw_LIB_CONFIG(catacomb, Catacomb, $@)])
 
 dnl --- *@-mdw_PK-@* ---
@@ -522,7 +526,7 @@ dnl
 dnl Use:       Configures the program as a PK client.
 
 AC_DEFUN([mdw_PK],
-[mdw_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
+[AC_REQUIRE([mdw_MLIB], [mdw_MLIB([2.0.3])])
 mdw_LIB_CONFIG(pk, PK, $@)])
 
 dnl --- *@-mdw_OPT_NDEBUG-@* ---