Use wxCOMPtr throughout wxWebViewIE to simplify the code and reduce the chance of...

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index b06d0e065ff0684f56d6e402f82c6f79175968e7..261e024e9b82474e0ec542c2bf17a955827b9bd8 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -45,23 +45,28 @@ usage()
 
  wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
            [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
 
  wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
            [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]

-           [--universal[=yes|no]] [--unicode[=yes|no]] [--debug[=yes|no]]
-           [--static[=yes|no]] [--version[=VERSION]] [--basename]
-           [--cc] [--cxx] [--cppflags [base]] [--cxxflags [base]] [--cflags]
+           [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
+           [--debug[=yes|no]] [--version[=VERSION]] [--basename] [--cc] [--cxx]
+           [--cppflags [base]] [--cxxflags [base]] [--cflags]

            [--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
            [--libs [LIBS...]] [--optional-libs [LIBS...]]
 
     wx-config returns information about the wxWidgets libraries available on
   your system.  It may be used to retrieve the information required to build
   applications using these libraries using --cppflags, --cxxflags, --cflags,
            [--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
            [--libs [LIBS...]] [--optional-libs [LIBS...]]
 
     wx-config returns information about the wxWidgets libraries available on
   your system.  It may be used to retrieve the information required to build
   applications using these libraries using --cppflags, --cxxflags, --cflags,

-  and --libs options.
+  and --libs options. And you may query the properties of this configuration
+  using --query-{host,toolkit,widgetset,chartype,debugtype,version,linkage}.
+
+    NOTE:    Usage of --debug and --query-debugtype are only relevant if you
+  have any  versions prior to 2.9 installed  and use the --version option to
+  select an earlier version.

 
     If multiple builds of wxWidgets  are available,  you can use the options
 
     If multiple builds of wxWidgets  are available,  you can use the options

-  --prefix, --host, --toolkit, --unicode, --debug, --static, --universal and
-  --version to select from them. The --selected-config option shows the name
-  of the current configuration and --list shows available alternatives which
-  match specified criteria. The --utility option returns the correct version
-  of UTIL to use with the selected build. The --linkdeps option returns only
+  --prefix, --host, --toolkit, --unicode, --static, --universal or --version
+  to select from them.  The  --selected-config  option shows the name of the
+  current configuration and --list  shows available alternatives which match
+  specified criteria.  The  --utility  option returns the correct version of
+  UTIL to use with the selected build.  The  --linkdeps  option returns only

   static libraries for your makefile link rule dependencies.
 
     The LIBS arguments (comma or space separated) may be used to specify the
   static libraries for your makefile link rule dependencies.
 
     The LIBS arguments (comma or space separated) may be used to specify the


@@ -134,6 +139,10 @@ wxconfig_output_options="prefix exec_prefix
 wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
 
 # Input options that accept only a yes or no argument.
 wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
 
 # Input options that accept only a yes or no argument.

+#
+# Notice that this includes "debug" but it is done only for compatibility, this
+# options (i.e. --debug[=yes] or --debug=no) is completely ignored as there is
+# no distinction between debug and release builds in wx any more

 wxconfig_yesno_options="universal unicode debug static"
 
 # Boolean options that do something or not.
 wxconfig_yesno_options="universal unicode debug static"
 
 # Boolean options that do something or not.


@@ -236,13 +245,16 @@ check_yesno_option()
 }
 
 
 }
 
 

+MAC_FRAMEWORK=
+MAC_FRAMEWORK_PREFIX=
+

 
 # Now we are ready to find out what the user wants from us.
 # --------------------------------------------------------------
 
 # With just a little more complexity here we could have shortest
 # unique string matching for options, but that is probably overkill
 
 # Now we are ready to find out what the user wants from us.
 # --------------------------------------------------------------
 
 # With just a little more complexity here we could have shortest
 # unique string matching for options, but that is probably overkill

-# today, so lets just get the job done.
+# today, so let's just get the job done.

 #
 # The important thing now then is that we simply read all input from
 # the user and don't try to act prematurely on partial information.
 #
 # The important thing now then is that we simply read all input from
 # the user and don't try to act prematurely on partial information.


@@ -266,6 +278,15 @@ for arg do
         fi
         ;;
 
         fi
         ;;
 

+    --query-*)
+        _name=`echo $arg | sed 's/^--query-//'`
+        if match_field "$_name" $wxconfig_schema
+        then
+            query_options="${query_options:+$query_options }$_name"
+            continue
+        fi
+        ;;
+

     --*)
         _name=`option_name $arg`
         if validate_arg wxconfig flag   "$_name" yes ||
     --*)
         _name=`option_name $arg`
         if validate_arg wxconfig flag   "$_name" yes ||


