From 4ac1ad34f60936d342f51653b38c8fbffe630410 Mon Sep 17 00:00:00 2001 From: "U-pekheno\\Vitor" Date: Fri, 4 Jun 2010 22:59:31 +0100 Subject: [PATCH] fix messed up Makefile conventions --- Makefile.in | 2 +- configure | 139 ++++++++++++++++------------ configure.in | 135 +++++++++++++++------------ packages/chr | 2 +- packages/clpqr | 2 +- packages/jpl | 2 +- packages/plunit/Makefile.in | 2 +- packages/sgml/Makefile.in | 4 +- packages/swi-minisat2/C/Makefile.in | 2 +- 9 files changed, 166 insertions(+), 124 deletions(-) mode change 100644 => 100755 packages/plunit/Makefile.in mode change 100644 => 100755 packages/sgml/Makefile.in mode change 100644 => 100755 packages/swi-minisat2/C/Makefile.in diff --git a/Makefile.in b/Makefile.in index 58b66a3b4..ae54ef547 100755 --- a/Makefile.in +++ b/Makefile.in @@ -513,7 +513,7 @@ all: startup.yss startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) -rm -f startup.yss - echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). save_program('startup.yss')." | @PRE_DYNLOADER_PATH@ ./yap -b $(srcdir)/pl/boot.yap + echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). save_program('startup.yss')." | @PRE_INSTALL_ENV@ ./yap -b $(srcdir)/pl/boot.yap yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@ $(MPI_CC) $(STANDARD_CFLAGS) $(LDFLAGS) -o yap yap.o @YAPLIB@ $(LIBS) @MPI_LIBS@ diff --git a/configure b/configure index ee903b5ea..9bda11abc 100755 --- a/configure +++ b/configure @@ -618,7 +618,6 @@ LAM_MPI_CC YAPMPILIB IN_UNIX JAR -JAVALIBS JAVADOC JAVAC JUNIT @@ -631,11 +630,10 @@ NO_BUILTIN_REGEXP YAP_EXTRAS DYNYAPLIB YAPLIB +EXTRA_LIBS_FOR_SWIDLLS EXTRA_LIBS_FOR_DLLS DYNLIB_LD -SHLIB_SWI_LD -SHLIB_LOWER_CXX_LD -SHLIB_LOWER_LD +SHLIB_CXX_LD SHLIB_LD DO_SECOND_LD EXEC_SUFFIX @@ -646,8 +644,8 @@ INSTALL_DLLS ARCH M4GENHDRS M4 -EXTEND_DYNLOADER_PATH -PRE_DYNLOADER_PATH +PRE_INSTALL_ENV +INSTALL_ENV ENABLE_CPLINT CPLINT_SHLIB_LD CPLINT_LDFLAGS @@ -4311,7 +4309,8 @@ then then RANLIB="sslittle-na-sstrix-ranlib" AR="sslittle-na-sstrix-ar" - PRE_DYNLOADER_PATH="sim-fast" + PRE_INSTALL_ENV="sim-fast" + INSTALL_ENV="sim-fast" fi else if test -z "${mycflags}" @@ -4949,13 +4948,12 @@ _ACEOF fi - EXTRA_LIBS_FOR_DLLS=-lws2_32 - else - if test "$target_os" = "cygwin" - then - CC="${CC} -mno-cygwin" - CXX="${CXX} -mno-cygwin" - fi + EXTRA_LIBS_FOR_DLLS="-lws2_32 \$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" + EXTRA_LIBS_FOR_SWIDLLS="-lws2_32 \$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" + elif test "$target_os" = "cygwin" + then + CC="${CC} -mno-cygwin" + CXX="${CXX} -mno-cygwin" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwsock32" >&5 $as_echo_n "checking for main in -lwsock32... " >&6; } if test "${ac_cv_lib_wsock32_main+set}" = set; then : @@ -4995,6 +4993,50 @@ _ACEOF fi + EXTRA_LIBS_FOR_DLLS="-lws2_32 \$(abs_top_builddir)/yap.dll" + EXTRA_LIBS_FOR_SWIDLLS="-lws2_32 \$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwsock32" >&5 +$as_echo_n "checking for main in -lwsock32... " >&6; } +if test "${ac_cv_lib_wsock32_main+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwsock32 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_wsock32_main=yes +else + ac_cv_lib_wsock32_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_main" >&5 +$as_echo "$ac_cv_lib_wsock32_main" >&6; } +if test "x$ac_cv_lib_wsock32_main" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBWSOCK32 1 +_ACEOF + + LIBS="-lwsock32 $LIBS" + +fi + + EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" + EXTRA_LIBS_FOR_SWIDLLS="\$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpsapi" >&5 $as_echo_n "checking for main in -lpsapi... " >&6; } @@ -6056,22 +6098,20 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then ENABLE_JPL="" JAVA=java JAVA_HOME="$yap_cv_java" - if test "x$JAVALIBS" = "x"; then - case "$target_os" in + case "$target_os" in *cygwin*|*mingw*) - JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib -lpthread \$(YAPLIBDIR)/PLStream/plstream.dll" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS \"$JAVA_HOME\"/lib/jvm.lib -lpthread" ;; *darwin*) - JAVALIBS="-Wl,-framework,JavaVM" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS -Wl,-framework,JavaVM" ;; *powerpc-linux*) - JAVALIBS="-ljava -ljvm" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS -ljava -ljvm" ;; *) - JAVALIBS="-ljava -lverify -ljvm" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS -ljava -lverify -ljvm" ;; - esac - fi + esac if test "$yap_cv_java" = ""; then JAVA=java JAR=jar @@ -6519,9 +6559,7 @@ fi INSTALL_DLLS="#" EXTRA_OBJS="" SHLIB_LD="#" -SHLIB_LOWER_LD="#" -SHLIB_LOWER_CXX_LD="#" -SHLIB_SWI_LD="#" +SHLIB_CXX_LD="#" DO_SECOND_LD="#" M4="m4" MERGE_DLL_OBJS="#" @@ -6580,9 +6618,7 @@ fi then SHLIB_SUFFIX=".so" SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic" - SHLIB_SWI_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" DO_SECOND_LD="" LIBS="$LIBS -ldl" case "$target_cpu" in @@ -6641,9 +6677,7 @@ fi #this tells ld to export all non-static symbols, #otherwise no external predicates. SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic" - SHLIB_SWI_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" DO_SECOND_LD="" SHLIB_SUFFIX=".sl" SHLIB_CFLAGS="+z" @@ -6723,7 +6757,6 @@ fi SHLIB_SUFFIX=".so" SHLIB_LD="ld -shared -expect_unresolved '*'" - SHLIB_SWI_LD="ld -shared -expect_unresolved '*'" DO_SECOND_LD="" fi ;; @@ -6732,9 +6765,7 @@ fi SHLIB_SUFFIX=".so" DO_SECOND_LD="" SHLIB_LD="ld -n32 -shared -rdata_shared" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$SHLIB_LD" - SHLIB_SWI_LD="ld -n32 -shared -rdata_shared" + SHLIB_CXX_LD="$SHLIB_LD" INSTALL_DLLS="" ;; *darwin*) @@ -6795,9 +6826,7 @@ fi # SHLIB_LD="$CC -bundle -bundle_loader \$(abs_top_builddir)/yap -L\$(abs_top_builddir) -lYap -undefined dynamic_lookup -Wl,-x -dead-strip -dead_strip_dylibs" # LDFLAGS="-Wl,-x -dead_strip -dead_strip_dylibs $LDFLAGS" SHLIB_LD="$CC -bundle -flat_namespace -undefined suppress" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -bundle -flat_namespace -undefined suppress" - SHLIB_SWI_LD="$CC -bundle -flat_namespace -undefined suppress" + SHLIB_CXX_LD="$CXX -bundle -flat_namespace -undefined suppress" INSTALL_DLLS="" CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2" JAVALIBPATH="-L/System/Library/Frameworks/JavaVM.framework/Libraries" @@ -6814,9 +6843,7 @@ fi LDFLAGS="-Wl,--export-dynamic $LDFLAGS" SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$SHLIB_LOWER_LD" - SHLIB_SWI_LD="ld -Bshareable -x" + SHLIB_CXX_LD="$SHLIB_LD" DO_SECOND_LD="" SHLIB_SUFFIX=".so" INSTALL_DLLS="" @@ -6827,9 +6854,7 @@ fi LDFLAGS="-dynamic $LDFLAGS" SHLIB_CFLAGS="-fPIC" SHLIB_LD="$CC -shared" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -shared" - SHLIB_SWI_LD="$CC -shared" + SHLIB_CXX_LD="$CXX -shared" DO_SECOND_LD="" SHLIB_SUFFIX=".so" INSTALL_DLLS="" @@ -6845,10 +6870,8 @@ fi then LDFLAGS="-Wl,--large-address-aware $LDFLAGS" fi - SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll" - SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll" - SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll" - SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll ../../packages/PLStream/plstream.dll" + SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols" + SHLIB_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols" SHLIB_SUFFIX=".dll" C_PARSER_FLAGS="$C_INTERF_FLAGS" EXEC_SUFFIX=".exe" @@ -6925,15 +6948,15 @@ then case "$target_os" in *cygwin*|*mingw*) DYNLIB_LD="\$(CC) -shared -Wl,--export-all-symbols" - EXTEND_DYNLOADER_PATH="" - PRE_DYNLOADER_PATH="" + PRE_INSTALL_ENV="" + INSTALL_ENV="" ;; *darwin*) DYNYAPLIB=libYap"$SHLIB_SUFFIX" YAPLIB="$DYNYAPLIB" DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" - PRE_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" - EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" + INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" # CROSS_SIMULATOR="DYLD_LIBRARY_PATH=." ;; *) @@ -6948,17 +6971,16 @@ then JAVA_TARGET=sparc ;; esac - EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)" LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)" DYNYAPLIB=libYap"$SHLIB_SUFFIX" YAPLIB="$DYNYAPLIB" - EXTRA_LIBS_FOR_DLLS="-Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" + EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" + PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" ;; esac else - PRE_DYNLOADER_PATH="" - EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + PRE_INSTALL_ENV="" DYNYAPLIB=libYap.notused fi @@ -7309,6 +7331,7 @@ fi + # LAM OLD_CC=${CC} CC=${LAM_MPI_CC} @@ -8241,8 +8264,6 @@ EXEC_SUFFIX="" - - diff --git a/configure.in b/configure.in index b96051b6e..2e9e790ac 100755 --- a/configure.in +++ b/configure.in @@ -4,6 +4,42 @@ dnl AC_PREREQ([2.50]) +dnl VARIABLES EXPORTED +dnl +dnl ARCH +dnl +dnl DefHeapSpace= Default DB space +dnl DefStackSpace= Default global+local +dnl DefTrailSpace= Default trail +dnl +dnl CPLINT +dnl +dnl CPLINT_LIBS= +dnl CPLINT_LIBS= +dnl CPLINT_LDFLAGS= +dnl CPLINT_SHLIB_LD= +dnl +dnl ENVIRONMENT to run YAP before Install is complete +dnl PRE_INSTALL_ENV= prefix to run YAP after libYap.so and yap are available +dnl but before make install +dnl INSTALL_ENV= prefix to run YAP while doing make install +dnl +dnl EXEC_SUFFIX=suffix for executable (.exe) +dnl +dnl INSTALL_DLLS= we can do dynamic linking +dnl SHLIB_SUFFIX= suffix for loadable binary (.so,.dll,.o) +dnl MERGE_DLL_OBJS= we need to merge several .o files into a single dll. +dnl +dnl CXXFLAGS= C++-flags +dnl SHLIB_FLAGS= C-flags used to compile a file that will be loaded dynamically +dnl DO_SECOND_LD= call a separate dll ld +dnl DYNLIB_LD= construct libYap.DLL +dnl SHLIB_LD= dll ld (C) +dnl SHLIB_CXX_LD= dll ld (C++) +dnl EXTRA_LIBS_FOR_DLLS= libs that are required when lding a so +dnl EXTRA_LIBS_FOR_SWIDLLS= libs that are required when lding a SWI so + + AC_INIT(console/yap.c) AC_CONFIG_HEADER(config.h) @@ -460,7 +496,8 @@ then then RANLIB="sslittle-na-sstrix-ranlib" AR="sslittle-na-sstrix-ar" - PRE_DYNLOADER_PATH="sim-fast" + PRE_INSTALL_ENV="sim-fast" + INSTALL_ENV="sim-fast" fi else if test -z "${mycflags}" @@ -519,14 +556,19 @@ then if test "$target_win64" = yes then AC_CHECK_LIB(ws2_32,main) - EXTRA_LIBS_FOR_DLLS=-lws2_32 - else - if test "$target_os" = "cygwin" - then - CC="${CC} -mno-cygwin" - CXX="${CXX} -mno-cygwin" - fi + EXTRA_LIBS_FOR_DLLS="-lws2_32 \$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" + EXTRA_LIBS_FOR_SWIDLLS="-lws2_32 \$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" + elif test "$target_os" = "cygwin" + then + CC="${CC} -mno-cygwin" + CXX="${CXX} -mno-cygwin" AC_CHECK_LIB(wsock32,main) + EXTRA_LIBS_FOR_DLLS="-lws2_32 \$(abs_top_builddir)/yap.dll" + EXTRA_LIBS_FOR_SWIDLLS="-lws2_32 \$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" + else + AC_CHECK_LIB(wsock32,main) + EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll" + EXTRA_LIBS_FOR_SWIDLLS="\$(abs_top_builddir)/yap.dll \$(abs_top_builddir)/packages/PLStream/plstream.dll" fi AC_CHECK_LIB(psapi,main) yap_cv_readline=no @@ -683,22 +725,20 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then ENABLE_JPL="" JAVA=java JAVA_HOME="$yap_cv_java" - if test "x$JAVALIBS" = "x"; then - case "$target_os" in + case "$target_os" in *cygwin*|*mingw*) - JAVALIBS="\"$JAVA_HOME\"/lib/jvm.lib -lpthread \$(YAPLIBDIR)/PLStream/plstream.dll" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS \"$JAVA_HOME\"/lib/jvm.lib -lpthread" ;; *darwin*) - JAVALIBS="-Wl,-framework,JavaVM" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS -Wl,-framework,JavaVM" ;; *powerpc-linux*) - JAVALIBS="-ljava -ljvm" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS -ljava -ljvm" ;; *) - JAVALIBS="-ljava -lverify -ljvm" + EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_SWIDLLS -ljava -lverify -ljvm" ;; - esac - fi + esac if test "$yap_cv_java" = ""; then JAVA=java JAR=jar @@ -777,9 +817,7 @@ dnl defaults INSTALL_DLLS="#" EXTRA_OBJS="" SHLIB_LD="#" -SHLIB_LOWER_LD="#" -SHLIB_LOWER_CXX_LD="#" -SHLIB_SWI_LD="#" +SHLIB_CXX_LD="#" DO_SECOND_LD="#" M4="m4" MERGE_DLL_OBJS="#" @@ -800,9 +838,7 @@ case "$target_os" in then SHLIB_SUFFIX=".so" SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic" - SHLIB_SWI_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" DO_SECOND_LD="" LIBS="$LIBS -ldl" case "$target_cpu" in @@ -860,9 +896,7 @@ case "$target_os" in #this tells ld to export all non-static symbols, #otherwise no external predicates. SHLIB_LD="$CC -shared -export-dynamic" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic" - SHLIB_SWI_LD="$CC -shared -export-dynamic" + SHLIB_CXX_LD="$CXX -shared -export-dynamic" DO_SECOND_LD="" SHLIB_SUFFIX=".sl" SHLIB_CFLAGS="+z" @@ -901,7 +935,6 @@ dnl Linux has both elf and a.out, in this case we found elf have_dl=no) SHLIB_SUFFIX=".so" SHLIB_LD="ld -shared -expect_unresolved '*'" - SHLIB_SWI_LD="ld -shared -expect_unresolved '*'" DO_SECOND_LD="" fi ;; @@ -910,9 +943,7 @@ dnl Linux has both elf and a.out, in this case we found elf SHLIB_SUFFIX=".so" DO_SECOND_LD="" SHLIB_LD="ld -n32 -shared -rdata_shared" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$SHLIB_LD" - SHLIB_SWI_LD="ld -n32 -shared -rdata_shared" + SHLIB_CXX_LD="$SHLIB_LD" INSTALL_DLLS="" ;; *darwin*) @@ -934,9 +965,7 @@ dnl Linux has both elf and a.out, in this case we found elf # SHLIB_LD="$CC -bundle -bundle_loader \$(abs_top_builddir)/yap -L\$(abs_top_builddir) -lYap -undefined dynamic_lookup -Wl,-x -dead-strip -dead_strip_dylibs" # LDFLAGS="-Wl,-x -dead_strip -dead_strip_dylibs $LDFLAGS" SHLIB_LD="$CC -bundle -flat_namespace -undefined suppress" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -bundle -flat_namespace -undefined suppress" - SHLIB_SWI_LD="$CC -bundle -flat_namespace -undefined suppress" + SHLIB_CXX_LD="$CXX -bundle -flat_namespace -undefined suppress" INSTALL_DLLS="" CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2" JAVALIBPATH="-L/System/Library/Frameworks/JavaVM.framework/Libraries" @@ -953,9 +982,7 @@ dnl Linux has both elf and a.out, in this case we found elf LDFLAGS="-Wl,--export-dynamic $LDFLAGS" SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$SHLIB_LOWER_LD" - SHLIB_SWI_LD="ld -Bshareable -x" + SHLIB_CXX_LD="$SHLIB_LD" DO_SECOND_LD="" SHLIB_SUFFIX=".so" INSTALL_DLLS="" @@ -966,9 +993,7 @@ dnl Linux has both elf and a.out, in this case we found elf LDFLAGS="-dynamic $LDFLAGS" SHLIB_CFLAGS="-fPIC" SHLIB_LD="$CC -shared" - SHLIB_LOWER_LD="$SHLIB_LD" - SHLIB_LOWER_CXX_LD="$CXX -shared" - SHLIB_SWI_LD="$CC -shared" + SHLIB_CXX_LD="$CXX -shared" DO_SECOND_LD="" SHLIB_SUFFIX=".so" INSTALL_DLLS="" @@ -984,10 +1009,8 @@ dnl Linux has both elf and a.out, in this case we found elf then LDFLAGS="-Wl,--large-address-aware $LDFLAGS" fi - SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll" - SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll" - SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll" - SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll ../../packages/PLStream/plstream.dll" + SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols" + SHLIB_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols" SHLIB_SUFFIX=".dll" C_PARSER_FLAGS="$C_INTERF_FLAGS" EXEC_SUFFIX=".exe" @@ -1025,15 +1048,15 @@ then case "$target_os" in *cygwin*|*mingw*) DYNLIB_LD="\$(CC) -shared -Wl,--export-all-symbols" - EXTEND_DYNLOADER_PATH="" - PRE_DYNLOADER_PATH="" + PRE_INSTALL_ENV="" + INSTALL_ENV="" ;; *darwin*) DYNYAPLIB=libYap"$SHLIB_SUFFIX" YAPLIB="$DYNYAPLIB" DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" - PRE_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" - EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" + INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" # CROSS_SIMULATOR="DYLD_LIBRARY_PATH=." ;; *) @@ -1048,17 +1071,16 @@ then JAVA_TARGET=sparc ;; esac - EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - PRE_DYNLOADER_PATH="LD_LIBRARY_PATH=\$(abs_top_builddir)" LDFLAGS="$LDFLAGS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)" DYNYAPLIB=libYap"$SHLIB_SUFFIX" YAPLIB="$DYNYAPLIB" - EXTRA_LIBS_FOR_DLLS="-Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" + EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -L \$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" + PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" + INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" ;; esac else - PRE_DYNLOADER_PATH="" - EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + PRE_INSTALL_ENV="" DYNYAPLIB=libYap.notused fi @@ -1174,8 +1196,9 @@ else ENABLE_CPLINT="@#" fi AC_SUBST(ENABLE_CPLINT) -AC_SUBST(PRE_DYNLOADER_PATH) -AC_SUBST(EXTEND_DYNLOADER_PATH) + +AC_SUBST(INSTALL_ENV) +AC_SUBST(PRE_INSTALL_ENV) # LAM OLD_CC=${CC} @@ -1309,11 +1332,10 @@ AC_SUBST(EXEC_SUFFIX) dnl how to call the loader AC_SUBST(DO_SECOND_LD) AC_SUBST(SHLIB_LD) -AC_SUBST(SHLIB_LOWER_LD) -AC_SUBST(SHLIB_LOWER_CXX_LD) -AC_SUBST(SHLIB_SWI_LD) +AC_SUBST(SHLIB_CXX_LD) AC_SUBST(DYNLIB_LD) AC_SUBST(EXTRA_LIBS_FOR_DLLS) +AC_SUBST(EXTRA_LIBS_FOR_SWIDLLS) dnl objects in YAP library AC_SUBST(YAPLIB) AC_SUBST(DYNYAPLIB) @@ -1331,7 +1353,6 @@ AC_SUBST(JAVA_HOME) AC_SUBST(JUNIT) AC_SUBST(JAVAC) AC_SUBST(JAVADOC) -AC_SUBST(JAVALIBS) AC_SUBST(JAR) AC_SUBST(IN_UNIX) AC_SUBST(YAPMPILIB) diff --git a/packages/chr b/packages/chr index 12b02a09d..12da82298 160000 --- a/packages/chr +++ b/packages/chr @@ -1 +1 @@ -Subproject commit 12b02a09d668486808caeefb521da3a57b0b7f16 +Subproject commit 12da822986e8db33e52f9c72799622ce7e98bef0 diff --git a/packages/clpqr b/packages/clpqr index dc903cf88..b83af78bc 160000 --- a/packages/clpqr +++ b/packages/clpqr @@ -1 +1 @@ -Subproject commit dc903cf885614c5caef0411dcf35c650d4f290b4 +Subproject commit b83af78bc61e7601151282c3c138210541619c57 diff --git a/packages/jpl b/packages/jpl index c6b86a4c7..89bfacef5 160000 --- a/packages/jpl +++ b/packages/jpl @@ -1 +1 @@ -Subproject commit c6b86a4c77da30c8e3a9eafcad76a54004a779de +Subproject commit 89bfacef558f12074fa362a5148f9de24730f4b0 diff --git a/packages/plunit/Makefile.in b/packages/plunit/Makefile.in old mode 100644 new mode 100755 index a030e3b63..95aae4d3e --- a/packages/plunit/Makefile.in +++ b/packages/plunit/Makefile.in @@ -22,7 +22,7 @@ LIBDIR=@libdir@ YAPLIBDIR=@libdir@/Yap SHAREDIR=$(EROOTDIR)/share/Yap -PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss +PL=@INSTALL_ENV@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss LN_S=@LN_S@ EXDIR=$(LIBDIR)/examples/plunit diff --git a/packages/sgml/Makefile.in b/packages/sgml/Makefile.in old mode 100644 new mode 100755 index 7c63d08c5..039ab6b94 --- a/packages/sgml/Makefile.in +++ b/packages/sgml/Makefile.in @@ -22,7 +22,7 @@ YAPLIBDIR=@libdir@/Yap SHAREDIR=$(ROOTDIR)/share/Yap SHELL=@SHELL@ -PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss +PL=@INSTALL_ENV@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss CHRDIR=$(SHAREDIR)/chr EXDIR=$(CHRDIR)/examples/chr LN_S=@LN_S@ @@ -114,7 +114,7 @@ ifeq (@PROLOG_SYSTEM@,yap) $(CC) $(CFLAGS) $(SHLIB_CFLAGS) -o $@ -c $< @DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ) -@DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ all: $(TARGETS) $(PROGRAMS) diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in old mode 100644 new mode 100755 index 582d3d584..34a0458e8 --- a/packages/swi-minisat2/C/Makefile.in +++ b/packages/swi-minisat2/C/Makefile.in @@ -70,7 +70,7 @@ pl-minisat.o : $(srcdir)/pl-minisat.C $(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o @DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS) -@DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ +@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ install: all $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)