X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffa0583fbfd80b485d880b26780a8d3c4582522e..5001df0dd594c4128de79e3dc31d40b4587ba331:/wx-config.in diff --git a/wx-config.in b/wx-config.in index 8221b7a14f..1da0e8a1ae 100755 --- a/wx-config.in +++ b/wx-config.in @@ -17,8 +17,28 @@ # 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, +# 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. # ------------------------------------------------------------------ @@ -74,6 +94,9 @@ EOF [ $# -gt 0 ] || usage 1 +# Contentious tools determined by configure. +EGREP="@EGREP@" + # For the people who know what they want, or think they do: # Divide the valid arguments into functional groups for later examination, @@ -103,15 +126,15 @@ EOF wxconfig_schema="host toolkit widgetset chartype debugtype flavour version linkage" # Options that are expected to generate some output. -wxconfig_output_options="prefix exec_prefix \ - list \ - release version version_full \ - basename \ - cppflags cflags cxxflags \ - rezflags \ - libs \ - linkdeps \ - cc cxx ld \ +wxconfig_output_options="prefix exec_prefix + list + release version version_full + basename + cppflags cflags cxxflags + rezflags + libs + linkdeps + cc cxx ld gl_libs" # Options that permit the user to supply hints that may affect the output. @@ -122,7 +145,7 @@ wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema" wxconfig_yesno_options="universal unicode debug static" # Boolean options that do something or not. -wxconfig_flag_options="$wxconfig_yesno_options no_rpath inplace" +wxconfig_flag_options="$wxconfig_yesno_options selected_config no_rpath inplace" @@ -134,7 +157,7 @@ wxconfig_flag_options="$wxconfig_yesno_options no_rpath inplace" option_name() { _option_name_temp=${1%%=*} - echo "${_option_name_temp#--}" | tr '-' '_' + echo ${_option_name_temp#--} | tr '-' '_' } # option_value _string @@ -165,7 +188,7 @@ remove_field() shift if [ -n "$_remf_value" ]; then for _remf_item; do - [ "x$_remf_item" = "x$_remf_value" ] || \ + [ "x$_remf_item" = "x$_remf_value" ] || _remf_list="${_remf_list:+$_remf_list }$_remf_item" done echo "$_remf_list" @@ -207,16 +230,17 @@ validate_arg() # in any case. check_yesno_option() { - eval "case \${yesno_option_$1-\${flag_option_$1-unset}} in \ - unset) ;; \ - y*|Y*) input_option_$2=\"$3\" ;; \ - n*|N*) input_option_$2=\"$4\" ;; \ - *) \ - decho; \ - decho \" *** Error: Invalid request '--$1=\$yesno_option_$1'\"; \ - decho \" Valid arguments for --$1 are: [ yes, no ]\"; \ - decho; \ - exit 1 ;; \ + eval "case \${yesno_option_$1-\${flag_option_$1-unset}} in + unset) ;; + y*|Y*) input_option_$2=\"$3\" ;; + n*|N*) input_option_$2=\"$4\" ;; + *) + decho + decho \" *** Error: Invalid request '--$1=\$yesno_option_$1'\" + decho \" Valid arguments for --$1 are: [ yes, no ]\" + decho + exit 1 + ;; esac" } @@ -244,8 +268,8 @@ for arg; do --*=*) _name=$(option_name $arg) _value=$(option_value $arg) - if validate_arg wxconfig input "$_name" "$_value" \ - || validate_arg wxconfig yesno "$_name" "$_value"; \ + if validate_arg wxconfig input "$_name" "$_value" || + validate_arg wxconfig yesno "$_name" "$_value" then continue fi @@ -253,8 +277,8 @@ for arg; do --*) _name=$(option_name $arg) - if validate_arg wxconfig flag "$_name" yes \ - || validate_arg wxconfig output "$_name" yes; + if validate_arg wxconfig flag "$_name" yes || + validate_arg wxconfig output "$_name" yes then continue fi @@ -321,6 +345,9 @@ get_mask() eval echo "\${$1_host}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage}-\${$1_version}\${$1_flavour}" } +# Returns true if this script is for a cross compiled config. +is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + # Determine the base directories we require. prefix=${input_option_prefix-${this_prefix:-@prefix@}} @@ -329,7 +356,7 @@ wxconfdir="@libdir@/wx/config" 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. @@ -429,11 +456,11 @@ fi # 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; } +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" | grep -E "$configmask" > /dev/null 2>&1; } +user_mask_fits() { echo "$1" | $EGREP "$configmask" > /dev/null 2>&1; } # count_fields _word # Returns the number of IFS split fields in _word @@ -508,9 +535,9 @@ do_find_best_delegate() [ "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 @@ -537,7 +564,7 @@ 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 @@ -561,9 +588,13 @@ get_legacy_mask() # Returns a list of configs installed by wx2.4 releases. find_legacy_configs() { - cd "$prefix/bin" 2> /dev/null && \ - ls wx*-2.4-config 2> /dev/null | grep -v ^wxbase; \ - ls wx*-2.4-config 2> /dev/null | grep ^wxbase + ( + 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 @@ -575,7 +606,7 @@ find_best_legacy_config() if [ -n "$_legacy_configs" ]; then _legacy_mask=$(get_legacy_mask) for d in $_legacy_configs; do - if echo $d | grep -E $_legacy_mask > /dev/null 2>&1 ; then + if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then echo "$d" return fi @@ -775,10 +806,9 @@ if ! user_mask_fits "$this_config" ; then 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 fi @@ -844,22 +874,22 @@ 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_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 "$flag_option_selected_config" ] || echo "$this_config" # The rest are going to need a little more work. # -------------------------------------------------------------- -is_cross() { [ "x@cross_compiling@" = "xyes" ]; } is_monolithic() { [ "x@MONOLITHIC@" = "x1" ]; } is_static() { [ -n "$this_linkage" ]; } is_installed() { [ -z "$this_prefix" ]; } @@ -892,7 +922,7 @@ if [ -n "$input_option_utility" ]; then for _util in "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" \ "${input_option_utility}-@WX_RELEASE@" \ - "${input_option_utility}"; + "${input_option_utility}" do for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do @@ -938,7 +968,7 @@ lib_flags_for() _all_libs='' _wxlibs='' - ! is_cross || _target="-${target}" + is_cross && _target="-${target}" for lib; do @@ -973,7 +1003,21 @@ lib_flags_for() 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" + + # 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}" @@ -995,12 +1039,16 @@ lib_flags_for() # 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 +# 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}" + is_cross && _target="-${target}" for lib; do if match_field "$lib" @CORE_BASE_LIBS@ ; then @@ -1106,9 +1154,10 @@ _cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflag 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@"