@@ -307,8 +328,8 @@ done
 
 check_yesno_option universal widgetset univ
 check_yesno_option unicode chartype unicode ansi
 
 check_yesno_option universal widgetset univ
 check_yesno_option unicode chartype unicode ansi

+check_yesno_option static linkage static

 check_yesno_option debug debugtype debug release
 check_yesno_option debug debugtype debug release

-check_yesno_option static linkage '-static'

 
 # Dump everything we just read in debug mode.
 if [ -n "$WXDEBUG" ]; then
 
 # Dump everything we just read in debug mode.
 if [ -n "$WXDEBUG" ]; then


@@ -333,24 +354,46 @@ if [ -n "$WXDEBUG" ]; then
     for o in $output_options; do
         decho "    $o = `eval echo \"\\\$output_option_$o\"`"
     done
     for o in $output_options; do
         decho "    $o = `eval echo \"\\\$output_option_$o\"`"
     done

+    decho "  query options     = $query_options"

 
 fi
 
 
 
 
 fi
 
 
 

-# Everything came in as a legal argument then, lets put some of
+# Everything came in as a legal argument then, let's put some of

 # the pieces together with a little self knowledge to see what
 # we should do next.
 # --------------------------------------------------------------
 
 # get_mask [ _hash ]
 # the pieces together with a little self knowledge to see what
 # we should do next.
 # --------------------------------------------------------------
 
 # get_mask [ _hash ]

-# Construct a config filename mask from a psuedo-hash of component variables.
+# Construct a config filename mask from a pseudo-hash of component variables.

 # The optional argument is the prefix of the hash to use.  If not specified
 # this will return a mask derived from the command line options that were used.
 get_mask()
 {
     [ $# -gt 0 ] || set m
 # The optional argument is the prefix of the hash to use.  If not specified
 # this will return a mask derived from the command line options that were used.
 get_mask()
 {
     [ $# -gt 0 ] || set m

-    eval echo "\${$1_host}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage}-\${$1_version}\${$1_flavour}"
+
+    case "$m_ourversion" in
+        2.9)
+            is29orlater=1
+            ;;
+        2.*)
+            # there is no 2.10 so currently everything else is <= 2.8
+            is29orlater=0
+            ;;
+        *)
+            # 3.x and later "is29orlater" too
+            is29orlater=1
+            ;;
+    esac
+
+    # use 2.8 or 2.9 version of the mask: the difference is the presence of
+    # debug type in pre-2.9
+    if [ $is29orlater = 1 ]; then
+        eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
+    else
+        eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
+    fi

 }
 
 # Returns true if this script is for a cross compiled config.
 }
 
 # Returns true if this script is for a cross compiled config.


@@ -368,20 +411,19 @@ is_cross && target="@host_alias@"
 
 # Define a pseudo-hash to contain the specification of this wx-config
 # instance and its associated library.
 
 # Define a pseudo-hash to contain the specification of this wx-config
 # instance and its associated library.

-this_host="${target:+${target}-}"
+this_host="${target:+${target}}"

 this_toolkit="@TOOLKIT_DIR@@TOOLKIT_VERSION@"
 this_widgetset="@WIDGET_SET@"
 this_chartype="@WX_CHARTYPE@"
 this_toolkit="@TOOLKIT_DIR@@TOOLKIT_VERSION@"
 this_widgetset="@WIDGET_SET@"
 this_chartype="@WX_CHARTYPE@"

