From bc3dd74e510c77a11ddc81a95e207023cfd629af Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 27 Nov 2010 11:05:52 +0000
Subject: Fix 'make install'
---
Makefile.am | 13 ++++---
Makefile.in | 56 ++++++++++++++---------------
config/open-axiom.m4 | 36 +++++++------------
configure | 100 +++++++++++++++++++++------------------------------
configure.ac | 6 +---
5 files changed, 86 insertions(+), 125 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f97fc512..f2777bee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@
ACLOCAL_AMFLAGS = -I config --install --output=config/aclocal.m4
-SUBDIRS = @oa_gcldir@ src
+DIST_SUBDIRS = src
oa_builddir = $(abs_top_builddir)/build/$(target)
oa_installdir = @open_axiom_installdir@
@@ -52,6 +52,7 @@ oa_installdir = @open_axiom_installdir@
GCLOPTS=@GCLOPTS@
OA_SRC_TARGETS = \
+ all-src \
all-algebra \
all-asq \
all-axiomsys \
@@ -67,19 +68,17 @@ OA_SRC_TARGETS = \
all-lisp \
all-sman \
all-driver \
- all-src \
all-databases \
all-utils
-.PHONY: all-oa $(OA_SRC_TARGETS)
-
-all-src: @oa_all_prerequisites@
+.PHONY: $(OA_SRC_TARGETS)
if OA_BUILD_GCL
all-recursive all-boot all-lisp all-interpsys all-axiomsys \
- all-algebra all-input: all-gcl
+ all-algebra all-input all-src: all-gcl
endif
+all-local: all-src
$(OA_SRC_TARGETS):
cd src && $(MAKE) $@
@@ -97,7 +96,7 @@ $(oa_builddir)/bin/gcl$(EXEEXT):
./configure --prefix="$(oa_builddir)" ${GCLOPTS} && \
$(MAKE) && $(MAKE) install
-install-exec-local:
+install:
@echo Installing OpenAxiom in $(DESTDIR)$(prefix)
@$(mkinstalldirs) "$(DESTDIR)$(oa_installdir)"
cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(oa_installdir)"
diff --git a/Makefile.in b/Makefile.in
index fdafb6f3..26fbd15e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,6 +78,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = .
+SUBDIRS =
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in \
$(top_srcdir)/config/openaxiom-c-macros.h.in \
@@ -145,7 +146,6 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -319,14 +319,12 @@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
-oa_all_prerequisites = @oa_all_prerequisites@
oa_c_runtime = @oa_c_runtime@
oa_c_runtime_extra = @oa_c_runtime_extra@
oa_editor = @oa_editor@
oa_enable_checking = @oa_enable_checking@
oa_enable_profiling = @oa_enable_profiling@
oa_enable_threads = @oa_enable_threads@
-oa_gcldir = @oa_gcldir@
oa_keep_files = @oa_keep_files@
oa_optimize_options = @oa_optimize_options@
oa_shrlib_flags = @oa_shrlib_flags@
@@ -357,10 +355,11 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
void_type = @void_type@
ACLOCAL_AMFLAGS = -I config --install --output=config/aclocal.m4
-SUBDIRS = @oa_gcldir@ src
+DIST_SUBDIRS = src
oa_builddir = $(abs_top_builddir)/build/$(target)
oa_installdir = @open_axiom_installdir@
OA_SRC_TARGETS = \
+ all-src \
all-algebra \
all-asq \
all-axiomsys \
@@ -376,7 +375,6 @@ OA_SRC_TARGETS = \
all-lisp \
all-sman \
all-driver \
- all-src \
all-databases \
all-utils
@@ -795,10 +793,9 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile
+all-am: Makefile all-local
installdirs: installdirs-recursive
installdirs-am:
-install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@@ -851,7 +848,7 @@ install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-exec-local
+install-exec-am:
install-html: install-html-recursive
@@ -897,30 +894,29 @@ uninstall-am:
install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool clean-local ctags ctags-recursive dist dist-all \
- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-exec-local \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
-
-
-.PHONY: all-oa $(OA_SRC_TARGETS)
-
-all-src: @oa_all_prerequisites@
+ all all-am all-local am--refresh check check-am clean \
+ clean-generic clean-libtool clean-local ctags ctags-recursive \
+ dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
+ dist-tarZ dist-xz dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
+
+
+.PHONY: $(OA_SRC_TARGETS)
@OA_BUILD_GCL_TRUE@all-recursive all-boot all-lisp all-interpsys all-axiomsys \
-@OA_BUILD_GCL_TRUE@ all-algebra all-input: all-gcl
+@OA_BUILD_GCL_TRUE@ all-algebra all-input all-src: all-gcl
+all-local: all-src
$(OA_SRC_TARGETS):
cd src && $(MAKE) $@
@@ -938,7 +934,7 @@ $(oa_builddir)/bin/gcl$(EXEEXT):
./configure --prefix="$(oa_builddir)" ${GCLOPTS} && \
$(MAKE) && $(MAKE) install
-install-exec-local:
+install:
@echo Installing OpenAxiom in $(DESTDIR)$(prefix)
@$(mkinstalldirs) "$(DESTDIR)$(oa_installdir)"
cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(oa_installdir)"
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 2fd2a38f..774a13f9 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -70,17 +70,11 @@ AC_ARG_WITH([lisp], [ --with-lisp=L use L as Lisp platform],
## own version from the source tree.
## If --enable-gcl is specified, we need to check for coonsistency
oa_include_gcl=
-oa_gcldir=
-AC_SUBST(oa_gcldir)
-AC_SUBST(oa_gcldir)
AC_ARG_ENABLE([gcl], [ --enable-gcl build GCL from OpenAxiom source],
[case $enableval in
yes|no) oa_include_gcl=$enableval ;;
*) AC_MSG_ERROR([erroneous value for --enable-gcl]) ;;
esac])
-if test "$oa_include_gcl" = xyes; then
- oa_gcldir=gcl
-fi
## If nothing was said about preferred Lisp, guess one.
AC_SUBST(AXIOM_LISP)
@@ -111,7 +105,6 @@ case $oa_include_gcl,$AXIOM_LISP in
## the dependency tarball.
if test -d ${srcdir}/gcl; then
AXIOM_LISP='$(axiom_build_bindir)/gcl'
- oa_all_prerequisites="$oa_all_prerequisites all-gcl"
oa_include_gcl=yes
elif test -z "$oa_include_gcl"; then
AC_MSG_ERROR([OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, ECL, CLisp, Clozure CL), or get the dependency tarball from OpenAxiom download website.])
@@ -257,23 +250,18 @@ dnl Determine options needed to build included GCL, if need be.
AC_DEFUN([OPENAXIOM_GCL_BUILD_OPTIONS],[
oa_host_has_libbfd=
## Check for these only if we are going to build GCL from source.
-case $oa_all_prerequisites in
- *all-gcl*)
- AC_CHECK_HEADER([bfd.h])
- AC_HAVE_LIBRARY([bfd], [oa_host_has_libbfd=yes])
-
- oa_gcl_bfd_option=
- if test x"$ac_cv_header_bfd_h" = xyes \
- && test x"$oa_host_has_libbfd" = xyes; then
- oa_gcl_bfd_option="--disable-dynsysbfd"
- else
- oa_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
- fi
- ;;
- *)
- # Nothing to worry about
- ;;
-esac
+if test x"$oa_include_gcl" = xyes; then
+ AC_CHECK_HEADER([bfd.h])
+ AC_HAVE_LIBRARY([bfd], [oa_host_has_libbfd=yes])
+
+ oa_gcl_bfd_option=
+ if test x"$ac_cv_header_bfd_h" = xyes \
+ && test x"$oa_host_has_libbfd" = xyes; then
+ oa_gcl_bfd_option="--disable-dynsysbfd"
+ else
+ oa_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
+ fi
+fi
case $host in
powerpc*darwin*)
diff --git a/configure b/configure
index ad4101ab..9adb533f 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.4.0-2010-11-25.
+# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-11-27.
#
# Report bugs to <open-axiom-bugs@lists.sf.net>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenAxiom'
PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.4.0-2010-11-25'
-PACKAGE_STRING='OpenAxiom 1.4.0-2010-11-25'
+PACKAGE_VERSION='1.4.0-2010-11-27'
+PACKAGE_STRING='OpenAxiom 1.4.0-2010-11-27'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
PACKAGE_URL=''
@@ -841,8 +841,6 @@ CC
oa_standard_linking
axiom_lisp_flavor
AXIOM_LISP
-oa_gcldir
-oa_all_prerequisites
open_axiom_installdir
am__untar
am__tar
@@ -1491,7 +1489,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.4.0-2010-11-25 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2010-11-27 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1566,7 +1564,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-11-25:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-11-27:";;
esac
cat <<\_ACEOF
@@ -1677,7 +1675,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2010-11-25
+OpenAxiom configure 1.4.0-2010-11-27
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2569,7 +2567,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.4.0-2010-11-25, which was
+It was created by OpenAxiom $as_me 1.4.0-2010-11-27, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -5468,7 +5466,7 @@ fi
# Define the identity of the package.
PACKAGE='openaxiom'
- VERSION='1.4.0-2010-11-25'
+ VERSION='1.4.0-2010-11-27'
cat >>confdefs.h <<_ACEOF
@@ -5532,10 +5530,6 @@ fi
axiom_build_sharedir=$axiom_builddir/share
-## Accumulate list of utils needed for the build platform
-oa_all_prerequisites=
-
-
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -5616,9 +5610,6 @@ fi
## own version from the source tree.
## If --enable-gcl is specified, we need to check for coonsistency
oa_include_gcl=
-oa_gcldir=
-
-
# Check whether --enable-gcl was given.
if test "${enable_gcl+set}" = set; then :
enableval=$enable_gcl; case $enableval in
@@ -5627,9 +5618,6 @@ if test "${enable_gcl+set}" = set; then :
esac
fi
-if test "$oa_include_gcl" = xyes; then
- oa_gcldir=gcl
-fi
## If nothing was said about preferred Lisp, guess one.
@@ -5697,7 +5685,6 @@ case $oa_include_gcl,$AXIOM_LISP in
## the dependency tarball.
if test -d ${srcdir}/gcl; then
AXIOM_LISP='$(axiom_build_bindir)/gcl'
- oa_all_prerequisites="$oa_all_prerequisites all-gcl"
oa_include_gcl=yes
elif test -z "$oa_include_gcl"; then
as_fn_error "OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, ECL, CLisp, Clozure CL), or get the dependency tarball from OpenAxiom download website." "$LINENO" 5
@@ -8509,13 +8496,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8512: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8499: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8515: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8502: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8518: output\"" >&5)
+ (eval echo "\"\$as_me:8505: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9717,7 +9704,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9720 "configure"' > conftest.$ac_ext
+ echo '#line 9707 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11811,11 +11798,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11814: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11801: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11818: \$? = $ac_status" >&5
+ echo "$as_me:11805: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12150,11 +12137,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12153: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12140: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12157: \$? = $ac_status" >&5
+ echo "$as_me:12144: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12255,11 +12242,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12258: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12245: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12262: \$? = $ac_status" >&5
+ echo "$as_me:12249: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12310,11 +12297,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12313: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12300: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12317: \$? = $ac_status" >&5
+ echo "$as_me:12304: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14677,7 +14664,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14680 "configure"
+#line 14667 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14773,7 +14760,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14776 "configure"
+#line 14763 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16729,11 +16716,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16732: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16719: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16736: \$? = $ac_status" >&5
+ echo "$as_me:16723: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16828,11 +16815,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16831: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16818: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16835: \$? = $ac_status" >&5
+ echo "$as_me:16822: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16880,11 +16867,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16883: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16870: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16887: \$? = $ac_status" >&5
+ echo "$as_me:16874: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20220,15 +20207,14 @@ esac
oa_host_has_libbfd=
## Check for these only if we are going to build GCL from source.
-case $oa_all_prerequisites in
- *all-gcl*)
- ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
+if test x"$oa_include_gcl" = xyes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
if test "x$ac_cv_header_bfd_h" = x""yes; then :
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lbfd" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lbfd" >&5
$as_echo_n "checking for main in -lbfd... " >&6; }
if test "${ac_cv_lib_bfd_main+set}" = set; then :
$as_echo_n "(cached) " >&6
@@ -20264,18 +20250,14 @@ fi
ac_cv_lib_bfd=ac_cv_lib_bfd_main
- oa_gcl_bfd_option=
- if test x"$ac_cv_header_bfd_h" = xyes \
- && test x"$oa_host_has_libbfd" = xyes; then
- oa_gcl_bfd_option="--disable-dynsysbfd"
- else
- oa_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
- fi
- ;;
- *)
- # Nothing to worry about
- ;;
-esac
+ oa_gcl_bfd_option=
+ if test x"$ac_cv_header_bfd_h" = xyes \
+ && test x"$oa_host_has_libbfd" = xyes; then
+ oa_gcl_bfd_option="--disable-dynsysbfd"
+ else
+ oa_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
+ fi
+fi
case $host in
powerpc*darwin*)
@@ -20965,7 +20947,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.4.0-2010-11-25, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2010-11-27, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21031,7 +21013,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.4.0-2010-11-25
+OpenAxiom config.status 1.4.0-2010-11-27
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 37a8d657..5f3e52e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and
dnl auxiliary tools where appropriate.
dnl
-AC_INIT([OpenAxiom], [1.4.0-2010-11-25],
+AC_INIT([OpenAxiom], [1.4.0-2010-11-27],
[open-axiom-bugs@lists.sf.net])
dnl Most of the macros used in this configure.ac are defined in files
@@ -78,10 +78,6 @@ fi
axiom_build_sharedir=$axiom_builddir/share
-## Accumulate list of utils needed for the build platform
-oa_all_prerequisites=
-AC_SUBST(oa_all_prerequisites)
-
OPENAXIOM_HOST_COMPILERS
AM_CONDITIONAL([OA_BUILD_GCL], [test x$oa_include_gcl = xyes])
--
cgit v1.2.3