X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9103d280f902cfafdd11a7be3f2d04afaec00e5c..b2b98dfd4bdc302ee2e3f6a2112fb103d1655174:/wx-config.in?ds=inline diff --git a/wx-config.in b/wx-config.in index 7757bc1a7e..cf3a6b9dc5 100755 --- a/wx-config.in +++ b/wx-config.in @@ -17,8 +17,11 @@ # Licence: wxWindows licence ############################################################################ +# Extra^2 debug mode, for if things ever get really weird. +[ -z "$WXDEBUG_X" ] || set -x -# Start with some basic stuff, like the ability to die gracefully, + +# On with some basic stuff, like the ability to die gracefully, # and to tell people what we are about. # ------------------------------------------------------------------ @@ -28,8 +31,14 @@ decho() { echo "$*" 1>&2; } # usage _exitcode # Outputs a usage message to stderr and exits with _exitcode. -# Try to keep this to a single page. We can add alternate help -# targets if people want more detail from interactive help. +# Try to keep this to a single page (ie. < 25 lines). We can add +# alternate or interactive help targets if people want more detail. +# +# Exit codes are now subject to a more strict interpretation. +# wx-config should return 0 upon successful operation, 1 if the +# reqested operation could not be completed successfully, and 2 +# if the requested operation is not supported by this version of +# wx-config. usage() { cat 1>&2 < /dev/null && ls | grep -v "^inplace-" ) +installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` -target="@host_alias@" +is_cross && target="@host_alias@" # Define a pseudo-hash to contain the specification of this wx-config # instance and its associated library. @@ -327,23 +350,23 @@ this_chartype="@WX_CHARTYPE@" this_debugtype="@WX_DEBUGTYPE@" this_flavour="@WX_FLAVOUR@" this_version="@WX_RELEASE@" -this_linkage=$( [ @SHARED@ -eq 1 ] || 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=${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_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_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. @@ -371,87 +394,8 @@ fi -# The only action we can perform authoritatively prior to delegation -# is to list all the possible delegates. -# -------------------------------------------------------------- - -# find_eligible_delegates _mask -# Outputs all the config files installed which match the -# (extended regex) _mask passed as an argument. -find_eligible_delegates() { echo "$installed_configs" | grep -E "$1" 2> /dev/null; } - -# user_mask_fits _config -# Returns true if the string _config satisfies the user specified mask. -user_mask_fits() { echo "$1" | grep -E "$configmask" > /dev/null 2>&1; } - - -# Next chance for another satisfied customer then -# -# If we want to get really polished here we can do plural checking, -# but we should probably leave that until the day we gettextise it. -# If we have cpu cycles to spare for glitz, we could run the -# find_best_delegate function over the list and mark the one that -# would be used by default if no further disambiguation was to occur. -# FIXME: This is probably useful to do in any case, but lets not -# tangle them up until things settle down again. -if [ -n "$output_option_list" ]; then - - _delegates="$(find_eligible_delegates $configmask)" - - if user_mask_fits "$this_config" ; then - - echo - echo " This config ($this_config) will be used for output." - - if match_field "$this_config" $_delegates ; then - _delegates=$(remove_field $this_config $_delegates) - else - echo " though it is not installed in:" - echo " $wxconfdir" - fi - - if [ -n "$_delegates" ]; then - echo - echo " You can select from the following alternates by explicitly" - echo " specifying additional features to wx-config:" - fi - - elif [ -z "$_delegates" ]; then - - cat <<-EOF - - No config found to match: - $configmask - in $wxconfdir - - This config is: $this_config - - Please install the desired library build, or use --list - without any feature specifiers to see the available configs - for this host. wx-config --list --host=?.* will list all - installed configs including cross builds for other hosts. - - EOF - exit 1 - - else - echo - echo " The following installed configurations match your specification:" - fi - - echo - for i in $_delegates; do echo " $i"; done - [ -z "$_delegates" ] || echo - - exit -fi - - - - - -# From here, we now need to figure out a delegation target. -# -------------------------------------------------------------- +# From here on, we'll need to be able to figure out a delegation target. +# ----------------------------------------------------------------------- # The rules for delegation are: # @@ -492,17 +436,30 @@ fi # But first, more sugar to keep what follows clear and legible. # -------------------------------------------------------------- +# find_eligible_delegates _mask +# Outputs all the config files installed which match the +# (extended regex) _mask passed as an argument. +find_eligible_delegates() { echo "$installed_configs" | $EGREP "$1" 2> /dev/null; } + +# user_mask_fits _config +# Returns true if the string _config satisfies the user specified mask. +user_mask_fits() { echo "$1" | $EGREP "$configmask" > /dev/null 2>&1; } + # count_fields _word # Returns the number of IFS split fields in _word count_fields() { return $#; } # 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 @@ -535,22 +492,22 @@ do_find_best_delegate() 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 @@ -559,15 +516,15 @@ do_find_best_delegate() _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 $*) - ); + [ $_still_eligible -gt 1 ] && [ $# -gt 1 ] && + do_find_best_delegate `remove_field $i $*` + ) then return @@ -578,7 +535,7 @@ do_find_best_delegate() decho " ${_fbd_indent}pruning: $i" _pruned="${_pruned:+$_pruned }$i" fi - set $(remove_field $i $*) + set `remove_field $i $*` fi @@ -594,19 +551,174 @@ do_find_best_delegate() find_best_delegate() { for _fbdi in $wxconfig_schema; do - is_set input_option_$_fbdi || \ + is_set input_option_$_fbdi || _unbound_options="${_unbound_options:+$_unbound_options }$_fbdi" done do_find_best_delegate $_unbound_options } +# Legacy wx-config helpers. +# ------------------------- + +# get_legacy_mask +# Returns a mask in the format used by wx2.4. +get_legacy_mask() +{ + [ $# -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" +} + +# find_legacy_configs +# Returns a list of configs installed by wx2.4 releases. +find_legacy_configs() +{ + ( + cd "$prefix/bin" && + { + ls wx*-2.4-config | grep -v ^wxbase + ls wx*-2.4-config | grep ^wxbase + } + ) 2> /dev/null +} + +# find_best_legacy_config +# Returns the best legacy config for a given specification. +# This assumes no matching new style config has been found. +find_best_legacy_config() +{ + _legacy_configs=`find_legacy_configs` + if [ -n "$_legacy_configs" ]; then + _legacy_mask=`get_legacy_mask` + for d in $_legacy_configs; do + if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then + echo "$d" + return + fi + done + fi + false +} + -# And finally some cereal to sprinkle it all on. + +# The only action we can perform authoritatively prior to delegation +# is to list all the possible delegates. # -------------------------------------------------------------- -# No more messing around, can this config satisfy the user specification? -if ! user_mask_fits "$this_config" ; then +config_spec="$0 $*" +[ -z "$WXDEBUG" ] || config_spec=$configmask + +# Next chance for another satisfied customer then +# +# If we want to get really polished here we can do plural checking, +# but we should probably leave that until the day we gettextise it. +if [ -n "$output_option_list" ]; then + + _remains_in_prefix=$installed_configs + _delegates=`find_eligible_delegates $configmask` + _best_delegate=`find_best_delegate` + + if [ "x$WXDEBUG" = "xverbose" ]; then + decho + decho " all = $_remains_in_prefix" + decho " matching = $_delegates" + decho " best = $_best_delegate" + decho " this = $this_config" + fi + + for d in $_delegates; do + _remains_in_prefix=`remove_field $d $_remains_in_prefix` + done + + echo + echo " Default config is $this_config" + echo + + if user_mask_fits "$this_config" ; then + + 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` + else + echo " though it is not installed in: $prefix" + if [ -n "$_best_delegate" ] && [ "x$_best_delegate" != "x$this_config" ]; then + echo + echo " Best alternate in $prefix:" + echo " $_best_delegate" + fi + fi + + elif [ -n "$_best_delegate" ]; then + + echo " Specification best match: $_best_delegate" + + elif [ -z "$_delegates" ]; then + + _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 + + 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 + + fi + + else + echo " Specification was ambiguous. Use additional feature options" + echo " to choose between alternate matches." + fi + + _delegates=`remove_field "$_best_delegate" $_delegates` + + if [ -n "$_delegates" ]; then + echo + echo " Alternate matches:" + for d in $_delegates; do + echo " $d" + done + fi + if [ -n "$_remains_in_prefix" ]; then + echo + echo " Also available in $prefix:" + for d in $_remains_in_prefix; do + echo " $d" + done + fi + + _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" | sed 's/-config$//' + done + fi + + echo + exit +fi + + + +# ... so if that wasn't what they wanted, then we need to know for +# certain, can this config satisfy the user specification? +# -------------------------------------------------------------- + +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. @@ -619,7 +731,7 @@ if ! user_mask_fits "$this_config" ; then decho decho " to: $0" decho " ($this_config) cannot satisfy:" - decho " $configmask" + decho " $config_spec" decho " Someone has been terribly careless." decho exit 1 @@ -631,34 +743,69 @@ if ! user_mask_fits "$this_config" ; then 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 - cat 1>&2 <<-EOF - No config found to match: $configmask - in $wxconfdir - Please install the desired library build, or use --list - without any feature specifiers to see all available configs. + _last_chance=`find_best_legacy_config` + if [ -n "$_last_chance" ]; then + + for arg do + case "$arg" in + --prefix*|--exec-prefix*| \ + --version|--release|--basename| \ + --static|--libs|--gl_libs| \ + --cppflags|--cflags|--cxxflags| \ + --cc|--cxx|--ld| \ + --rezflags|--inplace) + _legacy_args="$_legacy_args $arg" + ;; + + --static|--static=y*|--static=Y*) + _legacy_args="$_legacy_args --static" + ;; + esac + done + + if [ -n "$WXDEBUG" ]; then + decho " found a suitable legacy delegate: $_last_chance" + decho "--> $prefix/bin/$_last_chance $_legacy_args" + fi + + export WXCONFIG_DELEGATED=yes + $prefix/bin/$_last_chance $_legacy_args + exit + + else + + 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. EOF - # PIPEDREAM: This will probably give Vadim an aneurysm if I - # mention it out of context, but from here we are actually - # just a teensy step from simply building the missing config - # for the user on the fly if this is an in tree wx-config. + # PIPEDREAM: from here we are actually just a teensy step + # from simply building the missing config for the user + # on the fly if this is an in tree wx-config. - exit 1 + exit 1 + fi fi if [ $_numdelegates -gt 1 ]; then [ -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 @@ -673,9 +820,10 @@ if ! user_mask_fits "$this_config" ; then fi decho - decho " Specification was ambiguous." + 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 @@ -685,18 +833,16 @@ if ! user_mask_fits "$this_config" ; then 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) $* + $wxconfdir/`find_eligible_delegates $configmask` $* exit fi - - # If we are still here, then from now on we are responsible for # all the user's needs. Time to rustle up some output for them. # -------------------------------------------------------------- @@ -708,35 +854,94 @@ fi # tree prefix to provide the correct output for using this # uninstalled wx build. Or put more simply: prefix=${this_prefix-$prefix} -exec_prefix=${this_prefix-$exec_prefix} +exec_prefix=${this_exec_prefix-$exec_prefix} includedir="@includedir@" libdir="@libdir@" +bindir="@bindir@" # Trivial queries we can answer now. -[ -z "$output_option_prefix" ] || echo $prefix -[ -z "$output_option_exec_prefix" ] || echo $exec_prefix -[ -z "$output_option_release" ] || echo "@WX_RELEASE@" -[ -z "$output_option_version" ] || echo "@WX_VERSION@" -[ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@" -[ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@" -[ -z "$output_option_rezflags" ] || echo $(eval echo @MACRESWXCONFIG@) -[ -z "$output_option_cc" ] || echo "@CC@" -[ -z "$output_option_cxx" ] || echo "@CXX@" -[ -z "$output_option_ld" ] || echo "@EXE_LINKER@" +[ -z "$output_option_prefix" ] || echo $prefix +[ -z "$output_option_exec_prefix" ] || echo $exec_prefix +[ -z "$output_option_release" ] || echo "@WX_RELEASE@" +[ -z "$output_option_version" ] || echo "@WX_VERSION@" +[ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@" +[ -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 "$flag_option_selected_config" ] || echo "$this_config" + + +# --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. # -------------------------------------------------------------- -is_cross() { [ "x@cross_compiling@" = "xyes" ]; } -is_monolithic() { [ @MONOLITHIC@ -eq 1 ]; } +is_monolithic() { [ "x@MONOLITHIC@" = "x1" ]; } +is_static() { [ -n "$this_linkage" ]; } +is_installed() { [ -z "$this_prefix" ]; } +# Is the user after a support utility? +# If this is a cross build, we need to find and return a suitable +# native utility for the job, so we search: +# +# 1. local build dir (for native uninstalled builds only). +# 2. (optional) user supplied prefix. +# 3. configured install prefix. +# 4. environment $PATH. +# +# and if such a thing still cannot be found, exit signalling an error. +if [ -n "$input_option_utility" ]; then + + # This is dumb, in tree binaries should be in a standard location + # 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 not is_installed && [ -x "$_util" ]; then + is_static || _preload="eval LD_LIBRARY_PATH=$exec_prefix/lib" + echo $_preload $_util + exit + fi + + IFS=':' + _user_prefix=${input_option_exec_prefix:-$input_option_prefix} + + for _util in "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" \ + "${input_option_utility}-@WX_RELEASE@" \ + "${input_option_utility}" + do + for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do + + [ -z "$WXDEBUG" ] || decho " checking for: '$p/$_util'" + + if [ -x "$p/$_util" ]; then + echo "$p/$_util" + exit + fi + + done + done + exit 1 + +fi + + +# Still here? Then get the options together for building an app. +# ---------------------------------------------------------------- + # Additional configuration for individual library components. ldflags_gl="@LDFLAGS_GL@" -ldlibs_base="@WXCONFIG_EXTRALIBS@" +ldlibs_base="@WXCONFIG_LIBS@" ldlibs_core="@EXTRALIBS_GUI@" ldlibs_gl="@OPENGL_LIBS@" ldlibs_html="@EXTRALIBS_HTML@" @@ -758,9 +963,9 @@ lib_flags_for() _all_libs='' _wxlibs='' - ! is_cross || _target="-${target}" + 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, @@ -778,7 +983,7 @@ lib_flags_for() # 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 @@ -790,10 +995,24 @@ lib_flags_for() [ $lib = base ] || _libname="${_libname}_$lib" _libname="${_libname}-@WX_RELEASE@$_target" - if [ "x$this_linkage" = "x-static" ]; then + if is_static; then _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a" - for f in $(eval echo \"\$ldlibs_$lib\"); do - _all_libs="$(remove_field $f $_all_libs) $f" + for f in `eval echo \"\\\$ldlibs_$lib\"`; do + + # Only propagate duplicate -libraries to their latest + # possible position. Do not eliminate any other + # duplicates that might occur. They should be fixed + # in configure long before they get here. + # This started as a workaround for Mac -framework, + # but it seems like a better policy in general, which + # will let the more heinous bugs in configure shake out. + # 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" ;; + *) _all_libs="$_all_libs $f" ;; + esac + done else _wxlibs="$_wxlibs -l${_libname}" @@ -810,11 +1029,41 @@ lib_flags_for() echo $_all_ldflags $_wxlibs $_all_libs } +# this is the strict subset of the above function which returns only the +# (static) libraries themselves: this is used for linkdeps output which should +# output the list of libraries the main program should depend on +# +# of course, this duplication is bad but I'll leave to somebody else the care +# of refactoring this as I don't see any way to do it - VZ. + +# This (and the other cruft to support it) should be removed with +# reference to the FIXME above when configure stops piping us a slurry +# of options that need to be decomposed again for most practical uses - RL. +link_deps_for() +{ + _wxlibs='' + + is_cross && _target="-${target}" + + for lib do + if match_field "$lib" @CORE_BASE_LIBS@ ; then + _libname="@WX_LIBRARY_BASENAME_NOGUI@" + else + _libname="@WX_LIBRARY_BASENAME_GUI@" + fi + [ $lib = base ] || _libname="${_libname}_$lib" + _libname="${_libname}-@WX_RELEASE@$_target" + + _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a" + done + + echo $_wxlibs +} # Sanity check the list of libs the user provided us, if any. # -------------------------------------------------------------- -wx_libs=$(echo "$input_parameters" | tr ',' ' ') +wx_libs=`echo "$input_parameters" | tr ',' ' '` [ -z "$WXDEBUG" ] || decho " user supplied libs: '$wx_libs'" @@ -822,14 +1071,15 @@ 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) + wx_libs=`remove_field $i $wx_libs` done - wx_libs="@WXCONFIG_LDFLAGS_GUI@ @WXCONFIG_RPATH@ $(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 [ "x$this_linkage" = "x-static" ]; then - wx_libs="$wx_libs ${libdir}/libwx_@TOOLCHAIN_NAME@.a $ldlibs_core @LIBS@" + 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 @@ -838,22 +1088,18 @@ if is_monolithic; then else # MONOLITHIC = 0 - # Import everything by default, and base if it was omitted. + # 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@" - elif ! match_field base $wx_libs ; then - wx_libs="$wx_libs base" - fi - - # Expand the magic library 'std' to the default set. - # Only add those not already specified to future-proof - # against changes to std which would otherwise break - # people's builds. - if match_field std $wx_libs; then - wx_libs=$(remove_field std $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 - match_field "$i" $wx_libs || wx_libs="$wx_libs $i" + wx_libs="`remove_field $i $wx_libs` $i" done + elif not match_field base $wx_libs ; then + wx_libs="$wx_libs base" fi using_gui=no @@ -866,7 +1112,10 @@ else # MONOLITHIC = 0 match_field "$i" @CORE_BASE_LIBS@ || using_gui=yes done - wx_libs="$_guildflags @WXCONFIG_RPATH@ $(lib_flags_for $wx_libs)" + if is_static; then + link_deps=`link_deps_for $wx_libs` + fi + wx_libs="$_guildflags `lib_flags_for $wx_libs`" fi @@ -881,26 +1130,99 @@ fi # Endgame. Nothing left to discover now. # -------------------------------------------------------------- -[ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@" [ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0" -_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@ -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@") +if is_installed; then + _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" +else + _include_cppflags="-I${includedir} -I${prefix}/contrib/include" +fi + +_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 "@CODE_GEN_FLAGS@" -[ -z "$output_option_cxxflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@" -[ -z "$output_option_gl_libs" ] || echo $(lib_flags_for gl) +[ -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_linkdeps" ] || echo $link_deps if [ -n "$output_option_libs" ]; then - is_cross && [ "x$libdir" = "x/usr/${target}/lib" ] \ - || [ "x$libdir" = "x/usr/lib" ] \ - || _ldflags="-L$libdir" + is_cross && + [ "x$libdir" = "x/usr/${target}/lib" ] || + [ "x$libdir" = "x/usr/lib" ] || + _ldflags="-L$libdir" + + is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@" + + echo $_ldflags "@LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@" +fi + + +# 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. 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 +# specific invocation of the appropriate tool. The bad news is, +# windres (at least) requires knowledge of the wx header files +# location(s) that cannot be predicted reliably before the call to +# wx-config is made. Currently for all known resource compilers, +# we can simply return a command and some salient configuration +# options in response to a request for --rescomp. So here we +# top up the options for any tools that may require information +# that was only just determined in the last few machine cycles, +# then output the necessary incantation for the platform. +# +# Most things should already be constant by the time configure +# has run. Do not add anything here that is already known there. + +if [ -n "$output_option_rescomp" ]; then + + 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. + 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@" + fi + ;; + + # neither rez not emxbind have any specific needs from + # us, so just output what was determined by configure. + *) + echo @RESCOMP@ @WXCONFIG_RESFLAGS@ + ;; + esac - echo $_ldflags "@LDFLAGS@" $wx_libs "@DMALLOC_LIBS@" fi +# +# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + # And so that's it, we're done. Have a nice build. exit 0