-this_debugtype="@WX_DEBUGTYPE@"
+this_debugtype="release"

 this_flavour="@WX_FLAVOUR@"
 this_version="@WX_RELEASE@"
 this_flavour="@WX_FLAVOUR@"
 this_version="@WX_RELEASE@"

-this_linkage=`[ "x@SHARED@" = "x1" ] || echo '-static'`
+this_linkage=`[ "x@SHARED@" = "x1" ] || echo 'static'`

 
 

-this_config=`get_mask this`

 
 # Extract the user specification from the options parsed.
 m_host=${input_option_host:+"${input_option_host}-?"}
 
 # Extract the user specification from the options parsed.
 m_host=${input_option_host:+"${input_option_host}-?"}

-m_host=${m_host:-${input_option_host-$this_host}}
+m_host=${m_host:-$this_host}

 m_toolkit=${input_option_toolkit:-'[^-]+'}
 m_widgetset=${input_option_widgetset-'(univ)?'}
 m_chartype=${input_option_chartype:-'(unicode|ansi)'}
 m_toolkit=${input_option_toolkit:-'[^-]+'}
 m_widgetset=${input_option_widgetset-'(univ)?'}
 m_chartype=${input_option_chartype:-'(unicode|ansi)'}


@@ -389,7 +431,20 @@ m_debugtype=${input_option_debugtype:-'(debug|release)'}
 m_flavour=${input_option_flavour:+-$input_option_flavour}
 m_flavour=${m_flavour:-${input_option_flavour-'(-[^-]+)?'}}
 m_version=${input_option_version:-'[0-9]+\.[0-9]+'}
 m_flavour=${input_option_flavour:+-$input_option_flavour}
 m_flavour=${m_flavour:-${input_option_flavour-'(-[^-]+)?'}}
 m_version=${input_option_version:-'[0-9]+\.[0-9]+'}

-m_linkage=${input_option_linkage-'(-static)?'}
+m_linkage=${input_option_linkage-'?(static)?'}
+
+# Test whether or not --version has been specified
+#
+# This must be done after getting the input options so get_mask works correctly
+# since it is version-dependent
+
+if [ -z "$input_option_version" ]; then
+    m_ourversion="2.9"
+else
+    m_ourversion=$m_version
+fi
+
+this_config=`get_mask this`

 
 configmask="^`get_mask`$"
 
 
 configmask="^`get_mask`$"
 


@@ -508,7 +563,7 @@ not()               { if "$@"; then false; else true; fi; }
 # and its downhill fast from here if we have to ride that boat.
 # Early pruning still gets that down to under half a second (up from about
 # .25), so we have some breathing space yet before a different search method
 # and its downhill fast from here if we have to ride that boat.
 # Early pruning still gets that down to under half a second (up from about
 # .25), so we have some breathing space yet before a different search method

