# Extra^2 debug mode, for if things ever get really weird.
[ -z "$WXDEBUG_X" ] || set -x
-# We expect a posix shell, so if this is a Bourne shell,
-# and apparently a few still exist, try for bash or ksh.
-
-if [ ~ = '~' ]
-then
- if (bash -c echo) >/dev/null 2>&1
- then
- exec bash "$0" "$@"
- fi
- if (ksh -c echo) >/dev/null 2>&1
- then
- exec ksh "$0" "$@"
- fi
- echo "$0: this script requires bash or ksh"
- exit 1
-fi
-
# On with some basic stuff, like the ability to die gracefully,
# and to tell people what we are about.
cat 1>&2 <<EOF
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
- [--list] [--host=HOST] [--toolkit=TOOLKIT] [--universal[=yes|no]]
- [--unicode[=yes|no]] [--debug[=yes|no]] [--static[=yes|no]]
- [--version[=VERSION]] [--basename] [--cc] [--cppflags] [--cflags]
- [--cxxflags] [--rescomp] [--libs] [--cxx] [--ld] [--linkdeps]
- [--utility=UTIL] [LIB ...]
-
- wx-config returns information about the wxWidgets libraries available
- on your system. It may be used to retrieve the information you require
- to build applications using these libraries.
-
- If alternative builds of wxWidgets exist on the system, you can use the
- options: --prefix, --host, --toolkit, --unicode, --debug, --static,
- --version and --universal, to select from them. Use the --list option to
- show alternatives available which match specified criteria. The unicode,
- debug, and universal options take an optional yes or no argument, while
- host and version accept posix extended regex. The --utility option will
- return the correct version of UTIL to use with the selected library build.
- --linkdeps returns only static libraries for your makefile link rule deps.
-
- Optional LIB arguments (comma or space separated) may be used to specify
- the wxWidgets libraries that you wish to use. The magic "std" label may
- be used to import all libraries that would be used by default if none were
- specified explicitly. eg. wx-config --libs core,base.
+ [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
+ [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=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,
+ and --libs options. And you may query the properties of this configuration
+ using --query-{host,toolkit,widgetset,chartype,version,linkage}.
+
+ If multiple builds of wxWidgets are available, you can use the options
+ --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
+ wxWidgets libraries that you wish to use. The "std" label may be used to
+ import all libraries that would be used by default if none were specified
+ explicitly, e.g. wx-config --libs core,base. The "all" label may be used
+ to import all libraries that have been compiled which are shown in the
+ list below. The --optional-libs parameter should be followed by a list
+ of libs that should be linked to, but only if they are available.
+
+ Available libraries in this build are:
+ @BUILT_WX_LIBS@
EOF
# configs to this one. Options earlier in the list should be more crucial
# to match well than those that follow. Options specified by the user will
# always take precedence and are not subject to any partial ordering here.
-wxconfig_schema="host toolkit widgetset chartype debugtype flavour version linkage"
+wxconfig_schema="host toolkit widgetset chartype flavour version linkage"
# Options that are expected to generate some output.
wxconfig_output_options="prefix exec_prefix
rescomp
rezflags
libs
+ optional_libs
linkdeps
cc cxx ld
gl_libs"
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.
# Returns NAME if _string is of the form: --NAME[=...]
option_name()
{
- _option_name_temp=${1%%=*}
- echo ${_option_name_temp#--} | tr '-' '_'
+ echo "$1" | sed 's/^--//;s/=.*//' | tr '-' '_'
}
# option_value _string
# Returns FOO if _string is of the form: --option=FOO
option_value()
{
- echo "${1#*=}"
+ echo "$1" | sed 's/^[^=]*=//'
}
# match_field _value _list
{
_match_field_match="$1"
shift
- for _match_field_i; do
+ for _match_field_i do
[ "x$_match_field_i" != "x$_match_field_match" ] || return 0
done
false
_remf_list=''
shift
if [ -n "$_remf_value" ]; then
- for _remf_item; do
+ for _remf_item do
[ "x$_remf_item" = "x$_remf_value" ] ||
_remf_list="${_remf_list:+$_remf_list }$_remf_item"
done
}
# validate_arg _domain _set _name _value
-# Boilerplate to validate an argument and initialise a psuedo-hash.
+# Boilerplate to validate an argument and initialise a pseudo-hash.
# This one is almost reduction into absurdity, and perhaps makes the
# precise action of the argument parser below just a little more
# obscure, but oh so neat and compact to use for multiple option
# with the one liners you see on the page below.
validate_arg()
{
- if match_field "$3" $(eval echo \"\$$1_$2_options\"); then
+ if match_field "$3" `eval echo \"\\\$$1_$2_options\"`; then
eval "$2_options=\"\${$2_options:+\$$2_options }$3\""
eval "$2_option_$3=\"$4\""
return
# at this point, otherwise, it's time to just shut up and listen for
# a moment.
-for arg; do
+for arg do
case "$arg" in
--help|-h)
usage
;;
--*=*)
- _name=$(option_name $arg)
- _value=$(option_value $arg)
+ _name=`option_name $arg`
+ _value=`option_value $arg`
if validate_arg wxconfig input "$_name" "$_value" ||
validate_arg wxconfig yesno "$_name" "$_value"
then
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)
+ _name=`option_name $arg`
if validate_arg wxconfig flag "$_name" yes ||
validate_arg wxconfig output "$_name" yes
then
;;
*)
- # FIXME Surely we can validate the parameters too ...
- input_parameters="${input_parameters:+$input_parameters }$arg"
+ # We validate the parameters later ...
+
+ if [ "$_name" = "cxxflags" ] || [ "$_name" = "cppflags" ] || [ "$_name" = "cflags" ]; then
+ cxx_parameters="${cxx_parameters:+$cxx_parameters }$arg"
+ elif [ "$_name" = "libs" ]; then
+ libs_parameters="${libs_parameters:+$libs_parameters }$arg"
+ elif [ "$_name" = "optional_libs" ]; then
+ optional_libs_parameters="${optional_libs_parameters:+$optional_libs_parameters }$arg"
+ else
+ # normally anything here are unattached arguments and signify an
+ # error but for compatibility with the 2.8 wx-config and,
+ # especially, configure scripts generated using 2.8 wxwin.m4 and
+ # hence doing `wx-config --version base,std`, we ignore anything
+ # following this option, just as 2.8 version used to do
+ if [ "$_name" != "version" ]; then
+ input_parameters="${input_parameters:+$input_parameters }$arg"
+ fi
+ fi
continue
;;
esac
check_yesno_option universal widgetset univ
check_yesno_option unicode chartype unicode ansi
-check_yesno_option debug debugtype debug release
-check_yesno_option static linkage '-static'
-
+check_yesno_option static linkage static
# Dump everything we just read in debug mode.
if [ -n "$WXDEBUG" ]; then
decho
- decho " input parameters = $input_parameters"
+ decho " input parameters = $input_parameters"
+ decho " libs parameters = $libs_parameters"
+ decho " optional-libs parameters = $optional_libs_parameters"
decho " input options = $input_options"
for i in $input_options; do
- decho " $i = $(eval echo \"\$input_option_$i\")"
+ decho " $i = `eval echo \"\\\$input_option_$i\"`"
done
decho " yes/no options = $yesno_options"
for y in $yesno_options; do
- decho " $y = $(eval echo \"\$yesno_option_$y\")"
+ decho " $y = `eval echo \"\\\$yesno_option_$y\"`"
done
decho " flag options = $flag_options"
for f in $flag_options; do
- decho " $f = $(eval echo \"\$flag_option_$f\")"
+ decho " $f = `eval echo \"\\\$flag_option_$f\"`"
done
decho " output options = $output_options"
for o in $output_options; do
- decho " $o = $(eval echo \"\$output_option_$o\")"
+ decho " $o = `eval echo \"\\\$output_option_$o\"`"
done
+ decho " query options = $query_options"
fi
# --------------------------------------------------------------
# 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
- eval echo "\${$1_host}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage}-\${$1_version}\${$1_flavour}"
+ eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
}
# Returns true if this script is for a cross compiled config.
exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
wxconfdir="@libdir@/wx/config"
-installed_configs=$( cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-" )
+installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
is_cross && target="@host_alias@"
# 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_debugtype="@WX_DEBUGTYPE@"
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`
-this_config=$(get_mask this)
# 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_toolkit=${input_option_toolkit:-[^-]+}
-m_widgetset=${input_option_widgetset-(univ)?}
-m_chartype=${input_option_chartype:-(unicode|ansi)}
-m_debugtype=${input_option_debugtype:-(debug|release)}
+m_host=${input_option_host:+"${input_option_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_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_flavour=${m_flavour:-${input_option_flavour-'(-[^-]+)?'}}
+m_version=${input_option_version:-'[0-9]+\.[0-9]+'}
+m_linkage=${input_option_linkage-'?(static)?'}
-configmask="^$(get_mask)$"
+configmask="^`get_mask`$"
# Dump the user specification in debug mode.
decho " m_toolkit = '$m_toolkit'"
decho " m_widgetset = '$m_widgetset'"
decho " m_chartype = '$m_chartype'"
- decho " m_debugtype = '$m_debugtype'"
decho " m_flavour = '$m_flavour'"
decho " m_version = '$m_version'"
decho " m_linkage = '$m_linkage'"
# count_delegates _mask
# Return the number of eligible config files that match _mask
-count_delegates() { count_fields $(find_eligible_delegates $1); }
+count_delegates() { count_fields `find_eligible_delegates $1`; }
# is_set _variablename
# Returns true if $_variablename is initialised.
-is_set() { [ "x$(eval echo \"\${$1-unset}\")" != "xunset" ]; }
+is_set() { [ "x`eval echo \"\\\${$1-unset}\"`" != "xunset" ]; }
+
+# not _cmd _args...
+# true iff _cmd is false
+not() { if "$@"; then false; else true; fi; }
# do_find_best_delegate _unbound-options
# The real worker part of find_best_delegate below. Recurses though all
decho " $_fbd_indent---> unbound options: $*"
fi
- for i; do
+ for i do
if [ "x$WXDEBUG" = "xverbose" ]; then
- decho " ${_fbd_indent}binding '$i' with '$(remove_field $i $*)' still free"
+ decho " ${_fbd_indent}binding '$i' with '`remove_field $i $*`' still free"
[ -z "$_pruned" ] || decho " ${_fbd_indent} --- pruned: $_pruned ---"
fi
if (
eval m_$i=\$this_$i
- _mask="^$(get_mask)$"
+ _mask="^`get_mask`$"
if [ "x$WXDEBUG" = "xverbose" ]; then
decho " ${_fbd_indent} checking: $_mask"
count_delegates "$_mask"
decho " $_fbd_indent $? eligible delegates"
- for d in $(find_eligible_delegates "$_mask"); do
+ for d in `find_eligible_delegates "$_mask"`; do
decho " ${_fbd_indent} $d"
done
- fi
+ fi
count_delegates "$_mask"
_still_eligible=$?
if [ $_still_eligible -eq 1 ]; then
- echo $(find_eligible_delegates "$_mask")
+ echo `find_eligible_delegates "$_mask"`
return
fi
[ "x$WXDEBUG" != "xfindprogress" ] || printf "." 1>&2
[ $_still_eligible -gt 1 ] && [ $# -gt 1 ] &&
- do_find_best_delegate $(remove_field $i $*)
+ do_find_best_delegate `remove_field $i $*`
)
then
decho " ${_fbd_indent}pruning: $i"
_pruned="${_pruned:+$_pruned }$i"
fi
- set $(remove_field $i $*)
+ set `remove_field $i $*`
fi
{
[ $# -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
# This assumes no matching new style config has been found.
find_best_legacy_config()
{
- _legacy_configs=$(find_legacy_configs)
+ _legacy_configs=`find_legacy_configs`
if [ -n "$_legacy_configs" ]; then
- _legacy_mask=$(get_legacy_mask)
+ _legacy_mask=`get_legacy_mask`
for d in $_legacy_configs; do
if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then
echo "$d"
if [ -n "$output_option_list" ]; then
_remains_in_prefix=$installed_configs
- _delegates=$(find_eligible_delegates $configmask)
- _best_delegate=$(find_best_delegate)
+ _delegates=`find_eligible_delegates $configmask`
+ _best_delegate=`find_best_delegate`
if [ "x$WXDEBUG" = "xverbose" ]; then
decho
fi
for d in $_delegates; do
- _remains_in_prefix=$(remove_field $d $_remains_in_prefix)
+ _remains_in_prefix=`remove_field $d $_remains_in_prefix`
done
echo
echo " Default config ${this_exec_prefix+in $this_exec_prefix }will be used for output"
if match_field "$this_config" $_delegates ; then
- _delegates=$(remove_field $this_config $_delegates)
+ _delegates=`remove_field $this_config $_delegates`
else
echo " though it is not installed in: $prefix"
if [ -n "$_best_delegate" ] && [ "x$_best_delegate" != "x$this_config" ]; then
elif [ -z "$_delegates" ]; then
- _last_chance=$(find_best_legacy_config)
+ _last_chance=`find_best_legacy_config`
if [ -n "$_last_chance" ]; then
echo " Specification matches legacy config: $_last_chance"
else
-
+
cat <<-EOF
- No config found to match: $config_spec
- in $wxconfdir
+ No config found to match: $config_spec
+ in $wxconfdir
- Please install the desired library build, or specify a different
- prefix where it may be found. If the library is not installed
- you may call its wx-config directly by specifying its full path.
+ Please install the desired library build, or specify a different
+ prefix where it may be found. If the library is not installed
+ you may call its wx-config directly by specifying its full path.
- EOF
+EOF
fi
echo " to choose between alternate matches."
fi
- _delegates=$(remove_field "$_best_delegate" $_delegates)
+ _delegates=`remove_field "$_best_delegate" $_delegates`
if [ -n "$_delegates" ]; then
echo
done
fi
- _legacy_configs=$(find_legacy_configs)
+ _legacy_configs=`find_legacy_configs`
if [ -n "$_legacy_configs" ]; then
echo
echo " Legacy configs available in $prefix:"
for d in $_legacy_configs; do
- echo " ${d%-config}"
+ echo " $d" | sed 's/-config$//'
done
fi
# certain, can this config satisfy the user specification?
# --------------------------------------------------------------
-if ! user_mask_fits "$this_config" ; then
+if not user_mask_fits "$this_config" ; then
# No? Then lets see if it knows anybody who can.
# But first, just be sure someone hasn't typo'd us into a loop.
if [ -n "$WXDEBUG" ]; then
decho " must delegate to an alternate config"
decho " potential delegates ($_numdelegates):"
- for i in $(find_eligible_delegates "$configmask"); do
+ for i in `find_eligible_delegates "$configmask"`; do
decho " $i"
done
fi
if [ $_numdelegates -eq 0 ]; then
- _last_chance=$(find_best_legacy_config)
+ _last_chance=`find_best_legacy_config`
if [ -n "$_last_chance" ]; then
- for arg; do
+ for arg do
case "$arg" in
--prefix*|--exec-prefix*| \
--version|--release|--basename| \
--rezflags|--inplace)
_legacy_args="$_legacy_args $arg"
;;
-
+
--static|--static=y*|--static=Y*)
_legacy_args="$_legacy_args --static"
;;
decho "--> $prefix/bin/$_last_chance $_legacy_args"
fi
- export WXCONFIG_DELEGATED=yes
+ WXCONFIG_DELEGATED=yes
+ export WXCONFIG_DELEGATED
$prefix/bin/$_last_chance $_legacy_args
exit
cat 1>&2 <<-EOF
- Warning: No config found to match: $config_spec
- in $wxconfdir
- If you require this configuration, please install the desired
- library build. If this is part of an automated configuration
- test and no other errors occur, you may safely ignore it.
- You may use wx-config --list to see all configs available in
- the default prefix.
+ Warning: No config found to match: $config_spec
+ in $wxconfdir
+ If you require this configuration, please install the desired
+ library build. If this is part of an automated configuration
+ test and no other errors occur, you may safely ignore it.
+ You may use wx-config --list to see all configs available in
+ the default prefix.
- EOF
+EOF
# PIPEDREAM: from here we are actually just a teensy step
# from simply building the missing config for the user
[ -z "$WXDEBUG" ] || decho " must prune the list of eligible delegates"
- best_delegate=$(find_best_delegate)
+ best_delegate=`find_best_delegate`
if [ -n "$best_delegate" ]; then
-
+
if [ -n "$WXDEBUG" ]; then
decho " found a suitable delegate: $best_delegate"
decho "--> $wxconfdir/$best_delegate $*"
fi
- export WXCONFIG_DELEGATED=yes
+ WXCONFIG_DELEGATED=yes
+ export WXCONFIG_DELEGATED
$wxconfdir/$best_delegate $*
exit
fi
decho " *** Error: Specification is ambiguous"
decho " as $config_spec"
decho " Use additional feature options to choose between:"
- for i in $(find_eligible_delegates "$configmask"); do
+ for i in `find_eligible_delegates "$configmask"`; do
decho " $i"
done
decho
if [ -n "$WXDEBUG" ]; then
decho " using the only suitable delegate"
- decho "--> $wxconfdir/$(find_eligible_delegates $configmask) $*"
+ decho "--> $wxconfdir/`find_eligible_delegates $configmask` $*"
fi
- export WXCONFIG_DELEGATED=yes
- $wxconfdir/$(find_eligible_delegates $configmask) $*
+ WXCONFIG_DELEGATED=yes
+ export WXCONFIG_DELEGATED
+ $wxconfdir/`find_eligible_delegates $configmask` $*
exit
fi
[ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@"
[ -z "$output_option_cc" ] || echo "@CC@"
[ -z "$output_option_cxx" ] || echo "@CXX@"
-[ -z "$output_option_ld" ] || echo "@EXE_LINKER@"
+[ -z "$output_option_ld" ] || echo "@CXX@ -o"
[ -z "$flag_option_selected_config" ] || echo "$this_config"
-# --rezflags is deprecated (2005/11/29)
-[ -z "$output_option_rezflags" ] || echo "@WXCONFIG_POSTLINK_COMMAND@"
+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
+ echo "@true"
+ decho "Warning: --rezflags, along with Mac OS classic resource building" \
+ "is deprecated. You should remove this from your Makefile and" \
+ "build .app bundles instead."
+fi
# The rest are going to need a little more work.
# like the libs, but work with what we've got for now.
is_cross || _util="$exec_prefix/utils/$input_option_utility/$input_option_utility"
- if ! is_installed && [ -x "$_util" ]; then
+ if not is_installed && [ -x "$_util" ]; then
is_static || _preload="eval LD_LIBRARY_PATH=$exec_prefix/lib"
echo $_preload $_util
exit
ldlibs_gl="@OPENGL_LIBS@"
ldlibs_html="@EXTRALIBS_HTML@"
ldlibs_xml="@EXTRALIBS_XML@"
-ldlibs_odbc="@EXTRALIBS_ODBC@"
ldlibs_adv="@EXTRALIBS_SDL@"
+ldlibs_stc="@EXTRALIBS_STC@"
# lib_flags_for _liblist
is_cross && _target="-${target}"
- for lib; do
+ for lib do
# We evidently can't trust people not to duplicate things in
# configure, or to keep them in any sort of sane order overall,
# for sloppy work elsewhere though and @GUI_TK_LIBRARY should
# be fixed.
- for f in $(eval echo \"\$ldflags_$lib\"); do
+ for f in `eval echo \"\\\$ldflags_$lib\"`; do
match_field "$f" $_all_ldflags || _all_ldflags="$_all_ldflags $f"
done
- if match_field "$lib" @CORE_BASE_LIBS@ ; then
+ if match_field "$lib" @STD_BASE_LIBS@ ; then
_libname="@WX_LIBRARY_BASENAME_NOGUI@"
else
_libname="@WX_LIBRARY_BASENAME_GUI@"
if is_static; then
_wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
- for f in $(eval echo \"\$ldlibs_$lib\"); do
+ for f in `eval echo \"\\\$ldlibs_$lib\"`; do
# Only propagate duplicate -libraries to their latest
# possible position. Do not eliminate any other
# We should maybe filter *.a here too, but not unless
# we have to.
case "$f" in
- -l*) _all_libs="$(remove_field $f $_all_libs) $f" ;;
+ -l*) _all_libs="`remove_field $f $_all_libs` $f" ;;
*) _all_libs="$_all_libs $f" ;;
esac
is_cross && _target="-${target}"
- for lib; do
- if match_field "$lib" @CORE_BASE_LIBS@ ; then
+ for lib do
+ if match_field "$lib" @STD_BASE_LIBS@ ; then
_libname="@WX_LIBRARY_BASENAME_NOGUI@"
else
_libname="@WX_LIBRARY_BASENAME_GUI@"
# Sanity check the list of libs the user provided us, if any.
# --------------------------------------------------------------
-wx_libs=$(echo "$input_parameters" | tr ',' ' ')
+wx_libs=`echo "$libs_parameters" | tr ',' ' '`
+wx_optional_libs=`echo "$optional_libs_parameters" | tr ',' ' '`
+
+# Add the --optional-libs, if they've been compiled and aren't already added
+for i in $wx_optional_libs; do
+ if match_field $i @BUILT_WX_LIBS@; then
+ if not match_field $i $wx_libs; then
+ wx_libs="${wx_libs:+$wx_libs }$i"
+ fi
+ fi
+done
[ -z "$WXDEBUG" ] || decho " user supplied libs: '$wx_libs'"
+# Assume we are using the GUI, unless --libs was specified with no GUI libs
+using_gui=yes
+
if is_monolithic; then
- # Core libs are already built into the blob.
- for i in std @CORE_GUI_LIBS@ @CORE_BASE_LIBS@; do
- wx_libs=$(remove_field $i $wx_libs)
- done
+ # Only add additional info if --libs was specified and not just --optional-libs
+ if [ -n "$output_option_libs" ]; then
+ # Core libs are already built into the blob.
+ for i in std @STD_GUI_LIBS@ @STD_BASE_LIBS@; do
+ wx_libs=`remove_field $i $wx_libs`
+ done
- wx_libs="@WXCONFIG_LDFLAGS_GUI@ $(lib_flags_for $wx_libs)"
+ wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`"
- # We still need the core lib deps for a static build though
- if is_static; then
- link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a"
- wx_libs="$wx_libs $link_deps $ldlibs_core @LIBS@"
- else
- wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
+ # We still need the core lib deps for a static build though
+ if is_static; then
+ link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a"
+ wx_libs="$wx_libs $link_deps $ldlibs_core $ldlibs_base"
+ else
+ wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
+ fi
fi
-
- using_gui=yes
-
else # MONOLITHIC = 0
- # Import everything by default, expand std if specified, or add base if omitted.
- if [ -z "$wx_libs" ]; then
- wx_libs="@CORE_GUI_LIBS@ @CORE_BASE_LIBS@"
+ # Import core libs by default, expand std if specified, or add base if omitted.
+ if [ -n "$output_option_libs" ] && [ -z "$libs_parameters" ]; then
+ wx_libs="@STD_GUI_LIBS@ @STD_BASE_LIBS@"
+ elif match_field all $wx_libs; then
+ wx_libs="@BUILT_WX_LIBS@"
elif match_field std $wx_libs; then
# Bubble any libs that were already specified to the end
# of the list and ensure static linking order is retained.
- wx_libs=$(remove_field std $wx_libs)
- for i in @CORE_GUI_LIBS@ @CORE_BASE_LIBS@; do
- wx_libs="$(remove_field $i $wx_libs) $i"
+ wx_libs=`remove_field std $wx_libs`
+ for i in @STD_GUI_LIBS@ @STD_BASE_LIBS@; do
+ wx_libs="`remove_field $i $wx_libs` $i"
done
- elif ! match_field base $wx_libs ; then
- wx_libs="$wx_libs base"
+ elif not match_field base $wx_libs ; then
+ # Only add base if --libs was specified and not just --optional-libs
+ if [ -n "$output_option_libs" ]; then
+ wx_libs="$wx_libs base"
+ fi
fi
- using_gui=no
- for i in $wx_libs ; do
- if match_field "$i" @CORE_GUI_LIBS@ ; then
- _guildflags="@WXCONFIG_LDFLAGS_GUI@"
- using_gui=yes
- break
- fi
- match_field "$i" @CORE_BASE_LIBS@ || using_gui=yes
- done
+ if [ -n "$output_option_libs" ]; then
+ using_gui=no
+ for i in $wx_libs ; do
+ if match_field "$i" @STD_GUI_LIBS@; then
+ _guildflags="@WXCONFIG_LDFLAGS_GUI@"
+ using_gui=yes
+ break
+ fi
+ match_field "$i" @STD_BASE_LIBS@ || using_gui=yes
+ done
+ fi
if is_static; then
- link_deps=$(link_deps_for $wx_libs)
+ link_deps=`link_deps_for $wx_libs`
fi
- wx_libs="$_guildflags $(lib_flags_for $wx_libs)"
+ wx_libs="$_guildflags `lib_flags_for $wx_libs`"
+fi
+
+
+# If they explicitly set "--cxx(pp)flags base" then they don't want the GUI
+if [ "$cxx_parameters" = "base" ]; then
+ using_gui=no
fi
if is_installed; then
_include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
else
- _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
+ _include_cppflags="-I${includedir}"
fi
-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags)
+_cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags`
# now without further ado, we can answer these too.
[ -z "$output_option_cppflags" ] || echo $_cppflags
[ -z "$output_option_cflags" ] || echo $_cppflags "@WXCONFIG_CFLAGS@"
[ -z "$output_option_cxxflags" ] || echo $_cppflags "@WXCONFIG_CXXFLAGS@"
-[ -z "$output_option_gl_libs" ] || echo $(lib_flags_for gl)
+[ -z "$output_option_gl_libs" ] || echo `lib_flags_for gl`
[ -z "$output_option_linkdeps" ] || echo $link_deps
if [ -n "$output_option_libs" ]; then
+ # if --libs [--optional-libs] then output the full linker information
is_cross &&
[ "x$libdir" = "x/usr/${target}/lib" ] ||
is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
echo $_ldflags "@LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"
+
+elif [ -n "$output_option_optional_libs" ]; then
+ # if only --optional-libs then output just the libs
+
+ echo $wx_libs
fi
-# Here you will find all the machine or tool specific workarounds that
-# require knowlege not obtainable prior to passing this comment.
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+#
+# Beyond here reside only machine or tool specific workarounds
+# that require knowlege not obtainable prior to this comment.
+#
+# Please. Avoid addding things here, wx-config should avoid
+# hard coding tool specific details. Do not use things here
+# as an example of other things that should be here, These
+# shouldn't be here either. This is a place of last resort
+# for interim workarounds. I can but stress as strongly as
+# the censor will allow, there are only bad examples of things
+# that belong at this level of abstraction to follow. It is
+# a limbo for glitches awaiting the Next Design Repair. Ok.
+#
+# With that firmly in mind, our debut dilemma is:
-# Resource compilers. A term that covers some pretty
+# Resource compilers. An elusive term that covers some pretty
# dissimilar concepts on various platforms. The good news is,
# each platform has only one definition of 'resource', compiled
# or not, and so we can abstract that neatly to return a platform
case "@RESCOMP@" in
*windres|wrc)
# Note that with late model windres, we could just insert
- # _include_cppflags here, but use the old notation for now
- # as it is more universally accepted.
+ # _include_cppflags here, but use the old notation for now
+ # as it is more universally accepted.
if is_installed; then
echo "@RESCOMP@ --include-dir" \
"${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" \
"@WXCONFIG_RESFLAGS@"
else
echo "@RESCOMP@ --include-dir ${includedir}" \
- "--include-dir ${prefix}/contrib/include" \
- "@WXCONFIG_RESFLAGS@"
+ "@WXCONFIG_RESFLAGS@"
fi
;;
fi
+#
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# And so that's it, we're done. Have a nice build.
projects / wxWidgets.git / blobdiff