From 48272db136adb7a6a2b36204d03f12760cc7aa40 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 16 Mar 2008 08:09:13 +0000 Subject: * lib/Makefile.in ($(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)): Tidy. ($(axiom_target_libdir)/libspad.la): Likewise. --- ChangeLog | 5 +++ config/var-def.mk | 2 ++ configure | 70 ++++++++++++++++++++++------------------- configure.ac | 5 ++- configure.ac.pamphlet | 5 ++- src/ChangeLog | 5 +++ src/clef/Makefile.in | 2 +- src/graph/view2D/Makefile.in | 2 +- src/graph/view3D/Makefile.in | 2 +- src/graph/viewAlone/Makefile.in | 2 +- src/graph/viewman/Makefile.in | 2 +- src/hyper/Makefile.in | 2 +- src/lib/Makefile.in | 13 ++++---- src/sman/Makefile.in | 2 +- 14 files changed, 71 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2c812e3..74a7f77d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Gabriel Dos Reis + + * configure.ac.pamphlet: Tell Libtool to assume `dlopen'. + * config/var-def.mk (DLLEXT): New. + 2008-03-15 Gabriel Dos Reis * configure.ac.pamphlet (axiom_c_runtime): Don't include core, as diff --git a/config/var-def.mk b/config/var-def.mk index 8809d1ae..2bc5558c 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -55,6 +55,8 @@ CC = @CC@ CFLAGS = @CFLAGS@ OBJEXT = @OBJEXT@ EXEEXT = @EXEEXT@ +DLLEXT = $(if $(findstring mingw, $(target)),dll,so) + PACKAGE_STRING = @PACKAGE_STRING@ diff --git a/configure b/configure index b743a79e..ece8ff69 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.60 for OpenAxiom 1.2.0-2008-03-15. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-03-16. # # Report bugs to . # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.2.0-2008-03-15' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-15' +PACKAGE_VERSION='1.2.0-2008-03-16' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-16' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1387,7 +1387,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.2.0-2008-03-15 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-03-16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-15:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-16:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-03-15 +OpenAxiom configure 1.2.0-2008-03-16 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,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.2.0-2008-03-15, which was +It was created by OpenAxiom $as_me 1.2.0-2008-03-16, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1976,6 +1976,10 @@ ac_config_headers="$ac_config_headers config/axiom-c-macros.h" +# Tell Libtool to assume `dlopen' so that it does not have to +# emulate it. + + # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; p=${PACKAGE-default} @@ -3772,7 +3776,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3775 "configure"' > conftest.$ac_ext + echo '#line 3779 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6534,7 +6538,7 @@ fi ;; esac -enable_dlopen=no +enable_dlopen=yes enable_win32_dll=no # Check whether --enable-libtool-lock was given. @@ -6627,11 +6631,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:6630: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6634: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6634: \$? = $ac_status" >&5 + echo "$as_me:6638: \$? = $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. @@ -6895,11 +6899,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:6898: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6902: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6902: \$? = $ac_status" >&5 + echo "$as_me:6906: \$? = $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. @@ -6999,11 +7003,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:7002: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7006: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7006: \$? = $ac_status" >&5 + echo "$as_me:7010: \$? = $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 @@ -9451,7 +9455,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11926: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11926: \$? = $ac_status" >&5 + echo "$as_me:11930: \$? = $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. @@ -12023,11 +12027,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:12026: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12030: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12030: \$? = $ac_status" >&5 + echo "$as_me:12034: \$? = $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 @@ -13593,11 +13597,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:13596: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13600: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13600: \$? = $ac_status" >&5 + echo "$as_me:13604: \$? = $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. @@ -13697,11 +13701,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:13700: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13704: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13704: \$? = $ac_status" >&5 + echo "$as_me:13708: \$? = $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 @@ -15927,11 +15931,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:15930: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15934: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15934: \$? = $ac_status" >&5 + echo "$as_me:15938: \$? = $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. @@ -16195,11 +16199,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:16198: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16202: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16202: \$? = $ac_status" >&5 + echo "$as_me:16206: \$? = $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. @@ -16299,11 +16303,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:16302: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16306: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16306: \$? = $ac_status" >&5 + echo "$as_me:16310: \$? = $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 @@ -25229,7 +25233,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.2.0-2008-03-15, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-03-16, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25278,7 +25282,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-03-15 +OpenAxiom config.status 1.2.0-2008-03-16 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 80572936..6016198d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-15], +AC_INIT([OpenAxiom], [1.2.0-2008-03-16], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) @@ -11,6 +11,9 @@ AC_PREREQ([2.60]) AC_CONFIG_SRCDIR(src/Makefile.pamphlet) +# Tell Libtool to assume `dlopen' so that it does not have to +# emulate it. +AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 03c8a06a..282c9383 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1022,7 +1022,7 @@ information: <>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-15], +AC_INIT([OpenAxiom], [1.2.0-2008-03-16], [open-axiom-bugs@lists.sf.net]) @ @@ -1157,6 +1157,9 @@ of traps. Consequently, dedicated tools have been developed to abstract away from those details. In particular, we rely on 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_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) @ diff --git a/src/ChangeLog b/src/ChangeLog index eaeebd10..4fd3989d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Gabriel Dos Reis + + * lib/Makefile.in ($(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)): Tidy. + ($(axiom_target_libdir)/libspad.la): Likewise. + 2008-03-15 Gabriel Dos Reis * include/cfuns.h (findString): Rename from include/cfuns-c.H1. diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in index 65d39a42..7e885ff5 100644 --- a/src/clef/Makefile.in +++ b/src/clef/Makefile.in @@ -40,7 +40,7 @@ clef_SOURCES = edible.c clef_objects = $(clef_SOURCES:.c=.lo) clef_LDADD = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) clef_DEPENDENCIES = diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in index cc9b80cf..e64ad57b 100644 --- a/src/graph/view2D/Makefile.in +++ b/src/graph/view2D/Makefile.in @@ -49,7 +49,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.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) view2D_DEPENDENCIES = $(Gfun_objects) diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in index edd6a2e9..897c17c9 100644 --- a/src/graph/view3D/Makefile.in +++ b/src/graph/view3D/Makefile.in @@ -58,7 +58,7 @@ Gfun_objects = ../Gdraws/Gfun.lo view3D_LDADD = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) view3D_DEPENDENCIES = $(Gfun_objects) subdir = src/graph/view3D/ diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in index a5b12473..6f679cbe 100644 --- a/src/graph/viewAlone/Makefile.in +++ b/src/graph/viewAlone/Makefile.in @@ -45,7 +45,7 @@ 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.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) viewAlone_DEPENDENCIES = subdir = src/graph/viewAlone/ diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in index 066ff0a5..2a6f8ac2 100644 --- a/src/graph/viewman/Makefile.in +++ b/src/graph/viewman/Makefile.in @@ -54,7 +54,7 @@ viewman_headers = $(srcdir)/viewman.h \ viewman_DEPENDENCIES = viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) subdir = src/graph/viewman/ diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index 45f22ac1..e19fe2ab 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -69,7 +69,7 @@ hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \ show-types.c spadint.c titlebar.c libspad_la = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) hypertex_objects = $(hypertex_SOURCES:.c=.lo) hypertex_LDADD = $(libspad_la) diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 7c1b708d..5d2476fd 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -62,21 +62,22 @@ subdir = src/lib/ all: all-ax all-ax all-lib: stamp -stamp: $(axiom_target_libdir)/libopen-axiom-core.la \ +stamp: $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) \ $(axiom_target_libdir)/libspad.la rm -f stamp $(STAMP) stamp -$(axiom_target_libdir)/libopen-axiom-core.la: \ +$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT): \ $(libopen_axiom_core_la_objects) $(mkinstalldirs) $(axiom_target_libdir) - $(LIBTOOL) --mode=link $(CC) -module -o $@ \ - $(libopen_axiom_core_la_objects) + $(LIBTOOL) --mode=link $(CC) -shared -o $@ \ + $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ \ + -rpath "$(libdir)"/axiom/target/$(target)/lib $(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 + -rpath "$(libdir)"/axiom/target/$(target)/lib .PRECIOUS: %.$(OBJEXT) %.lo @@ -91,7 +92,7 @@ mostlyclean-local: @rm -f *.lo *.$(OBJEXT) clean-local: mostlyclean-local - @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core.la + @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libspad.la @rm -f $(other_objects) @rm -fr .libs _libs diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index e416807e..e395b80c 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -46,7 +46,7 @@ bin_PROGRAMS = session$(EXEEXT) \ sman$(EXEEXT) libspad_la = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) session_SOURCES = session.c session_objects = $(session_SOURCES:.c=.lo) -- cgit v1.2.3