X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconfigure;h=2ceaecff22c0e71a4664298feb6435ca8d61da5f;hb=34fa97b95a58f99ee51775bafcab7322935f058d;hp=303364cd9373b257ff9daa635215453e77cf4b22;hpb=b90f5ba691f1ddbe377101b79f31c9a85a0235d2;p=xestiaab%2F.git diff --git a/source/configure b/source/configure index 303364c..2ceaecf 100755 --- a/source/configure +++ b/source/configure @@ -623,6 +623,13 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +DBGSTATUS +DBGOUT +DEBUG_FALSE +DEBUG_TRUE +WX_VERSION_MICRO +WX_VERSION_MINOR +WX_VERSION_MAJOR WX_RESCOMP WX_VERSION WX_LIBS_STATIC @@ -692,6 +699,7 @@ with_wxdir with_wx_config with_wx_prefix with_wx_exec_prefix +enable_debug ' ac_precious_vars='build_alias host_alias @@ -1312,6 +1320,12 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-debug Enable a debugging build + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) @@ -2182,6 +2196,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #AC_CONFIG_SRCDIR([version.h]) #AC_CONFIG_HEADERS([config.h]) + +$as_echo "#define DEBUG 1" >>confdefs.h + + # Checks for programs. ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -3823,6 +3841,7 @@ fi reqwx=3.0.0 + if test x${WX_CONFIG_NAME+set} != xset ; then WX_CONFIG_NAME=wx-config fi @@ -3906,7 +3925,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; } $as_echo_n "checking for wxWidgets version >= $min_wx_version ()... " >&6; } fi - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args " + WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args " WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` wx_config_major_version=`echo $WX_VERSION | \ @@ -3945,14 +3964,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version ()... " >&6; } if test -n "$wx_ver_ok"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5 $as_echo "yes (version $WX_VERSION)" >&6; } - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs` + WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs ` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5 $as_echo_n "checking for wxWidgets static library... " >&6; } - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null` + WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null` if test "x$WX_LIBS_STATIC" = "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -3995,16 +4013,16 @@ $as_echo "yes" >&6; } fi if test "x$wx_has_cppflags" = x ; then - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` + WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags ` WX_CPPFLAGS=$WX_CFLAGS WX_CXXFLAGS=$WX_CFLAGS WX_CFLAGS_ONLY=$WX_CFLAGS WX_CXXFLAGS_ONLY=$WX_CFLAGS else - WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags` - WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags` - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` + WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags ` + WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags ` + WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags ` WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"` @@ -4028,7 +4046,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; } WX_LIBS="" WX_LIBS_STATIC="" WX_RESCOMP="" - : + + if test ! -z ""; then + + wx_error_message=" + The configuration you asked for $PACKAGE_NAME requires a wxWidgets + build with the following settings: + + but such build is not available. + + To see the wxWidgets builds available on this system, please use + 'wx-config --list' command. To use the default build, returned by + 'wx-config --selected-config', use the options with their 'auto' + default values." + + fi + + wx_error_message=" + The requested wxWidgets build couldn't be found. + $wx_error_message + + If you still get this error, then check that 'wx-config' is + in path, the directory where wxWidgets libraries are installed + (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH + or equivalent variable and wxWidgets version is $reqwx or above." + + as_fn_error $? "$wx_error_message" "$LINENO" 5 fi else @@ -4054,6 +4097,14 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; } + WX_VERSION_MAJOR="$wx_config_major_version" + WX_VERSION_MINOR="$wx_config_minor_version" + WX_VERSION_MICRO="$wx_config_micro_version" + + + + + if test "$wxWin" != 1; then as_fn_error $? " wxWidgets must be installed on your system. @@ -4480,8 +4531,48 @@ _ACEOF esac +# Setup the debug setting. + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; case "${enableval}" in + yes) debug=true;; + no) debug=false;; + *) as_fn_error $? "invalid value ${enableval} given for --enable-debug" "$LINENO" 5 ;; + esac +else + debug=false +fi + + # Checks for library functions. + if test x$debug = xtrue; then + DEBUG_TRUE= + DEBUG_FALSE='#' +else + DEBUG_TRUE='#' + DEBUG_FALSE= +fi + +if test -z "$DEBUG_TRUE"; then : + DBGOUT="-O0" + +else + DBGOUT="-Os" + +fi +if test -z "$DEBUG_TRUE"; then : + DBGSTATUS="DEBUG=true" + +else + DBGSTATUS="DEBUG=false" + +fi +if test -z "$DEBUG_TRUE"; then : + echo "Debugging mode has been enabled." +fi + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -4629,6 +4720,10 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then + as_fn_error $? "conditional \"DEBUG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0