From 2be7e3089ebb7c7d179306b5bb26272fc0a5c249 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 3 Sep 2011 21:19:46 +0000 Subject: * lib/pixmap.c: Include standard header. * include/xpm.h: Remove. --- configure | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d0ddbf1d..24db3418 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for OpenAxiom 1.5.0-2011-07-07. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.5.0-2011-09-03. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.5.0-2011-07-07' -PACKAGE_STRING='OpenAxiom 1.5.0-2011-07-07' +PACKAGE_VERSION='1.5.0-2011-09-03' +PACKAGE_STRING='OpenAxiom 1.5.0-2011-09-03' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1493,7 +1493,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-2011-07-07 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.5.0-2011-09-03 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1568,7 +1568,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-07-07:";; + short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-09-03:";; esac cat <<\_ACEOF @@ -1679,7 +1679,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.5.0-2011-07-07 +OpenAxiom configure 1.5.0-2011-09-03 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2669,7 +2669,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-2011-07-07, which was +It was created by OpenAxiom $as_me 1.5.0-2011-09-03, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5570,7 +5570,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.5.0-2011-07-07' + VERSION='1.5.0-2011-09-03' cat >>confdefs.h <<_ACEOF @@ -20577,26 +20577,41 @@ fi ## Finally, output the list of libraries that need to appear before -lX11 -## Some part of OpenAxiom depends on Xpm. That library has kind uncertain +## Some part of OpenAxiom depends on Xpm. That library has kind of uncertain ## future. At some point in the past, it was deprecated, to be ## replaced by xpm-nox; then came back again. So, its support may ## vary from system to system. For the moment, we assume that if X11 -## is found then, Xpm is already present. Though, clearly that is a +## is found then, Xpm is also present. Though, clearly that is a ## very optimistic assumption. Long term, OpenAxiom should get rid of ## dependence on Xpm. A nearly fool-proof test would be probably ## inspired by AC_PATH_XTRA. I don't have time to get to that ## complication right now. Will fix later. +## But we can check for the existence of X_PRE_LIBS="-lXpm $X_PRE_LIBS" ## If the system supports X11, then build graphics axiom_use_x=no -if test -z "$no_x"; then +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 + 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" +if test "x$ac_cv_header_X11_xpm_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_XPM_H 1 +_ACEOF + +else + as_fn_error "The header could not be found. Install Xpm development package and re-start the configuration process." "$LINENO" 5 +fi + +done + axiom_use_x=yes oa_c_runtime="$oa_c_runtime graphics" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: The Garphics component is disabled." >&5 -$as_echo "$as_me: The Garphics component is disabled." >&6;} fi @@ -21560,7 +21575,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-2011-07-07, which was +This file was extended by OpenAxiom $as_me 1.5.0-2011-09-03, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21626,7 +21641,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-2011-07-07 +OpenAxiom config.status 1.5.0-2011-09-03 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -- cgit v1.2.3