X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3d883943914f0a13755e8a6c2b875653d223bed..aad43f17dd150f014137e4e0da7fe603f9600d9c:/wx-config-wrapper.in?ds=sidebyside

diff --git a/wx-config-wrapper.in b/wx-config-wrapper.in
index 05ad8d3ef6..0a69fe6cde 100755
--- a/wx-config-wrapper.in
+++ b/wx-config-wrapper.in
@@ -41,17 +41,18 @@ makeabs()
 }
 
 # these determine wx-config script to use:
-m_toolkit='*'
-m_univ='*'
-m_unicode='*'
-m_debug='*'
-m_version='*.*'
+m_toolkit='.*'
+m_univ='\(univ\)\?'
+m_unicode='\(unicode\|ansi\)'
+m_debug='\(debug\|release\)'
+m_version='[0-9]\+\.[0-9]\+'
+m_host=''
 
 # lists all wx-config scripts that match criteria specified above
 list_wx_config_scripts()
 {
-    mask="${m_toolkit}${m_univ}${m_unicode}${m_debug}-${m_version}"
-        
+    mask="^${m_toolkit}${m_univ}-${m_unicode}-${m_debug}-${m_version}${m_host}$"
+
     # if wx-config was called via wx$TOOLCHAIN_NAME-config symlink,
     # try to extract the mask from it:
     myname=`basename $0`
@@ -63,7 +64,7 @@ list_wx_config_scripts()
     fi
 
     if test -d ${libdir}/wx/config ; then
-        (cd ${libdir}/wx/config/ && ls -1 $mask 2>/dev/null)
+        (cd ${libdir}/wx/config/ && ls -1 | grep "$mask" 2>/dev/null)
     fi
 }
 
@@ -136,23 +137,23 @@ for i in $*; do
             ;;
         --unicode=*)
             if test "x$optarg" = "xyes" ; then
-                m_unicode="u"
+                m_unicode="unicode"
             else
-                m_unicode=""
+                m_unicode="ansi"
             fi
             ;;
         --unicode)
-            m_unicode="u"
+            m_unicode="unicode"
             ;;
         --debug=*)
             if test "x$optarg" = "xyes" ; then
-                m_debug="d"
+                m_debug="debug"
             else
-                m_debug=""
+                m_debug="release"
             fi
             ;;
         --debug)
-            m_debug="d"
+            m_debug="debug"
             ;;
         --universal=*)
             if test "x$optarg" = "xyes" ; then
@@ -164,13 +165,16 @@ for i in $*; do
         --universal)
             m_univ="univ"
             ;;
+        --host=*)
+            m_host="-$optarg"
+            ;;
         *)
             args="$args $i"
             ;;
     esac
 done
 
-args="$args --prefix=$prefix --exec-prefix=$exec_prefix"
+args="--prefix=$prefix --exec-prefix=$exec_prefix $args"
 
 script=`find_wx_config_script`;
 if test "x$script" != "x" ; then