Skip to content
Snippets Groups Projects
Commit 1807bd11 authored by Fredrik Hübinette (Hubbe)'s avatar Fredrik Hübinette (Hubbe)
Browse files

fixes for BSD/OS [bug 461] and some fixes for dynamic loading on Win32

Rev: src/configure.in:1.435
parent 0efbeb6d
No related branches found
No related tags found
No related merge requests found
AC_REVISION("$Id: configure.in,v 1.434 2000/11/26 13:47:42 grubba Exp $") AC_REVISION("$Id: configure.in,v 1.435 2000/11/29 03:12:17 hubbe Exp $")
AC_INIT(interpret.c) AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h) AC_CONFIG_HEADER(machine.h)
...@@ -491,7 +491,10 @@ case "$pike_cv_sys_os" in ...@@ -491,7 +491,10 @@ case "$pike_cv_sys_os" in
CFLAGS="$CFLAGS -D__USE_FIXED_PROTOTYPES__" CFLAGS="$CFLAGS -D__USE_FIXED_PROTOTYPES__"
;; ;;
BSD/OS*) BSD/OS*)
LD="$BINDIR/smartlink shlicc" case "`uname -r`" in
4.*) ;;
*) LD="$BINDIR/smartlink shlicc";;
esac
;; ;;
UnixWare*) UnixWare*)
case "$CFLAGS" in case "$CFLAGS" in
...@@ -1067,8 +1070,13 @@ if test "$cflags_is_set" = "no"; then ...@@ -1067,8 +1070,13 @@ if test "$cflags_is_set" = "no"; then
fi fi
else :; fi else :; fi
if test x$with_dynamic_modules != xno ; then
AC_MSG_WARN([Enabling dynamic modules for Win32])
EXTRA_MODULE_REQUIREMENTS="${EXTRA_MODULE_REQUIREMENTS} import_functions.h" EXTRA_MODULE_REQUIREMENTS="${EXTRA_MODULE_REQUIREMENTS} import_functions.h"
EXTRA_OBJS="${EXTRA_OBJS} export_functions.o" EXTRA_OBJS="${EXTRA_OBJS} export_functions.o"
pike_cv_sys_dynamic_loading=yes
with_dynamic_modules=yes
fi
]) ])
dnl dnl
...@@ -3940,7 +3948,12 @@ if test -z "$LDSHARED" ; then ...@@ -3940,7 +3948,12 @@ if test -z "$LDSHARED" ; then
FreeBSD*) LDSHARED="$CC -Wl,-Bshareable";; FreeBSD*) LDSHARED="$CC -Wl,-Bshareable";;
NetBSD*) LDSHARED="ld -Bshareable";; NetBSD*) LDSHARED="ld -Bshareable";;
OpenBSD*) LDSHARED="ld -Bshareable";; OpenBSD*) LDSHARED="ld -Bshareable";;
BSD/OS*) LDSHARED="shlicc -r";; BSD/OS*)
case "`uname -r`" in
4.*) LDSHARED="$CC -shared";;
*) LDSHARED="shlicc -r";;
esac
;;
SCO_SV*) LDSHARED="cc -G -KPIC -Wl,-Bexport";; SCO_SV*) LDSHARED="cc -G -KPIC -Wl,-Bexport";;
UNIX_SV*) LDSHARED="ld -G";; UNIX_SV*) LDSHARED="ld -G";;
UnixWare*) UnixWare*)
...@@ -3964,7 +3977,10 @@ AC_CACHE_VAL(pike_cv_sys_ccshared,[ ...@@ -3964,7 +3977,10 @@ AC_CACHE_VAL(pike_cv_sys_ccshared,[
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
case "$pike_cv_sys_os" in case "$pike_cv_sys_os" in
BSD/OS*) BSD/OS*)
CCSHARED="" case "`uname -r`" in
4.*) CCSHARED="-fPIC";;
*) CCSHARED="";;
esac
;; ;;
Solaris*) Solaris*)
# The Image module runs out of symbol reference space unless we # The Image module runs out of symbol reference space unless we
...@@ -4013,6 +4029,16 @@ then ...@@ -4013,6 +4029,16 @@ then
AIX*) LINKFORSHARED="-Wl,-bexpall -Wl,-brtl";; AIX*) LINKFORSHARED="-Wl,-bexpall -Wl,-brtl";;
hp*|HP*) LINKFORSHARED="-Wl,-E";; hp*|HP*) LINKFORSHARED="-Wl,-E";;
Linux*) LINKFORSHARED="-rdynamic";; Linux*) LINKFORSHARED="-rdynamic";;
BSD/OS*)
case "`uname -r`" in
4.*) LINKFORSHARED="-rdynamic";;
esac
;;
BSD/OS*)
case "`uname -r`" in
4.*) LINKFORSHARED="-rdynamic";;
esac
;;
GNU*) LINKFORSHARED="-rdynamic";; GNU*) LINKFORSHARED="-rdynamic";;
next*) LINKFORSHARED="-u libsys_s";; next*) LINKFORSHARED="-u libsys_s";;
SCO_SV*) LINKFORSHARED="-fpic -Wl,-Bexport";; SCO_SV*) LINKFORSHARED="-fpic -Wl,-Bexport";;
...@@ -4110,7 +4136,7 @@ if test "x$with_dynamic_modules" = "x" ; then ...@@ -4110,7 +4136,7 @@ if test "x$with_dynamic_modules" = "x" ; then
with_dynamic_modules=yes with_dynamic_modules=yes
if test x$pike_cv_func_dlopen$ac_cv_func_dld_link$ac_cv_func_shl_load = xnonono; if test x$pike_cv_func_dlopen$ac_cv_func_dld_link$ac_cv_func_shl_load = xnonono;
then then
# Dynamic loading is now WORKING # Dynamic loading is now WORKING (maybe)
# if test x"$pike_cv_sys_os" != xWindows_NT ; then # if test x"$pike_cv_sys_os" != xWindows_NT ; then
with_dynamic_modules=no with_dynamic_modules=no
# fi # fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment