added support for --libs=std,... syntax in wx-config

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 7613845a12ad3268f086502e69561176742eff68..72bb76d2adb8ad11bf77c426e8435203e17bb926 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -152,6 +152,7 @@ wxHTML:
 
 Unix:
 - fixed priorities of mailcap entries (David Hart)
 
 Unix:
 - fixed priorities of mailcap entries (David Hart)

+- added "wx-config --libs=std,<extra>" syntax (i.e. support for "std")

 
 
 2.5.1
 
 
 2.5.1

diff --git a/wx-config.in b/wx-config.in
index 00633b799238c7b8989aac39ea90a3a2580d9b77..82b7a8aac6443438f9839fdfff0eebfda2cbcb33 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -190,7 +190,8 @@ specification for it to take effect.
 
 --libs can take optional argument that contains comma-separated list of
 wxWidgets libraries to link against. This list can include both core
 
 --libs can take optional argument that contains comma-separated list of
 wxWidgets libraries to link against. This list can include both core

-and contrib libraries.
+and contrib libraries. Special value "std" stands for all libraries linked
+in by default.

 
 --gl-libs option is deprecated, used --libs=gl instead.
 
 
 --gl-libs option is deprecated, used --libs=gl instead.
 


@@ -322,12 +323,14 @@ while test $# -gt 0; do
           libs="-L${libdir}"
       fi
 
           libs="-L${libdir}"
       fi
 

+      # it's simpler to avoid handling "bae" itself at all as we add it in the
+      # end to the list of libraries anyhow

       # in monolithic build, link against the main library:
       if test "$is_monolithic" = "1" ; then
           # filter out core libs, leave only contrib in libs_list:
           newlist=
           for i in $libs_list ; do
       # in monolithic build, link against the main library:
       if test "$is_monolithic" = "1" ; then
           # filter out core libs, leave only contrib in libs_list:
           newlist=
           for i in $libs_list ; do

-              if isinlist $i $CORE_BASE_LIBS $CORE_GUI_LIBS ; then
+              if isinlist $i $CORE_GUI_LIBS $CORE_BASE_LIBS; then

                   libs_list="" # do nothing
               else
                   newlist="$newlist $i"
                   libs_list="" # do nothing
               else
                   newlist="$newlist $i"


@@ -343,6 +346,33 @@ while test $# -gt 0; do
               echo $libs ${LDFLAGS} ${WXCONFIG_LDFLAGS_GUI} ${WXCONFIG_RPATH} $contrib_libs ${WXCONFIG_LIBS} ${DMALLOC_LIBS}
           fi
       else
               echo $libs ${LDFLAGS} ${WXCONFIG_LDFLAGS_GUI} ${WXCONFIG_RPATH} $contrib_libs ${WXCONFIG_LIBS} ${DMALLOC_LIBS}
           fi
       else

+          # we may need to replace "std" alias with its expansion
+          newlist=
+          hadstd=0
+          for i in $libs_list; do
+              case $i in
+                  std)
+                    hadstd=1
+                    ;;
+
+                  base)
+                    # if we have std, we're going to add base anyhow, avoid
+                    # having it twice in the end
+                    if [ $hadstd = 0 ]; then
+                        newlist="$newlist $i";
+                    fi
+                    ;;
+
+                  *)
+                    newlist="$newlist $i"
+                    ;;
+              esac
+          done
+          libs_list="$newlist"
+          if [ $hadstd = 1 ]; then
+              libs_list="$libs_list $CORE_GUI_LIBS $CORE_BASE_LIBS"
+          fi
+

           # in multilib mode, link against all sublibraries:
           wxlibs=`output_libs $libs_list`
           guildflags=`get_ldflags_gui $libs_list`
           # in multilib mode, link against all sublibraries:
           wxlibs=`output_libs $libs_list`
           guildflags=`get_ldflags_gui $libs_list`