Build fix.

[wxWidgets.git] / wxwin.m4

diff --git a/wxwin.m4 b/wxwin.m4
index 07df4e46796f619ec4fac580fde9504e9ea16fe5..cf3319f817e5bf8b0960941e80675a1592dc0093 100644 (file)
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -7,7 +7,7 @@ dnl        ...
 dnl     AM_OPTIONS_WXCONFIG
 dnl        ...
 dnl        ...
-dnl     AM_PATH_WXCONFIG(2.3.4, wxWin=1)
+dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
 dnl     if test "$wxWin" != 1; then
 dnl        AC_MSG_ERROR([
 dnl                wxWindows must be installed on your system
@@ -23,7 +23,7 @@ dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
 dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
 dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
 dnl
-dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl     LIBS="$LIBS $WX_LIBS"
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -167,8 +167,10 @@ AC_DEFUN([AM_PATH_WXCONFIG],
       dnl what the user actually wants, making this redundant at best.
       dnl For now keep it in case anyone actually used it in the past.
       AC_MSG_CHECKING([for wxWindows static library])
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>&1 > /dev/null`
-      if test -n "$WX_LIBS_STATIC"; then
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
+      if test "x$WX_LIBS_STATIC" = "x"; then
+        AC_MSG_RESULT(no)
+      else
         AC_MSG_RESULT(yes)
       fi
 
@@ -227,6 +229,15 @@ AC_DEFUN([AM_PATH_WXCONFIG],
        ifelse([$3], , :, [$3])
 
     fi
+  else
+
+    WX_CFLAGS=""
+    WX_CPPFLAGS=""
+    WX_CXXFLAGS=""
+    WX_LIBS=""
+    WX_LIBS_STATIC=""
+    ifelse([$3], , :, [$3])
+
   fi
 
   AC_SUBST(WX_CPPFLAGS)