diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 36 |
1 files changed, 19 insertions, 17 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2016-01-16. +# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2016-01-24. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.5.0-2016-01-16' -PACKAGE_STRING='OpenAxiom 1.5.0-2016-01-16' +PACKAGE_VERSION='1.5.0-2016-01-24' +PACKAGE_STRING='OpenAxiom 1.5.0-2016-01-24' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -652,7 +652,6 @@ oa_host_has_regex OA_QT_QMAKE OA_QT_MOC oa_use_x -X_CLFAGS X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -1421,7 +1420,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.5.0-2016-01-16 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.5.0-2016-01-24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1496,7 +1495,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2016-01-16:";; + short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2016-01-24:";; esac cat <<\_ACEOF @@ -1613,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.5.0-2016-01-16 +OpenAxiom configure 1.5.0-2016-01-24 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2430,7 +2429,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.5.0-2016-01-16, which was +It was created by OpenAxiom $as_me 1.5.0-2016-01-24, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3449,7 +3448,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.5.0-2016-01-16' + VERSION='1.5.0-2016-01-24' cat >>confdefs.h <<_ACEOF @@ -18978,12 +18977,6 @@ fi fi -## Output directives for the C compiler - -## Output directives for the linker - -## Output any extra libraries required by X11 - ## Finally, output the list of libraries that need to appear before -lX11 ## Some part of OpenAxiom depends on Xpm. That library has kind of uncertain @@ -19005,6 +18998,12 @@ if test x"$no_x" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: The Graphics component is disabled." >&5 $as_echo "$as_me: The Graphics component is disabled." >&6;} else + oa_saved_cxxflags=$CXXFLAGS + oa_saved_cppflags=$CPPFLAGS + oa_saved_ldflags=$LDFLAGS + CXXFLAGS="$CXXFLAGS $X_CFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LDFLAGS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" for ac_header in X11/xpm.h do : ac_fn_cxx_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" @@ -19021,6 +19020,9 @@ done oa_use_x=yes oa_c_runtime="$oa_c_runtime graphics" + LDFLAGS=$oa_saved_ldflags + CPPFLAGS=$oa_saved_cppflags + CXXFLAGS=$oa_saved_cxxflags fi @@ -20053,7 +20055,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.5.0-2016-01-16, which was +This file was extended by OpenAxiom $as_me 1.5.0-2016-01-24, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20123,7 +20125,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.5.0-2016-01-16 +OpenAxiom config.status 1.5.0-2016-01-24 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |