Applied patch [ 1204497 ] fixes for wxwin.m4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxwin.m4 b/wxwin.m4
index c287fc609db9aa9ad07b8b51850a5e98967239b6..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 ---------------------------------------------------------------------------
@@ -229,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)