fix darwin compilation
try simplifying script
This commit is contained in:
parent
c9e150bab7
commit
3fd428b211
100
configure
vendored
100
configure
vendored
@ -6747,6 +6747,11 @@ fi
|
|||||||
then
|
then
|
||||||
LIBS="$LIBS -lnsl"
|
LIBS="$LIBS -lnsl"
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*sunos4*)
|
*sunos4*)
|
||||||
M4="/usr/5bin/m4"
|
M4="/usr/5bin/m4"
|
||||||
@ -6757,6 +6762,11 @@ fi
|
|||||||
fi
|
fi
|
||||||
SO="o"
|
SO="o"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*hpux*)
|
*hpux*)
|
||||||
#do not use the first memory quadrant
|
#do not use the first memory quadrant
|
||||||
@ -6794,6 +6804,11 @@ fi
|
|||||||
$as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h
|
$as_echo "#define MPI_AVOID_REALLOC 1" >>confdefs.h
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*aix*)
|
*aix*)
|
||||||
# To actually use dlls in AIX I'd need to build YAP as a DLL first.
|
# To actually use dlls in AIX I'd need to build YAP as a DLL first.
|
||||||
@ -6802,6 +6817,11 @@ fi
|
|||||||
# SO="a"
|
# SO="a"
|
||||||
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
|
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
|
||||||
#INSTALL_DLLS=""
|
#INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*osf*)
|
*osf*)
|
||||||
if ${use_condor} = no
|
if ${use_condor} = no
|
||||||
@ -6853,6 +6873,11 @@ fi
|
|||||||
SHLIB_LD="ld -shared -expect_unresolved '*'"
|
SHLIB_LD="ld -shared -expect_unresolved '*'"
|
||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*irix6*)
|
*irix6*)
|
||||||
SHLIB_CFLAGS=""
|
SHLIB_CFLAGS=""
|
||||||
@ -6861,6 +6886,11 @@ fi
|
|||||||
SHLIB_LD="ld -n32 -shared -rdata_shared"
|
SHLIB_LD="ld -n32 -shared -rdata_shared"
|
||||||
SHLIB_CXX_LD="$SHLIB_LD"
|
SHLIB_CXX_LD="$SHLIB_LD"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*darwin*)
|
*darwin*)
|
||||||
if test ${use_dlcompat} = yes
|
if test ${use_dlcompat} = yes
|
||||||
@ -6916,10 +6946,23 @@ fi
|
|||||||
SHLIB_CFLAGS="-fno-common"
|
SHLIB_CFLAGS="-fno-common"
|
||||||
SO="dylib"
|
SO="dylib"
|
||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
SHLIB_LD="$CC -dynamiclib"
|
if test "$dynamic_loading" = "yes"
|
||||||
SHLIB_CXX_LD="$CXX -dynamiclib"
|
then
|
||||||
|
SHLIB_LD="$CC -dynamiclib"
|
||||||
|
SHLIB_CXX_LD="$CXX -dynamiclib"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(DESTDIR)\$(YAPLIBDIR)/\$@"
|
||||||
|
INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
else
|
||||||
|
SHLIB_LD="$CC -dynamiclib -Wl,-undefined,dynamic_lookup"
|
||||||
|
SHLIB_CXX_LD="$CXX -dynamiclib -Wl,-undefined,dynamic_lookup"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-install_name,\$(DESTDIR)\$(YAPLIBDIR)/\$@"
|
||||||
|
INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
fi
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"
|
CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
|
||||||
|
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
|
||||||
;;
|
;;
|
||||||
*netbsd*|*freebsd*)
|
*netbsd*|*freebsd*)
|
||||||
if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
|
if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
|
||||||
@ -6937,6 +6980,11 @@ fi
|
|||||||
SO="so"
|
SO="so"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*solaris*)
|
*solaris*)
|
||||||
#an elf system
|
#an elf system
|
||||||
@ -6947,6 +6995,11 @@ fi
|
|||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
SO="so"
|
SO="so"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*cyg*|*mingw*)
|
*cyg*|*mingw*)
|
||||||
# gcc on cygwin seems to have trouble with longjmp
|
# gcc on cygwin seems to have trouble with longjmp
|
||||||
@ -6966,6 +7019,9 @@ fi
|
|||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
MERGE_DLL_OBJS=""
|
MERGE_DLL_OBJS=""
|
||||||
IN_UNIX="#"
|
IN_UNIX="#"
|
||||||
|
DYNLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
|
||||||
|
PRE_INSTALL_ENV=""
|
||||||
|
INSTALL_ENV=""
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
||||||
@ -7025,44 +7081,22 @@ fi
|
|||||||
then
|
then
|
||||||
LIBS="$LIBS -lnsl"
|
LIBS="$LIBS -lnsl"
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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
|
esac
|
||||||
|
|
||||||
|
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir)/packages/PLStream -lplstream"
|
||||||
|
|
||||||
|
|
||||||
if test "$dynamic_loading" = "yes"
|
if test "$dynamic_loading" = "yes"
|
||||||
then
|
then
|
||||||
DYNLIB_LD="$SHLIB_LD"
|
YAPLIB="$DYNYAPLIB"
|
||||||
YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS"
|
|
||||||
case "$target_os" in
|
|
||||||
*cygwin*|*mingw*)
|
|
||||||
DYNLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
|
|
||||||
PRE_INSTALL_ENV=""
|
|
||||||
INSTALL_ENV=""
|
|
||||||
;;
|
|
||||||
*darwin*)
|
|
||||||
DYNYAPLIB=libYap."$SO"
|
|
||||||
YAPLIB="$DYNYAPLIB"
|
|
||||||
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
|
|
||||||
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
|
|
||||||
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(DESTDIR)\$(YAPLIBDIR)/\$@"
|
|
||||||
INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
|
|
||||||
# CROSS_SIMULATOR="DYLD_LIBRARY_PATH=."
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
|
||||||
DYNYAPLIB=libYap."$SO"
|
|
||||||
YAPLIB="$DYNYAPLIB"
|
|
||||||
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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_INSTALL_ENV=""
|
|
||||||
DYNYAPLIB=libYap.notused
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir)/packages/PLStream -lplstream"
|
|
||||||
|
|
||||||
if test "$coroutining" = "yes"
|
if test "$coroutining" = "yes"
|
||||||
then
|
then
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1"
|
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1"
|
||||||
|
100
configure.in
100
configure.in
@ -875,6 +875,11 @@ case "$target_os" in
|
|||||||
then
|
then
|
||||||
LIBS="$LIBS -lnsl"
|
LIBS="$LIBS -lnsl"
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*sunos4*)
|
*sunos4*)
|
||||||
M4="/usr/5bin/m4"
|
M4="/usr/5bin/m4"
|
||||||
@ -885,6 +890,11 @@ case "$target_os" in
|
|||||||
fi
|
fi
|
||||||
SO="o"
|
SO="o"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*hpux*)
|
*hpux*)
|
||||||
#do not use the first memory quadrant
|
#do not use the first memory quadrant
|
||||||
@ -918,6 +928,11 @@ case "$target_os" in
|
|||||||
then
|
then
|
||||||
AC_DEFINE(MPI_AVOID_REALLOC,1)
|
AC_DEFINE(MPI_AVOID_REALLOC,1)
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*aix*)
|
*aix*)
|
||||||
# To actually use dlls in AIX I'd need to build YAP as a DLL first.
|
# To actually use dlls in AIX I'd need to build YAP as a DLL first.
|
||||||
@ -926,6 +941,11 @@ case "$target_os" in
|
|||||||
# SO="a"
|
# SO="a"
|
||||||
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
|
#SHLIB_LD="\$(srcdir)/../../ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
|
||||||
#INSTALL_DLLS=""
|
#INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*osf*)
|
*osf*)
|
||||||
if ${use_condor} = no
|
if ${use_condor} = no
|
||||||
@ -939,6 +959,11 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
SHLIB_LD="ld -shared -expect_unresolved '*'"
|
SHLIB_LD="ld -shared -expect_unresolved '*'"
|
||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*irix6*)
|
*irix6*)
|
||||||
SHLIB_CFLAGS=""
|
SHLIB_CFLAGS=""
|
||||||
@ -947,6 +972,11 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
SHLIB_LD="ld -n32 -shared -rdata_shared"
|
SHLIB_LD="ld -n32 -shared -rdata_shared"
|
||||||
SHLIB_CXX_LD="$SHLIB_LD"
|
SHLIB_CXX_LD="$SHLIB_LD"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*darwin*)
|
*darwin*)
|
||||||
if test ${use_dlcompat} = yes
|
if test ${use_dlcompat} = yes
|
||||||
@ -963,10 +993,23 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
SHLIB_CFLAGS="-fno-common"
|
SHLIB_CFLAGS="-fno-common"
|
||||||
SO="dylib"
|
SO="dylib"
|
||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
SHLIB_LD="$CC -dynamiclib"
|
if test "$dynamic_loading" = "yes"
|
||||||
SHLIB_CXX_LD="$CXX -dynamiclib"
|
then
|
||||||
|
SHLIB_LD="$CC -dynamiclib"
|
||||||
|
SHLIB_CXX_LD="$CXX -dynamiclib"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(DESTDIR)\$(YAPLIBDIR)/\$@"
|
||||||
|
INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
else
|
||||||
|
SHLIB_LD="$CC -dynamiclib -Wl,-undefined,dynamic_lookup"
|
||||||
|
SHLIB_CXX_LD="$CXX -dynamiclib -Wl,-undefined,dynamic_lookup"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-install_name,\$(DESTDIR)\$(YAPLIBDIR)/\$@"
|
||||||
|
INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
fi
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"
|
CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
|
||||||
|
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
|
||||||
;;
|
;;
|
||||||
*netbsd*|*freebsd*)
|
*netbsd*|*freebsd*)
|
||||||
if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
|
if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
|
||||||
@ -984,6 +1027,11 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
SO="so"
|
SO="so"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*solaris*)
|
*solaris*)
|
||||||
#an elf system
|
#an elf system
|
||||||
@ -994,6 +1042,11 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
SO="so"
|
SO="so"
|
||||||
INSTALL_DLLS=""
|
INSTALL_DLLS=""
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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)"
|
||||||
;;
|
;;
|
||||||
*cyg*|*mingw*)
|
*cyg*|*mingw*)
|
||||||
# gcc on cygwin seems to have trouble with longjmp
|
# gcc on cygwin seems to have trouble with longjmp
|
||||||
@ -1013,6 +1066,9 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
DO_SECOND_LD=""
|
DO_SECOND_LD=""
|
||||||
MERGE_DLL_OBJS=""
|
MERGE_DLL_OBJS=""
|
||||||
IN_UNIX="#"
|
IN_UNIX="#"
|
||||||
|
DYNLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
|
||||||
|
PRE_INSTALL_ENV=""
|
||||||
|
INSTALL_ENV=""
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_CHECK_LIB(dl,dlopen,
|
AC_CHECK_LIB(dl,dlopen,
|
||||||
@ -1033,44 +1089,22 @@ dnl Linux has both elf and a.out, in this case we found elf
|
|||||||
then
|
then
|
||||||
LIBS="$LIBS -lnsl"
|
LIBS="$LIBS -lnsl"
|
||||||
fi
|
fi
|
||||||
|
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
||||||
|
DYNYAPLIB=libYap."$SO"
|
||||||
|
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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
|
esac
|
||||||
|
|
||||||
|
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir)/packages/PLStream -lplstream"
|
||||||
|
|
||||||
|
|
||||||
if test "$dynamic_loading" = "yes"
|
if test "$dynamic_loading" = "yes"
|
||||||
then
|
then
|
||||||
DYNLIB_LD="$SHLIB_LD"
|
YAPLIB="$DYNYAPLIB"
|
||||||
YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS"
|
|
||||||
case "$target_os" in
|
|
||||||
*cygwin*|*mingw*)
|
|
||||||
DYNLIB_LD="\$(CC) -shared -Wl,--export-all-symbols"
|
|
||||||
PRE_INSTALL_ENV=""
|
|
||||||
INSTALL_ENV=""
|
|
||||||
;;
|
|
||||||
*darwin*)
|
|
||||||
DYNYAPLIB=libYap."$SO"
|
|
||||||
YAPLIB="$DYNYAPLIB"
|
|
||||||
DYNLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
|
|
||||||
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
|
|
||||||
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(DESTDIR)\$(YAPLIBDIR)/\$@"
|
|
||||||
INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
|
|
||||||
# CROSS_SIMULATOR="DYLD_LIBRARY_PATH=."
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
|
|
||||||
DYNYAPLIB=libYap."$SO"
|
|
||||||
YAPLIB="$DYNYAPLIB"
|
|
||||||
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -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_INSTALL_ENV=""
|
|
||||||
DYNYAPLIB=libYap.notused
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir)/packages/PLStream -lplstream"
|
|
||||||
|
|
||||||
if test "$coroutining" = "yes"
|
if test "$coroutining" = "yes"
|
||||||
then
|
then
|
||||||
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1"
|
YAP_EXTRAS="$YAP_EXTRAS -DCOROUTINING=1"
|
||||||
|
Reference in New Issue
Block a user