-# will be called for, but lets not squander it.
+# will be called for, but let's not squander it.

 do_find_best_delegate()
 {
   (
 do_find_best_delegate()
 {
   (


@@ -592,8 +647,7 @@ get_legacy_mask()
 {
     [ $# -gt 0 ] || set m
     eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u
 {
     [ $# -gt 0 ] || set m
     eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u

-    eval [ "x\${$1_debugtype}" != "xdebug" ] || _debug_flag=d
-    eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
+    eval echo "wx\${$1_toolkit}${_unicode_flag}-\${$1_version}\${$1_host}-config"

 }
 
 # find_legacy_configs
 }
 
 # find_legacy_configs


@@ -745,7 +799,7 @@ fi
 
 if not user_mask_fits "$this_config" ; then
 
 
 if not user_mask_fits "$this_config" ; then
 

-    # No?  Then lets see if it knows anybody who can.
+    # No?  Then let's see if it knows anybody who can.

     # But first, just be sure someone hasn't typo'd us into a loop.
     # In present day wx, correct delegation should never need more
     # than one hop so this is trivial to detect.
     # But first, just be sure someone hasn't typo'd us into a loop.
     # In present day wx, correct delegation should never need more
     # than one hop so this is trivial to detect.


@@ -900,6 +954,9 @@ bindir="@bindir@"
 [ -z "$output_option_ld"            ] || echo "@CXX@ -o"
 [ -z "$flag_option_selected_config" ] || echo "$this_config"
 
 [ -z "$output_option_ld"            ] || echo "@CXX@ -o"
 [ -z "$flag_option_selected_config" ] || echo "$this_config"
 

+for q in $query_options; do
+    eval echo "\$this_$q"
+done

 
 # --rezflags is deprecated and disabled (2005/11/29)
 if [ -n "$output_option_rezflags" ]; then
 
 # --rezflags is deprecated and disabled (2005/11/29)
 if [ -n "$output_option_rezflags" ]; then


@@ -978,6 +1035,41 @@ ldlibs_adv="@EXTRALIBS_SDL@"
 ldlibs_stc="@EXTRALIBS_STC@"
 
 
 ldlibs_stc="@EXTRALIBS_STC@"
 
 

+# Order the libraries passed to us correctly for static linking.
+#
+# While the libraries order doesn't matter when linking dynamically, we must
+# put the libraries depending on other libraries in front of their dependencies
+# when linking statically or the dependencies wouldn't be resolved by the
+# standard UNIX linkers.
+order_libs()
+{
+    if is_static; then
+        for lib do
+            # Distinguish between the libraries that may need to be moved to
+            # the end of the list (because other ones may depend on them) and
+            # those that can be output immediately because no other libraries
+            # depend on them.
+            case "$lib" in
+                base|core|html|xml|adv) eval "use_$lib=1" ;;
+                *)                      libs="$libs $lib" ;;
+            esac
+        done
+
+        # Add the libraries that we postponed adding above.
+        # Order of the checks here is important.
+        [ -z "$use_html" ] || libs="$libs html"
+        [ -z "$use_adv" ] || libs="$libs adv"
+        [ -z "$use_core" ] || libs="$libs core"
+        [ -z "$use_xml" ] || libs="$libs xml"
+        [ -z "$use_base" ] || libs="$libs base"
+    else
+        # No need to order them.
+        libs="$@"
+    fi
+
+    echo $libs
+}
+

 # lib_flags_for _liblist
 # This function returns a list of flags suitable to return with the
 # output of --libs for all of the libraries in _liblist.  You can
 # lib_flags_for _liblist
 # This function returns a list of flags suitable to return with the
 # output of --libs for all of the libraries in _liblist.  You can


@@ -1117,6 +1209,7 @@ if is_monolithic; then
             wx_libs=`remove_field $i $wx_libs`
         done
 
             wx_libs=`remove_field $i $wx_libs`
         done
 

+        wx_libs=`order_libs $wx_libs`

         wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`"
 
         # We still need the core lib deps for a static build though
         wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`"
 
         # We still need the core lib deps for a static build though


@@ -1163,6 +1256,7 @@ else    # MONOLITHIC = 0
     if is_static; then
         link_deps=`link_deps_for $wx_libs`
     fi
     if is_static; then
         link_deps=`link_deps_for $wx_libs`
     fi

+    wx_libs=`order_libs $wx_libs`

     wx_libs="$_guildflags `lib_flags_for $wx_libs`"
 fi
 
     wx_libs="$_guildflags `lib_flags_for $wx_libs`"
 fi
 


@@ -1209,9 +1303,18 @@ if [ -n "$output_option_libs" ]; then
         [ "x$libdir" = "x/usr/lib" ]            ||
         _ldflags="-L$libdir"
 
         [ "x$libdir" = "x/usr/lib" ]            ||
         _ldflags="-L$libdir"
 

+    if [ -n "$MAC_FRAMEWORK" ]; then
+       wx_libs="-framework $MAC_FRAMEWORK"
+       if [ -n "$MAC_FRAMEWORK_PREFIX" ]; then
+           _ldflags="-F$MAC_FRAMEWORK_PREFIX"
+       else
+           _ldflags=""
+       fi
+    fi
+

     is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
 
     is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
 

-    echo $_ldflags "@LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"
+    echo $_ldflags "@WXCONFIG_LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"

 
 elif [ -n "$output_option_optional_libs" ]; then
     # if only --optional-libs then output just the libs
 
 elif [ -n "$output_option_optional_libs" ]; then
     # if only --optional-libs then output just the libs