fixes to wx-config config name matching

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

build/bakefiles/wx.bkl

@@ -65,7 +65,8 @@
             <command>
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
-                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_NAME) $(DESTDIR)$(LIBDIR)/wx/config
+                $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
+                (cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
                 $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
             </command>

configure.in

@@ -3277,15 +3277,19 @@ fi
 
 UNICODE=0
 lib_unicode_suffix=
+wxconfig_filename_unicode="ansi"
 if test "$wxUSE_UNICODE" = "yes"; then
     lib_unicode_suffix=u
+    wxconfig_filename_unicode="unicode"
     UNICODE=1
 fi
 
 lib_debug_suffix=
+wxconfig_filename_debug="release"
 DEBUG_FLAG=0
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
+    wxconfig_filename_debug="debug"
     DEBUG_FLAG=1
 fi
 
@@ -3299,9 +3303,12 @@ WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} |
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
 
+WXCONFIG_DATA_FILE="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${wxconfig_filename_unicode}-${wxconfig_filename_debug}-${WX_RELEASE}"
+
 if test "$cross_compiling" = "yes"; then
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
     TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+    WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}-${host_alias}"
     HOST_SUFFIX="-${host_alias}"
 fi
 
@@ -6174,6 +6181,7 @@ AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 AC_SUBST(WXCONFIG_RPATH)
 AC_SUBST(WXCONFIG_LDFLAGS_GUI)
+AC_SUBST(WXCONFIG_DATA_FILE)
 AC_SUBST(WX_LARGEFILE_FLAGS)
 AC_SUBST(GCC_PRAGMA_FLAGS)
 AC_SUBST(CODE_GEN_FLAGS)
@@ -6275,11 +6283,11 @@ AC_CONFIG_COMMANDS([default],
             
             if test -f wx-config; then
                 chmod +x wx-config
-                mv -f wx-config lib/wx/config/${TOOLCHAIN_NAME}
+                mv -f wx-config lib/wx/config/${WXCONFIG_DATA_FILE}
+                ( cd lib/wx/config ; ${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
                 rm -f wx${TOOLCHAIN_NAME}-config
                 ${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
             fi
-            
             if test -f wx-config-wrapper; then
                 chmod +x wx-config-wrapper
                 mv -f wx-config-wrapper wx-config
@@ -6287,6 +6295,7 @@ AC_CONFIG_COMMANDS([default],
           ],
           [
             TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
+            WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}"
             LN_S="${LN_S}"
           ]
          )

wx-config-wrapper.in

@@ -41,17 +41,18 @@ makeabs()
 }
 
 # these determine wx-config script to use:
-m_toolkit='.*[^u][^d]'
+m_toolkit='.*'
 m_univ='\(univ\)\?'
-m_unicode='u\?'
+m_unicode='\(unicode\|ansi\)'
-m_debug='d\?'
+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`
@@ -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,6 +165,9 @@ for i in $*; do
         --universal)
             m_univ="univ"
             ;;
+        --host=*)
+            m_host="-$optarg"
+            ;;
         *)
             args="$args $i"
             ;;

wx-config.in

@@ -149,7 +149,8 @@ usage()
     cat <<EOF
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--inplace]
                  [--toolkit=TOOLKIT] [--unicode[=yes|no]] [--debug[=yes|no]]
-                 [--universal[=yes|no]] [--version[=VERSION]] [--release]
+                 [--universal[=yes|no]] [--host=HOST]
+                 [--version[=VERSION]] [--release]
                  [--list] [--basename] [--static] [--libs] [--gl-libs]
                  [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
                  [--cc] [--cxx] [--ld] [LIBRARIES]
@@ -182,9 +183,9 @@ in by default.
 --gl-libs option is deprecated, use "--libs gl" instead.
 
 If there are several different builds of wxWidgets installed in same prefix,
-you can use --toolkit, --unicode, --debug, --universal and --version options
+you can use --host, --toolkit, --unicode, --debug, --universal and --version
-to select one of them. Use --list option to show all available builds that
+options to select one of them. Use --list option to show all available builds
-match given criteria.
+that match given criteria.
 
 EOF
 

wxwin.m4

@@ -98,6 +98,9 @@ AC_DEFUN([AM_PATH_WXCONFIG],
      wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
      WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
   fi
+  if test "$cross_compiling" = "yes"; then
+     wx_config_args="$wx_config_args --host=$host_alias"
+  fi
 
   dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
   if test -x "$WX_CONFIG_NAME" ; then