adapted to wx-config libraries list changes

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

diff --git a/wxwin.m4 b/wxwin.m4
index 2e5d02f6524fd069caa0e436fda0d2158f4fba18..299bb376b3ae905b04e2809f4419c58ad055465e 100644 (file)
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -94,6 +94,10 @@ AC_DEFUN([AM_PATH_WXCONFIG],
      WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
   fi
 
      WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
   fi
 

+  if test "x$4" != "x" ; then
+     wx_config_args="$wx_config_args $4"
+  fi
+

   dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
   if test -x "$WX_CONFIG_NAME" ; then
      AC_MSG_CHECKING(for wx-config)
   dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
   if test -x "$WX_CONFIG_NAME" ; then
      AC_MSG_CHECKING(for wx-config)


@@ -147,11 +151,7 @@ AC_DEFUN([AM_PATH_WXCONFIG],
     if test "x$wx_ver_ok" = x ; then
       no_wx=yes
     else
     if test "x$wx_ver_ok" = x ; then
       no_wx=yes
     else

-      if test "x$4" = "x" ; then
-        wx_libs_arg="--libs"
-      else
-        wx_libs_arg="--libs=$4"
-      fi
+      wx_libs_arg="--libs"

       WX_LIBS=`$WX_CONFIG_WITH_ARGS $wx_libs_arg`
       WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static $wx_libs_arg`
 
       WX_LIBS=`$WX_CONFIG_WITH_ARGS $wx_libs_arg`
       WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static $wx_libs_arg`