Kill bashisms as discussed.

svn path=/trunk/; revision=2341

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 9b544c5..9e5e9ed 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -62,7 +62,8 @@ if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" $srcdir/configure.in >/dev/null; then
       GETTEXTIZE_URL="ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
     fi
 
-    if ! $GETTEXTIZE --version < /dev/null > /dev/null 2>&1; then
+    $GETTEXTIZE --version < /dev/null > /dev/null 2>&1
+    if test $? -ne 0; then
       echo
       echo "**Error**: You must have \`$GETTEXTIZE' installed to compile $PKG_NAME."
       echo "Get $GETTEXTIZE_URL"

diff --git a/macros2/gnome-pkgconfig.m4 b/macros2/gnome-pkgconfig.m4
index 728f88e..94a3ad5 100644 (file)
--- a/macros2/gnome-pkgconfig.m4
+++ b/macros2/gnome-pkgconfig.m4
@@ -12,7 +12,8 @@ AC_DEFUN([GNOME_CHECK_PKGCONFIG],[
        AC_MSG_CHECKING(for pkg-config)
        pkgconfig_required_version=0.8.0
        if test x$have_pkgconfig = xyes ; then
-           if ! $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version; then
+           $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version
+           if test $? -ne 0; then
                echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer."
                echo "*** See http://www.freedesktop.org/software/pkgconfig"
                have_pkgconfig=no