improve ld support in dynamic library version.
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1274 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
parent
f331b192c3
commit
eb8721e6be
|
|
@ -308,7 +308,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GCC C_INTERF_FLAGS C_PARSER_FLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INDENT ac_ct_INDENT AR ac_ct_AR MPI_CC ac_ct_MPI_CC INSTALL_INFO INSTALL_COMMAND CROSS_SIMULATOR CPP EGREP YAPMPILIB MPI_OBJS MPI_LIBS INSTALL_DLLS MERGE_DLL_OBJS SHLIB_CFLAGS SHLIB_SUFFIX EXEC_SUFFIX DO_SECOND_LD SHLIB_LD YAPLIB YAP_EXTRAS NO_BUILTIN_REGEXP ENABLE_JPL JAVA_HOME JAVAC JAR IN_UNIX M4 M4GENHDRS M4GENABSMI LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GCC C_INTERF_FLAGS C_PARSER_FLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INDENT ac_ct_INDENT AR ac_ct_AR MPI_CC ac_ct_MPI_CC INSTALL_INFO CPP EGREP M4 M4GENHDRS INSTALL_DLLS MERGE_DLL_OBJS SHLIB_CFLAGS SHLIB_SUFFIX EXEC_SUFFIX DO_SECOND_LD SHLIB_LD YAPLIB YAP_EXTRAS NO_BUILTIN_REGEXP ENABLE_JPL JAVA_HOME JAVAC JAR IN_UNIX YAPMPILIB MPI_OBJS MPI_LIBS INSTALL_COMMAND CROSS_SIMULATOR M4GENABSMI LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3167,10 +3167,6 @@ echo "${ECHO_T}no" >&6
|
|||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "$target_os" = "cygwin"
|
||||
then
|
||||
INSTALL_COMMAND=install_win32
|
||||
|
|
@ -4838,10 +4834,6 @@ fi
|
|||
CC=${OLD_CC}
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
|
|
@ -5383,23 +5375,6 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
EXEC_SUFFIX=""
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
INSTALL_DLLS="#"
|
||||
SHLIB_LD="@#"
|
||||
DO_SECOND_LD="#"
|
||||
|
|
@ -5830,6 +5805,8 @@ if test "$dynamic_loading" = "yes"
|
|||
then
|
||||
YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS"
|
||||
YAPLIB=libYap"$SHLIB_SUFFIX"
|
||||
CROSS_SIMULATOR="LD_LIBRARY_PATH=."
|
||||
LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib"
|
||||
fi
|
||||
|
||||
if test "$coroutining" = "yes"
|
||||
|
|
@ -11340,6 +11317,29 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
EXEC_SUFFIX=""
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for gcc threaded code" >&5
|
||||
echo $ECHO_N "checking for gcc threaded code... $ECHO_C" >&6
|
||||
if test "${yap_cv_threaded_code+set}" = set; then
|
||||
|
|
@ -14207,13 +14207,10 @@ s,@ac_ct_AR@,$ac_ct_AR,;t t
|
|||
s,@MPI_CC@,$MPI_CC,;t t
|
||||
s,@ac_ct_MPI_CC@,$ac_ct_MPI_CC,;t t
|
||||
s,@INSTALL_INFO@,$INSTALL_INFO,;t t
|
||||
s,@INSTALL_COMMAND@,$INSTALL_COMMAND,;t t
|
||||
s,@CROSS_SIMULATOR@,$CROSS_SIMULATOR,;t t
|
||||
s,@CPP@,$CPP,;t t
|
||||
s,@EGREP@,$EGREP,;t t
|
||||
s,@YAPMPILIB@,$YAPMPILIB,;t t
|
||||
s,@MPI_OBJS@,$MPI_OBJS,;t t
|
||||
s,@MPI_LIBS@,$MPI_LIBS,;t t
|
||||
s,@M4@,$M4,;t t
|
||||
s,@M4GENHDRS@,$M4GENHDRS,;t t
|
||||
s,@INSTALL_DLLS@,$INSTALL_DLLS,;t t
|
||||
s,@MERGE_DLL_OBJS@,$MERGE_DLL_OBJS,;t t
|
||||
s,@SHLIB_CFLAGS@,$SHLIB_CFLAGS,;t t
|
||||
|
|
@ -14229,8 +14226,11 @@ s,@JAVA_HOME@,$JAVA_HOME,;t t
|
|||
s,@JAVAC@,$JAVAC,;t t
|
||||
s,@JAR@,$JAR,;t t
|
||||
s,@IN_UNIX@,$IN_UNIX,;t t
|
||||
s,@M4@,$M4,;t t
|
||||
s,@M4GENHDRS@,$M4GENHDRS,;t t
|
||||
s,@YAPMPILIB@,$YAPMPILIB,;t t
|
||||
s,@MPI_OBJS@,$MPI_OBJS,;t t
|
||||
s,@MPI_LIBS@,$MPI_LIBS,;t t
|
||||
s,@INSTALL_COMMAND@,$INSTALL_COMMAND,;t t
|
||||
s,@CROSS_SIMULATOR@,$CROSS_SIMULATOR,;t t
|
||||
s,@M4GENABSMI@,$M4GENABSMI,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
|
|
|
|||
76
configure.in
76
configure.in
|
|
@ -301,10 +301,6 @@ AC_CHECK_TOOL(MPI_CC,mpicc,:)
|
|||
AC_PATH_PROG(INSTALL_INFO,install-info,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
|
||||
AC_PATH_PROG(SHELL,sh)
|
||||
|
||||
AC_SUBST(INSTALL_COMMAND)
|
||||
AC_SUBST(CROSS_SIMULATOR)
|
||||
|
||||
|
||||
dnl Check for libraries.
|
||||
dnl mingw does not get along well with libm
|
||||
dnl cygnus and mingw32 also need wsock32 to use sockets.
|
||||
|
|
@ -426,10 +422,6 @@ then
|
|||
CC=${OLD_CC}
|
||||
fi
|
||||
|
||||
AC_SUBST(YAPMPILIB)
|
||||
AC_SUBST(MPI_OBJS)
|
||||
AC_SUBST(MPI_LIBS)
|
||||
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$cross_compiling" = "yes"
|
||||
|
|
@ -439,36 +431,6 @@ else
|
|||
AC_SYS_RESTARTABLE_SYSCALLS
|
||||
fi
|
||||
|
||||
dnl System stuff for dynamic linking.
|
||||
dnl
|
||||
dnl Exports:
|
||||
dnl
|
||||
dnl "" if we can do dynamic linking, "#" otherwise
|
||||
AC_SUBST(INSTALL_DLLS)
|
||||
dnl if we need to merge several .o files into a single dll.
|
||||
AC_SUBST(MERGE_DLL_OBJS)
|
||||
dnl C-flags used to compile a file that will be loaded dynamically
|
||||
AC_SUBST(SHLIB_CFLAGS)
|
||||
dnl suffix for loadable binary (.so,.dll,.o)
|
||||
AC_SUBST(SHLIB_SUFFIX)
|
||||
dnl suffix for executable (.exe)
|
||||
EXEC_SUFFIX=""
|
||||
AC_SUBST(EXEC_SUFFIX)
|
||||
dnl how to call the loader
|
||||
AC_SUBST(DO_SECOND_LD)
|
||||
AC_SUBST(SHLIB_LD)
|
||||
dnl objects in YAP library
|
||||
AC_SUBST(YAPLIB)
|
||||
dnl install_info
|
||||
AC_SUBST(INSTALL_INFO)
|
||||
dnl let YAP_EXTRAS fall through configure, from the env into Makefile
|
||||
AC_SUBST(YAP_EXTRAS)
|
||||
AC_SUBST(NO_BUILTIN_REGEXP)
|
||||
AC_SUBST(ENABLE_JPL)
|
||||
AC_SUBST(JAVA_HOME)
|
||||
AC_SUBST(JAVAC)
|
||||
AC_SUBST(JAR)
|
||||
AC_SUBST(IN_UNIX)
|
||||
|
||||
dnl defaults
|
||||
INSTALL_DLLS="#"
|
||||
|
|
@ -663,6 +625,8 @@ if test "$dynamic_loading" = "yes"
|
|||
then
|
||||
YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS"
|
||||
YAPLIB=libYap"$SHLIB_SUFFIX"
|
||||
CROSS_SIMULATOR="LD_LIBRARY_PATH=."
|
||||
LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib"
|
||||
fi
|
||||
|
||||
if test "$coroutining" = "yes"
|
||||
|
|
@ -812,6 +776,42 @@ fi
|
|||
AC_SUBST(M4)
|
||||
AC_SUBST(M4GENHDRS)
|
||||
|
||||
dnl System stuff for dynamic linking.
|
||||
dnl
|
||||
dnl Exports:
|
||||
dnl
|
||||
dnl "" if we can do dynamic linking, "#" otherwise
|
||||
AC_SUBST(INSTALL_DLLS)
|
||||
dnl if we need to merge several .o files into a single dll.
|
||||
AC_SUBST(MERGE_DLL_OBJS)
|
||||
dnl C-flags used to compile a file that will be loaded dynamically
|
||||
AC_SUBST(SHLIB_CFLAGS)
|
||||
dnl suffix for loadable binary (.so,.dll,.o)
|
||||
AC_SUBST(SHLIB_SUFFIX)
|
||||
dnl suffix for executable (.exe)
|
||||
EXEC_SUFFIX=""
|
||||
AC_SUBST(EXEC_SUFFIX)
|
||||
dnl how to call the loader
|
||||
AC_SUBST(DO_SECOND_LD)
|
||||
AC_SUBST(SHLIB_LD)
|
||||
dnl objects in YAP library
|
||||
AC_SUBST(YAPLIB)
|
||||
dnl install_info
|
||||
AC_SUBST(INSTALL_INFO)
|
||||
dnl let YAP_EXTRAS fall through configure, from the env into Makefile
|
||||
AC_SUBST(YAP_EXTRAS)
|
||||
AC_SUBST(NO_BUILTIN_REGEXP)
|
||||
AC_SUBST(ENABLE_JPL)
|
||||
AC_SUBST(JAVA_HOME)
|
||||
AC_SUBST(JAVAC)
|
||||
AC_SUBST(JAR)
|
||||
AC_SUBST(IN_UNIX)
|
||||
AC_SUBST(YAPMPILIB)
|
||||
AC_SUBST(MPI_OBJS)
|
||||
AC_SUBST(MPI_LIBS)
|
||||
AC_SUBST(INSTALL_COMMAND)
|
||||
AC_SUBST(CROSS_SIMULATOR)
|
||||
|
||||
|
||||
dnl check for threaded code
|
||||
AC_MSG_CHECKING(for gcc threaded code)
|
||||
|
|
|
|||
Reference in New Issue