aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--config/var-def.mk10
-rwxr-xr-xconfigure365
-rw-r--r--configure.ac4
-rw-r--r--configure.ac.pamphlet4
-rw-r--r--src/ChangeLog17
-rw-r--r--src/boot/Makefile.in10
-rw-r--r--src/boot/translator.boot2
-rw-r--r--src/clef/Makefile.in5
-rw-r--r--src/graph/view2D/Makefile.in5
-rw-r--r--src/graph/view3D/Makefile.in6
-rw-r--r--src/graph/viewAlone/Makefile.in6
-rw-r--r--src/graph/viewman/Makefile.in6
-rw-r--r--src/hyper/Makefile.in15
-rw-r--r--src/interp/Makefile.in2
-rw-r--r--src/interp/Makefile.pamphlet2
-rw-r--r--src/lib/Makefile.in27
-rw-r--r--src/lisp/Makefile.in1
-rw-r--r--src/lisp/core.lisp.in5
-rw-r--r--src/sman/Makefile.in14
20 files changed, 430 insertions, 83 deletions
diff --git a/ChangeLog b/ChangeLog
index f2334dc3..e3c24f4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * configure.ac.pamphlet (shrext_cmds): Autconf-substitute.
+ (libext): Likewise.
+ * config/var-def.mk (SHREXT): Rename from DLLEXT.
+ (LIBEXT): New.
+
2008-03-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Add native types translation table for
diff --git a/config/var-def.mk b/config/var-def.mk
index 2bc5558c..ccd0c721 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -55,8 +55,10 @@ CC = @CC@
CFLAGS = @CFLAGS@
OBJEXT = @OBJEXT@
EXEEXT = @EXEEXT@
-DLLEXT = $(if $(findstring mingw, $(target)),dll,so)
-
+# this includes leading period
+SHREXT = @shrext_cmds@
+# this does not include period
+LIBEXT = @libext@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -68,8 +70,8 @@ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c
## Sadly, at the moment, the C parts of the OpenAxiom system is not
## well structured enough to allow for clean dynamic libraries
-## and dynamic linking. So, we build static libraries and programs.
-## This situation is to be fixed soon.
+## and dynamic linking. So, we build static programs.
+## This situation is to be fixed when I have time.
LINK = $(LIBTOOL) --mode=link $(CC) -static
diff --git a/configure b/configure
index f3a8e871..fe38e6d8 100755
--- a/configure
+++ b/configure
@@ -813,6 +813,9 @@ ECHO
AR
RANLIB
STRIP
+DLLTOOL
+AS
+OBJDUMP
CPP
CXX
CXXFLAGS
@@ -823,6 +826,8 @@ FFLAGS
ac_ct_F77
LIBTOOL
LIBTOOL_DEPS
+shrext_cmds
+libext
axiom_enable_checking
axiom_optimize_options
axiom_src_subdirs
@@ -1987,6 +1992,8 @@ ac_config_headers="$ac_config_headers config/axiom-c-macros.h"
# emulate it.
+
+
# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
enableval=$enable_shared; p=${PACKAGE-default}
@@ -3783,7 +3790,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3786 "configure"' > conftest.$ac_ext
+ echo '#line 3793 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3972,6 +3979,296 @@ sparc*-*solaris*)
rm -rf conftest*
;;
+*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+echo "${ECHO_T}$DLLTOOL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { echo "$as_me:$LINENO: result: $AS" >&5
+echo "${ECHO_T}$AS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AS="as"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+echo "${ECHO_T}$ac_ct_AS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ AS=$ac_ct_AS
+ fi
+else
+ AS="$ac_cv_prog_AS"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+echo "${ECHO_T}$OBJDUMP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+ ;;
esac
@@ -6546,7 +6843,7 @@ fi
esac
enable_dlopen=yes
-enable_win32_dll=no
+enable_win32_dll=yes
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
@@ -6638,11 +6935,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:6641: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6938: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6645: \$? = $ac_status" >&5
+ echo "$as_me:6942: \$? = $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.
@@ -6906,11 +7203,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:6909: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7206: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6913: \$? = $ac_status" >&5
+ echo "$as_me:7210: \$? = $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.
@@ -7010,11 +7307,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:7013: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7310: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7017: \$? = $ac_status" >&5
+ echo "$as_me:7314: \$? = $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
@@ -9462,7 +9759,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9465 "configure"
+#line 9762 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9562,7 +9859,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9565 "configure"
+#line 9862 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11930,11 +12227,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:11933: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12230: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11937: \$? = $ac_status" >&5
+ echo "$as_me:12234: \$? = $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.
@@ -12034,11 +12331,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:12037: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12334: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12041: \$? = $ac_status" >&5
+ echo "$as_me:12338: \$? = $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
@@ -13604,11 +13901,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:13607: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13904: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13611: \$? = $ac_status" >&5
+ echo "$as_me:13908: \$? = $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.
@@ -13708,11 +14005,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:13711: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14008: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13715: \$? = $ac_status" >&5
+ echo "$as_me:14012: \$? = $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
@@ -15938,11 +16235,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:15941: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16238: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15945: \$? = $ac_status" >&5
+ echo "$as_me:16242: \$? = $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.
@@ -16206,11 +16503,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:16209: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16506: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16213: \$? = $ac_status" >&5
+ echo "$as_me:16510: \$? = $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.
@@ -16310,11 +16607,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:16313: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16610: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16317: \$? = $ac_status" >&5
+ echo "$as_me:16614: \$? = $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
@@ -19005,6 +19302,9 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+# Give me extension of libraries
+
+
axiom_optimize_options=speed
## Shall we proclaim safety?
@@ -25757,6 +26057,9 @@ ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
STRIP!$STRIP$ac_delim
+DLLTOOL!$DLLTOOL$ac_delim
+AS!$AS$ac_delim
+OBJDUMP!$OBJDUMP$ac_delim
CPP!$CPP$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
@@ -25767,6 +26070,8 @@ FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
+shrext_cmds!$shrext_cmds$ac_delim
+libext!$libext$ac_delim
axiom_enable_checking!$axiom_enable_checking$ac_delim
axiom_optimize_options!$axiom_optimize_options$ac_delim
axiom_src_subdirs!$axiom_src_subdirs$ac_delim
@@ -25790,11 +26095,6 @@ NOTANGLE!$NOTANGLE$ac_delim
NOWEAVE!$NOWEAVE$ac_delim
AXIOM_LISP!$AXIOM_LISP$ac_delim
axiom_include_gcl!$axiom_include_gcl$ac_delim
-axiom_lisp_flavor!$axiom_lisp_flavor$ac_delim
-axiom_gcl_rsym_hack!$axiom_gcl_rsym_hack$ac_delim
-axiom_quiet_flags!$axiom_quiet_flags$ac_delim
-axiom_eval_flags!$axiom_eval_flags$ac_delim
-axiom_fasl_type!$axiom_fasl_type$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -25836,6 +26136,11 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+axiom_lisp_flavor!$axiom_lisp_flavor$ac_delim
+axiom_gcl_rsym_hack!$axiom_gcl_rsym_hack$ac_delim
+axiom_quiet_flags!$axiom_quiet_flags$ac_delim
+axiom_eval_flags!$axiom_eval_flags$ac_delim
+axiom_fasl_type!$axiom_fasl_type$ac_delim
axiom_all_prerequisites!$axiom_all_prerequisites$ac_delim
axiom_c_runtime!$axiom_c_runtime$ac_delim
axiom_c_runtime_extra!$axiom_c_runtime_extra$ac_delim
@@ -25863,7 +26168,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 8c52a72c..aa2050ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,12 @@ AC_CONFIG_SRCDIR(src/Makefile.pamphlet)
# Tell Libtool to assume `dlopen' so that it does not have to
# emulate it.
AC_LIBTOOL_DLOPEN
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+# Give me extension of libraries
+AC_SUBST(shrext_cmds)
+AC_SUBST(libext)
axiom_optimize_options=speed
## Shall we proclaim safety?
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index b53b53d4..a682c19b 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1216,8 +1216,12 @@ GNU \Tool{libtool} to take care of that for us.
# Tell Libtool to assume `dlopen' so that it does not have to
# emulate it.
AC_LIBTOOL_DLOPEN
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+# Give me extension of libraries
+AC_SUBST(shrext_cmds)
+AC_SUBST(libext)
@
\section{configure.ac}
diff --git a/src/ChangeLog b/src/ChangeLog
index 9ced4373..40a75581 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2008-03-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * lib/Makefile.in: Explicitly build both static and shared version
+ of libopen-axiom-core.
+ * lisp/Makefile.in: Tidy.
+ * lisp/core.lisp.in: Export $NativeModuleExt.
+ * clef/Makefile.in: Use only static archive.
+ * graph/view2D/Makefile.in: Likewise.
+ * graph/view3D/Makefile.in: Likewise.
+ * graph/viewAlone/Makefile.in: Likewise.
+ * graph/viewman/Makefile.in: Likewise.
+ * hyper/Makefile.in: Likewise.
+ * sman/Makefile.in: Likewise.
+ * boot/Makefile.in: Place bootsys binary in staged starget directory.
+ * boot/translator.boot (loadSystemRuntimeCore): Tidy.
+ * interp/Makefile.pamphlet: Use bootsys from staged target dir.
+
2008-03-25 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/bootlex.lisp: Import "sys-globals".
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index 756d59c6..f8d57bd9 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -80,14 +80,14 @@ all: all-ax all-boot
all-ax all-boot: stamp
-stamp: $(axiom_build_bindir)/bootsys$(EXEEXT)
+stamp: $(axiom_target_bindir)/bootsys$(EXEEXT)
@rm -f stamp
$(STAMP) $@
## The final `bootsys' image.
-$(axiom_build_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
- $(mkinstalldirs) $(axiom_build_bindir)
- $(INSTALL_PROGRAM) stage2/bootsys$(EXEEXT) $(axiom_build_bindir)
+$(axiom_target_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
+ $(mkinstalldirs) $(axiom_target_bindir)
+ $(INSTALL_PROGRAM) $< $@
.PRECIOUS: strap/%.$(FASLEXT)
@@ -209,7 +209,7 @@ stage2/%.clisp: %.boot stage1/stamp stage2/.started
##
mostlyclean-local:
- @rm -f $(axiom_build_bindir)/bootsys$(EXEEXT)
+ @rm -f $(axiom_target_bindir)/bootsys$(EXEEXT)
@rm -rf prev-stage
@rm -rf strap stage1 stage2
@rm -f *.data *.fn
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index d5020cf2..b5245d92 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -835,5 +835,5 @@ $OpenAxiomCoreModuleLoaded := false
loadSystemRuntimeCore() ==
$OpenAxiomCoreModuleLoaded => nil
loadNativeModule strconc(systemLibraryDirectory(),
- '"libopen-axiom-core.so")
+ '"libopen-axiom-core",$NativeModuleExt)
$OpenAxiomCoreModuleLoaded := true
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index 7e885ff5..eeda85f8 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -39,8 +39,9 @@ clef_SOURCES = edible.c
clef_objects = $(clef_SOURCES:.c=.lo)
-clef_LDADD = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+build_libdir = $(top_builddir)/src/lib
+
+clef_LDADD = $(build_libdir)/libspad.la -L$(build_libdir) -lopen-axiom-core
clef_DEPENDENCIES =
diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index e64ad57b..477ca263 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -37,7 +37,7 @@ LINC= $(axiom_src_srcdir)/graph/include
# global include files shared by everyone
GINC= $(axiom_src_srcdir)/include
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
bin_PROGRAMS = view2D$(EXEEXT)
@@ -48,8 +48,7 @@ view2D_objects = $(view2D_SOURCES:.c=.lo)
Gfun_objects = ../Gdraws/Gfun.lo
-view2D_LDADD = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+view2D_LDADD = $(build_libdir)/libspad.la -L$(build_libdir) -lopen-axiom-core
view2D_DEPENDENCIES = $(Gfun_objects)
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index 897c17c9..d8c4fe79 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -41,7 +41,7 @@ GINC= $(axiom_src_srcdir)/include
# bitmaps for cursors
BIT= $(axiom_src_srcdir)/graph/include/purty
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
bin_PROGRAMS = view3D$(EXEEXT)
@@ -57,8 +57,8 @@ view3D_objects = $(addprefix $(builddir)/, $(view3D_SOURCES:.c=.lo))
Gfun_objects = ../Gdraws/Gfun.lo
-view3D_LDADD = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+view3D_LDADD = $(build_libdir)/libspad.la \
+ -L$(build_libdir) -lopen-axiom-core
view3D_DEPENDENCIES = $(Gfun_objects)
subdir = src/graph/view3D/
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index 6f679cbe..707f4507 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -36,7 +36,7 @@ LINC= $(axiom_src_srcdir)/graph/include
# global include files shared by everyone
GINC= $(axiom_src_srcdir)/include
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
bin_PROGRAMS = viewAlone$(EXEEXT)
@@ -44,8 +44,8 @@ viewAlone_SOURCES = viewAlone.c spoonComp.c spoon2D.c
viewAlone_objects = $(viewAlone_SOURCES:.c=.lo)
-viewAlone_LDADD = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+viewAlone_LDADD = $(build_libdir)/libspad.la \
+ -L$(build_libdir) -lopen-axiom-core
viewAlone_DEPENDENCIES =
subdir = src/graph/viewAlone/
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index 2a6f8ac2..9f096bdd 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -36,7 +36,7 @@ LINC= $(axiom_src_srcdir)/graph/include
# global include files shared by everyone
GINC= $(axiom_src_srcdir)/include
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
bin_PROGRAMS = viewman$(EXEEXT)
@@ -53,8 +53,8 @@ viewman_headers = $(srcdir)/viewman.h \
viewman_DEPENDENCIES =
-viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+viewman_LDFLAGS = $(build_libdir)/libspad.la \
+ -L$(build_libdir) -lopen-axiom-core
subdir = src/graph/viewman/
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in
index e19fe2ab..e1847c03 100644
--- a/src/hyper/Makefile.in
+++ b/src/hyper/Makefile.in
@@ -59,7 +59,7 @@ HEADERS = display.h event.h extent.h \
titlebar.h token.h $(axiom_c_macros_h)
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \
extent2.c form-ext.c group.c halloc.c hash.c hterror.c \
@@ -68,31 +68,30 @@ hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \
parse-paste.c parse-types.c ReadBitmap.c scrollbar.c \
show-types.c spadint.c titlebar.c
-libspad_la = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+libspad_la = $(build_libdir)/libspad.la
hypertex_objects = $(hypertex_SOURCES:.c=.lo)
-hypertex_LDADD = $(libspad_la)
+hypertex_LDADD = $(libspad_la) -L$(build_libdir) -lopen-axiom-core
hypertex_DEPENDENCIES =
htadd_SOURCES = addfile.c halloc.c hash.c htadd.c hterror.c lex.c
htadd_objects = $(htadd_SOURCES:.c=.lo)
-htadd_LDADD = $(libspad_la)
+htadd_LDADD = $(libspad_la) -L$(build_libdir) -lopen-axiom-core
htadd_DEPENDENCIES =
spadbuf_SOURCES = spadbuf.c
spadbuf_objects = $(spadbuf_SOURCES:.c=.lo)
-spadbuf_LDADD = $(libspad_la)
+spadbuf_LDADD = $(libspad_la) -L$(build_libdir) -lopen-axiom-core
spadbuf_DEPENDENCIES =
hthits_SOURCES = hthits.c
hthits_objects = $(hthits_SOURCES:.c=.lo)
-hthits_LDADD = $(libspad_la)
+hthits_LDADD = $(libspad_la) -L$(build_libdir) -lopen-axiom-core
hthits_DEPENDENCIES =
ex2ht_SOURCES = ex2ht.c
ex2ht_objects = $(ex2ht_SOURCES:.c=.lo)
-ex2ht_LDADD = $(libspad_la)
+ex2ht_LDADD = $(libspad_la) -L$(build_libdir) -lopen-axiom-core
ex2ht_DEPENDENCIES =
subdir = src/hyper/
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index c5e2c4a9..efd93df8 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -12,7 +12,7 @@ autoload_objects =
# derived Lisp images (interpsys, AXIOMsys)
LISPSYS= $(axiom_build_bindir)/lisp
-BOOTSYS= $(axiom_build_bindir)/bootsys -- --syslib=$(axiom_target_libdir)
+BOOTSYS= $(axiom_target_bindir)/bootsys -- --syslib=$(axiom_target_libdir)
SAVESYS= interpsys$(EXEEXT)
AXIOMSYS= $(axiom_target_bindir)/AXIOMsys$(EXEEXT)
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index d1925c5b..86450182 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -76,7 +76,7 @@ itself to bootstrap the system). This image is assumed to
have been built (on the build platform) by a previous step in the
make process.
<<environment>>=
-BOOTSYS= $(axiom_build_bindir)/bootsys -- --syslib=$(axiom_target_libdir)
+BOOTSYS= $(axiom_target_bindir)/bootsys -- --syslib=$(axiom_target_libdir)
@
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 5d2476fd..adc4657a 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -62,22 +62,23 @@ subdir = src/lib/
all: all-ax
all-ax all-lib: stamp
-stamp: $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) \
- $(axiom_target_libdir)/libspad.la
+stamp: $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) \
+ libopen-axiom-core.$(LIBEXT) libspad.la
rm -f stamp
$(STAMP) stamp
-$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT): \
+$(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
$(libopen_axiom_core_la_objects)
$(mkinstalldirs) $(axiom_target_libdir)
- $(LIBTOOL) --mode=link $(CC) -shared -o $@ \
- $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ \
- -rpath "$(libdir)"/axiom/target/$(target)/lib
+ $(LIBTOOL) --mode=link $(CC) -shared -module -o $@ \
+ $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ -lm
-$(axiom_target_libdir)/libspad.la: $(libspad_la_objects)
- $(mkinstalldirs) $(axiom_target_libdir)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) \
- -rpath "$(libdir)"/axiom/target/$(target)/lib
+libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_la_objects)
+ $(LIBTOOL) --mode=link $(CC) -static -o $@ \
+ $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ -lm
+
+libspad.la: $(libspad_la_objects)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects)
.PRECIOUS: %.$(OBJEXT) %.lo
@@ -92,9 +93,9 @@ mostlyclean-local:
@rm -f *.lo *.$(OBJEXT)
clean-local: mostlyclean-local
- @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
- @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libspad.la
- @rm -f $(other_objects)
+ @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core$(SHREXT)
+ @$(LIBTOOL) --mode=clean libopen-axiom-core$(LIBEXT)
+ @$(LIBTOOL) --mode=clean libspad.la
@rm -fr .libs _libs
@rm -f stamp
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index c9a76d8d..7d05550f 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -131,6 +131,7 @@ edit = sed \
-e 's|@host[@]|$(host)|g' \
-e 's|@build[@]|$(build)|g' \
-e 's|@target[@]|$(target)|g' \
+ -e 's|@SHREXT[@]|$(SHREXT)|g' \
-e 's|@void_type[@]|$(void_type)|g' \
-e 's|@char_type[@]|$(char_type)|g' \
-e 's|@int_type[@]|$(int_type)|g' \
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 0571a908..52375325 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -71,6 +71,7 @@
"$targetPlatform"
"$faslType"
+ "$NativeModuleExt"
"$systemInstallationDirectory"
"$NativeTypeTable"
@@ -133,6 +134,10 @@
(defconstant |$faslType|
(pathname-type (compile-file-pathname "foo.lisp")))
+;; Extension of file containers for native shared libraries.
+(defconstant |$NativeModuleExt|
+ "@SHREXT@")
+
;;
;; -*- OpenAxiom source file extensions -*-
;;
diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in
index e395b80c..730514d6 100644
--- a/src/sman/Makefile.in
+++ b/src/sman/Makefile.in
@@ -39,28 +39,30 @@ OUTLIB= $(axiom_target_libdir)
# this is where the include files live
INC= $(axiom_src_srcdir)/include
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
bin_PROGRAMS = session$(EXEEXT) \
spadclient$(EXEEXT) \
sman$(EXEEXT)
-libspad_la = $(axiom_target_libdir)/libspad.la \
- $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+libspad_la = $(build_libdir)/libspad.la
session_SOURCES = session.c
session_objects = $(session_SOURCES:.c=.lo)
-session_LDADD = $(libspad_la) @axiom_c_runtime_extra@
+session_LDADD = $(libspad_la) @axiom_c_runtime_extra@ \
+ -L$(build_libdir) -lopen-axiom-core
session_DEPENDENCIES =
spadclient_SOURCES = spadclient.c
spadclient_objects = $(spadclient_SOURCES:.c=.lo)
-spadclient_LDADD = $(libspad_la) @axiom_c_runtime_extra@
+spadclient_LDADD = $(libspad_la) @axiom_c_runtime_extra@ \
+ -L$(build_libdir) -lopen-axiom-core
spadclient_DEPENDENCIES =
sman_SOURCES = sman.c
sman_objects = $(sman_SOURCES:.c=.lo) $(top_builddir)/src/driver/utils.lo
-sman_LDADD = $(libspad_la) @axiom_c_runtime_extra@
+sman_LDADD = $(libspad_la) @axiom_c_runtime_extra@ \
+ -L$(build_libdir) -lopen-axiom-core
sman_DEPENDENCIES =
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 20:54:43 +0000