diff options
| -rw-r--r-- | config/var-def.mk | 3 | ||||
| -rwxr-xr-x | configure | 64 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 8 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 5 |
5 files changed, 60 insertions, 28 deletions
diff --git a/config/var-def.mk b/config/var-def.mk index 3a4efcc9..746d0115 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -85,6 +85,9 @@ LINK_SHRLIB = $(LIBTOOL) --mode=link $(CC) -shared -module endif +oa_shrobj_flags = @oa_shrobj_flags@ +oa_shrlib_flags = @oa_shrlib_flags@ + AUTOCONF = autoconf AWK = @AWK@ INSTALL = @INSTALL@ @@ -829,6 +829,8 @@ LIBTOOL_DEPS shared_ext libext oa_use_libtool_for_shared_lib +oa_shrobj_flags +oa_shrlib_flags axiom_enable_checking axiom_optimize_options axiom_src_subdirs @@ -1990,6 +1992,8 @@ ac_config_headers="$ac_config_headers config/axiom-c-macros.h" oa_use_libtool_for_shared_lib=yes +oa_shrobj_flags='-prefer-pic' +oa_shrlib_flags='-shared' # Tell Libtool to assume `dlopen' so that it does not have to # emulate it. @@ -3792,7 +3796,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3795 "configure"' > conftest.$ac_ext + echo '#line 3799 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6937,11 +6941,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:6940: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6944: \$? = $ac_status" >&5 + echo "$as_me:6948: \$? = $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. @@ -7205,11 +7209,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:7208: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7212: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7212: \$? = $ac_status" >&5 + echo "$as_me:7216: \$? = $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. @@ -7309,11 +7313,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:7312: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7316: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7316: \$? = $ac_status" >&5 + echo "$as_me:7320: \$? = $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 @@ -9761,7 +9765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9764 "configure" +#line 9768 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9861,7 +9865,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9864 "configure" +#line 9868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12229,11 +12233,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:12232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12236: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12236: \$? = $ac_status" >&5 + echo "$as_me:12240: \$? = $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. @@ -12333,11 +12337,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:12336: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12340: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12340: \$? = $ac_status" >&5 + echo "$as_me:12344: \$? = $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 @@ -13903,11 +13907,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:13906: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13910: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13910: \$? = $ac_status" >&5 + echo "$as_me:13914: \$? = $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. @@ -14007,11 +14011,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:14010: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14014: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14014: \$? = $ac_status" >&5 + echo "$as_me:14018: \$? = $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 @@ -16237,11 +16241,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:16240: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16244: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16244: \$? = $ac_status" >&5 + echo "$as_me:16248: \$? = $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. @@ -16505,11 +16509,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:16508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16512: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16512: \$? = $ac_status" >&5 + echo "$as_me:16516: \$? = $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. @@ -16609,11 +16613,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:16612: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16616: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16616: \$? = $ac_status" >&5 + echo "$as_me:16620: \$? = $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 @@ -19312,12 +19316,18 @@ eval shared_ext=\"$shrext_cmds\" case $host in *mingw*|*cygwin*) oa_use_libtool_for_shared_lib=no + oa_shrlib_flags="$oa_shrlib_flags --export-all-symbols" ;; + *darwin*) + oa_shrobj_flags='-dynamic' + oa_shrlib_flags='-dylib' *) ;; esac + + axiom_optimize_options=speed ## Shall we proclaim safety? axiom_enable_checking=no # don't turn on checking by default. @@ -26095,6 +26105,8 @@ LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim shared_ext!$shared_ext$ac_delim libext!$libext$ac_delim oa_use_libtool_for_shared_lib!$oa_use_libtool_for_shared_lib$ac_delim +oa_shrobj_flags!$oa_shrobj_flags$ac_delim +oa_shrlib_flags!$oa_shrlib_flags$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 @@ -26115,8 +26127,6 @@ PATCH!$PATCH$ac_delim LATEX!$LATEX$ac_delim MAKEINDEX!$MAKEINDEX$ac_delim NOTANGLE!$NOTANGLE$ac_delim -NOWEAVE!$NOWEAVE$ac_delim -AXIOM_LISP!$AXIOM_LISP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -26158,6 +26168,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -26191,7 +26203,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` = 31; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; 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 0400145b..92967519 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_PREREQ([2.60]) AC_CONFIG_SRCDIR(src/Makefile.pamphlet) oa_use_libtool_for_shared_lib=yes +oa_shrobj_flags='-prefer-pic' +oa_shrlib_flags='-shared' # Tell Libtool to assume `dlopen' so that it does not have to # emulate it. AC_LIBTOOL_DLOPEN @@ -26,11 +28,17 @@ AC_SUBST(libext) case $host in *mingw*|*cygwin*) oa_use_libtool_for_shared_lib=no + oa_shrlib_flags="$oa_shrlib_flags --export-all-symbols" ;; + *darwin*) + oa_shrobj_flags='-dynamic' + oa_shrlib_flags='-dylib' *) ;; esac AC_SUBST(oa_use_libtool_for_shared_lib) +AC_SUBST(oa_shrobj_flags) +AC_SUBST(oa_shrlib_flags) axiom_optimize_options=speed ## Shall we proclaim safety? diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 36707652..6e773071 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1215,6 +1215,8 @@ abstract away from those details. In particular, we rely on GNU \Tool{libtool} to take care of that for us. <<initialize shared libraries tool>>= oa_use_libtool_for_shared_lib=yes +oa_shrobj_flags='-prefer-pic' +oa_shrlib_flags='-shared' # Tell Libtool to assume `dlopen' so that it does not have to # emulate it. AC_LIBTOOL_DLOPEN @@ -1229,11 +1231,17 @@ AC_SUBST(libext) case $host in *mingw*|*cygwin*) oa_use_libtool_for_shared_lib=no + oa_shrlib_flags="$oa_shrlib_flags --export-all-symbols" ;; + *darwin*) + oa_shrobj_flags='-dynamic' + oa_shrlib_flags='-dylib' *) ;; esac AC_SUBST(oa_use_libtool_for_shared_lib) +AC_SUBST(oa_shrobj_flags) +AC_SUBST(oa_shrlib_flags) @ \section{configure.ac} diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 20668fec..3ac1a3f1 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -76,7 +76,8 @@ stamp: $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) \ $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \ $(libopen_axiom_core_objects) $(mkinstalldirs) $(axiom_target_libdir) - $(LINK_SHRLIB) -o $@ $(libopen_axiom_core_objects) \ + $(LINK_SHRLIB) $(oa_shrlib_flags) -o $@ \ + $(libopen_axiom_core_objects) \ @axiom_c_runtime_extra@ -lm libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo) @@ -89,7 +90,7 @@ libspad.$(LIBEXT): $(libspad_objects) .PRECIOUS: %.$(OBJEXT) %.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h) - $(COMPILE) -prefer-pic -o $@ $(CCF) -DOPENAXIOM_BUILD_DLL \ + $(COMPILE) $(oa_shrobj_flags) -o $@ $(CCF) -DOPENAXIOM_BUILD_DLL \ $(axiom_includes) $(AXIOM_X11_CFLAGS) $< # This is a support library, so it does not change often and |