aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-12-15 06:33:41 +0000
committerdos-reis <gdr@axiomatics.org>2011-12-15 06:33:41 +0000
commit91d2034c53d206c701d5902c9a3879af4a0f16bd (patch)
treef39d9f439e1697f86d90493b7fb58b44cc32576c
parentf0979b7e8bb0fb1a1e4a0bf1705117a930e36b57 (diff)
downloadopen-axiom-91d2034c53d206c701d5902c9a3879af4a0f16bd.tar.gz
* config/open-axiom.m4 (OPENAXIOM_DYNAMIC_MODULE_SUPPORT): Fix
linker flags when building for Windows. * lisp/core.lisp.in: Do not require SB-SPROF or SB-POSIX on Windows.
-rw-r--r--ChangeLog5
-rw-r--r--config/open-axiom.m42
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lisp/core.lisp.in4
6 files changed, 24 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index ff11cb50..127231d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-15 Alfredo Portes <doyenatccny@gmail.com>
+
+ * config/open-axiom.m4 (OPENAXIOM_DYNAMIC_MODULE_SUPPORT): Fix
+ linker flags when building for Windows.
+
2011-12-03 Alfredo Portes <doyenatccny@gmail.com>
Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 92c510a0..f8e632f9 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -513,7 +513,7 @@ eval shared_ext=\"$shrext_cmds\"
case $host in
*mingw*|*cygwin*)
oa_shrobj_flags='-prefer-pic'
- oa_shrlib_flags="-shared --export-all-symbols"
+ oa_shrlib_flags="-shared -Wl,--export-all-symbols"
;;
*darwin*)
oa_shrobj_flags='-dynamic'
diff --git a/configure b/configure
index 2466040d..1a2dee94 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.68 for OpenAxiom 1.5.0-2011-12-03.
+# Generated by GNU Autoconf 2.68 for OpenAxiom 1.5.0-2011-12-15.
#
# Report bugs to <open-axiom-bugs@lists.sf.net>.
#
@@ -709,8 +709,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenAxiom'
PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.5.0-2011-12-03'
-PACKAGE_STRING='OpenAxiom 1.5.0-2011-12-03'
+PACKAGE_VERSION='1.5.0-2011-12-15'
+PACKAGE_STRING='OpenAxiom 1.5.0-2011-12-15'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
PACKAGE_URL=''
@@ -1502,7 +1502,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-12-03 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.5.0-2011-12-15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1577,7 +1577,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-12-03:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2011-12-15:";;
esac
cat <<\_ACEOF
@@ -1688,7 +1688,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.5.0-2011-12-03
+OpenAxiom configure 1.5.0-2011-12-15
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2681,7 +2681,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-12-03, which was
+It was created by OpenAxiom $as_me 1.5.0-2011-12-15, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -5589,7 +5589,7 @@ fi
# Define the identity of the package.
PACKAGE='openaxiom'
- VERSION='1.5.0-2011-12-03'
+ VERSION='1.5.0-2011-12-15'
cat >>confdefs.h <<_ACEOF
@@ -18428,7 +18428,7 @@ eval shared_ext=\"$shrext_cmds\"
case $host in
*mingw*|*cygwin*)
oa_shrobj_flags='-prefer-pic'
- oa_shrlib_flags="-shared --export-all-symbols"
+ oa_shrlib_flags="-shared -Wl,--export-all-symbols"
;;
*darwin*)
oa_shrobj_flags='-dynamic'
@@ -21602,7 +21602,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-12-03, which was
+This file was extended by OpenAxiom $as_me 1.5.0-2011-12-15, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21668,7 +21668,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-12-03
+OpenAxiom config.status 1.5.0-2011-12-15
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b944f99b..f1219cfb 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.5.0-2011-12-03],
+AC_INIT([OpenAxiom], [1.5.0-2011-12-15],
[open-axiom-bugs@lists.sf.net])
dnl Most of the macros used in this configure.ac are defined in files
diff --git a/src/ChangeLog b/src/ChangeLog
index 9390281e..386c9887 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-15 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * lisp/core.lisp.in: Do not require SB-SPROF or SB-POSIX on Windows.
+
2011-12-14 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/g-opt.boot (packWhen!): Tidy.
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 948df067..7535ba70 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -369,7 +369,7 @@
(defconstant |$EnableLispProfiling| @oa_enable_profiling@))
(eval-when (:compile-toplevel :load-toplevel :execute)
- (progn #+sbcl (require :sb-sprof)))
+ (progn #+(and :sbcl (not :win32)) (require :sb-sprof)))
;; Return true if the full OpenAxiom algebra system is completed
;; built.
@@ -1358,7 +1358,7 @@
;; -*- Lisp Implementatiom-dependent Supports -*-
-#+ :sbcl
+#+(and :sbcl (not :win32))
(require "sb-posix")
#+ :sbcl