aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog5
-rw-r--r--src/driver/Makefile.in2
5 files changed, 17 insertions, 12 deletions
diff --git a/configure b/configure
index 75e2a05c..ca48a79b 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.63 for OpenAxiom 1.4.0-2009-09-29.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2009-10-01.
#
# Report bugs to <open-axiom-bugs@lists.sf.net>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='OpenAxiom'
PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.4.0-2009-09-29'
-PACKAGE_STRING='OpenAxiom 1.4.0-2009-09-29'
+PACKAGE_VERSION='1.4.0-2009-10-01'
+PACKAGE_STRING='OpenAxiom 1.4.0-2009-10-01'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -1498,7 +1498,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-2009-09-29 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2009-10-01 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.4.0-2009-09-29:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-10-01:";;
esac
cat <<\_ACEOF
@@ -1671,7 +1671,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2009-09-29
+OpenAxiom configure 1.4.0-2009-10-01
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1685,7 +1685,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-2009-09-29, which was
+It was created by OpenAxiom $as_me 1.4.0-2009-10-01, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -17062,7 +17062,7 @@ exec 6>&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-2009-09-29, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2009-10-01, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17125,7 +17125,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-OpenAxiom config.status 1.4.0-2009-09-29
+OpenAxiom config.status 1.4.0-2009-10-01
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 7ac46732..e51b7897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2009-09-29],
+AC_INIT([OpenAxiom], [1.4.0-2009-10-01],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index e46676f1..aaa5ebf2 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1151,7 +1151,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2009-09-29],
+AC_INIT([OpenAxiom], [1.4.0-2009-10-01],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index e1899476..b79e9778 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-01 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * driver/Makefile.in (open_axiom_LDADD): Prefer libraries from build
+ lib/ directory.
+
2009-09-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
* sman/sman.c (should_I_clef): Remove.
diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in
index 4859c829..e5120565 100644
--- a/src/driver/Makefile.in
+++ b/src/driver/Makefile.in
@@ -36,7 +36,7 @@ open_axiom_SOURCES = main.c utils.c
open_axiom_objects = $(open_axiom_SOURCES:.c=.lo)
-open_axiom_LDADD = -L$(axiom_target_libdir) $(oa_c_libs)
+open_axiom_LDADD = -L$(builddir)/../lib $(oa_c_libs)
.PHONY: all all-ax all-driver