Skip to content
Snippets Groups Projects
Commit 0809713a authored by Marcus Comstedt's avatar Marcus Comstedt
Browse files

Changes for BSDi. Didn't I commit these already? Apparently not...

Rev: src/Makefile.in:1.62
Rev: src/configure.in:1.161
parent b769976d
No related branches found
No related tags found
No related merge requests found
...@@ -64,7 +64,7 @@ CPP=@CPP@ ...@@ -64,7 +64,7 @@ CPP=@CPP@
AR=@AR@ AR=@AR@
LD=$(CC) LD=@LD@
LDFLAGS=$(CFLAGS) @LDFLAGS@ @LINKFORSHARED@ LDFLAGS=$(CFLAGS) @LDFLAGS@ @LINKFORSHARED@
RUNPIKE=$(TMP_BUILDDIR)/pike -m $(TMP_LIBDIR)/master.pike $(PIKEOPTS) RUNPIKE=$(TMP_BUILDDIR)/pike -m $(TMP_LIBDIR)/master.pike $(PIKEOPTS)
......
AC_REVISION("$Id: configure.in,v 1.160 1998/02/27 08:39:15 hubbe Exp $") AC_REVISION("$Id: configure.in,v 1.161 1998/02/27 17:08:44 marcus Exp $")
AC_INIT(interpret.c) AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h) AC_CONFIG_HEADER(machine.h)
...@@ -156,6 +156,8 @@ fi ...@@ -156,6 +156,8 @@ fi
]) ])
AC_MSG_RESULT($pike_cv_sys_os) AC_MSG_RESULT($pike_cv_sys_os)
LD='$(CC)'
case "$pike_cv_sys_os" in case "$pike_cv_sys_os" in
SCO*) SCO*)
case "$CFLAGS" in case "$CFLAGS" in
...@@ -173,8 +175,13 @@ case "$pike_cv_sys_os" in ...@@ -173,8 +175,13 @@ case "$pike_cv_sys_os" in
;; ;;
esac esac
;; ;;
BSD/OS*)
LD="$BINDIR/smartlink shlicc"
;;
esac esac
AC_SUBST(LD)
############################################################################# #############################################################################
...@@ -359,7 +366,7 @@ if test x$pike_cv_sys_os != xWindows_NT ; then ...@@ -359,7 +366,7 @@ if test x$pike_cv_sys_os != xWindows_NT ; then
echo Searching for include-file directories... echo Searching for include-file directories...
if test $cppflags_is_set = no -a x${C_INCLUDE_PATH-} = x ; then if test $cppflags_is_set = no -a x${C_INCLUDE_PATH-} = x ; then
for d in /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware for d in `echo $prefix | sed "s@^NONE@$ac_default_prefix@g"` /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware
do do
AC_MSG_CHECKING($d/include) AC_MSG_CHECKING($d/include)
if test -d "$d/include/." ; then if test -d "$d/include/." ; then
...@@ -375,7 +382,7 @@ fi ...@@ -375,7 +382,7 @@ fi
echo Searching for library directories... echo Searching for library directories...
if test $ldflags_is_set = no ; then if test $ldflags_is_set = no ; then
for d in /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware for d in `echo $exec_prefix | sed "s@^NONE@$prefix@g" | sed "s@^NONE@$ac_default_prefix@g"` /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware
do do
AC_MSG_CHECKING($d/lib) AC_MSG_CHECKING($d/lib)
if test -d "$d/lib/." ; then if test -d "$d/lib/." ; then
...@@ -390,7 +397,7 @@ else ...@@ -390,7 +397,7 @@ else
fi fi
echo Searching for binary directories... echo Searching for binary directories...
for d in "" /usr /usr/ccs /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware for d in `echo $exec_prefix | sed "s@^NONE@$prefix@g" | sed "s@^NONE@$ac_default_prefix@g"` "" /usr /usr/ccs /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware
do do
AC_MSG_CHECKING($d/bin) AC_MSG_CHECKING($d/bin)
if test -d "$d/bin/." ; then if test -d "$d/bin/." ; then
...@@ -763,12 +770,17 @@ int main() ...@@ -763,12 +770,17 @@ int main()
LIBS="${OLDLIBS} -lpthread -lmach -lexc -lc" LIBS="${OLDLIBS} -lpthread -lmach -lexc -lc"
;; ;;
xBSD/OS*)
LIBS="${OLDLIBS}"
;;
*) *)
LIBS="${OLDLIBS} -lpthread" LIBS="${OLDLIBS} -lpthread"
;; ;;
esac esac
AC_CHECK_FUNCS(pthread_init) AC_CHECK_FUNCS(pthread_init)
AC_CHECK_FUNCS(pthread_mutexattr_init)
AC_MSG_CHECKING(posix threads) AC_MSG_CHECKING(posix threads)
...@@ -791,7 +803,11 @@ int main() ...@@ -791,7 +803,11 @@ int main()
#ifdef HAVE_PTHREAD_INIT #ifdef HAVE_PTHREAD_INIT
pthread_init(); pthread_init();
#endif /* HAVE_PTHREAD_INIT */ #endif /* HAVE_PTHREAD_INIT */
#ifdef HAVE_PTHREAD_MUTEXATTR_INIT
pthread_mutexattr_init(&attr); pthread_mutexattr_init(&attr);
#else
memset(&attr, 0, sizeof(attr));
#endif /* HAVE_PTHREAD_MUTEXATTR_INIT
pthread_mutex_init(&tmp, &attr); pthread_mutex_init(&tmp, &attr);
pthread_mutex_lock(&tmp); pthread_mutex_lock(&tmp);
pthread_create(&gazonk,0,foo,0); pthread_create(&gazonk,0,foo,0);
...@@ -1840,6 +1856,7 @@ then ...@@ -1840,6 +1856,7 @@ then
FreeBSD*) LDSHARED="ld -Bshareable";; FreeBSD*) LDSHARED="ld -Bshareable";;
NetBSD) LDSHARED="ld -Bshareable";; NetBSD) LDSHARED="ld -Bshareable";;
OpenBSD*) LDSHARED="ld -Bshareable";; OpenBSD*) LDSHARED="ld -Bshareable";;
BSD/OS*) LDSHARED="shlicc -r";;
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";;
Windows_NT*) LDSHARED="$CC -shared";; Windows_NT*) LDSHARED="$CC -shared";;
...@@ -1853,7 +1870,10 @@ AC_MSG_RESULT($LDSHARED) ...@@ -1853,7 +1870,10 @@ AC_MSG_RESULT($LDSHARED)
AC_MSG_CHECKING(CCSHARED) AC_MSG_CHECKING(CCSHARED)
if test -z "$CCSHARED" ; then if test -z "$CCSHARED" ; then
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
CCSHARED="-fpic" case $pike_cv_sys_os in
BSD/OS*) CCSHARED="";;
*) CCSHARED="-fpic";;
esac
else else
case $pike_cv_sys_os in case $pike_cv_sys_os in
hp*|HP*) CCSHARED="+z"; ;; hp*|HP*) CCSHARED="+z"; ;;
...@@ -1933,12 +1953,17 @@ AC_CACHE_VAL(pike_cv_sys_dynamic_loading, ...@@ -1933,12 +1953,17 @@ AC_CACHE_VAL(pike_cv_sys_dynamic_loading,
OLD_CFLAGS="$CFLAGS" OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $LINKFORSHARED" CFLAGS="$CFLAGS $LINKFORSHARED"
OLD_CC="$CC"
case "$LD" in
*shlicc) CC="$BINDIR/smartlink shlicc";;
esac
AC_TRY_RUN([ AC_TRY_RUN([
#define TESTING #define TESTING
#include "$srcdir/dynamic_load.c" #include "$srcdir/dynamic_load.c"
void testfunc2(void) { exit(0); } void testfunc2(void) { exit(0); }
], pike_cv_sys_dynamic_loading=yes, pike_cv_sys_dynamic_loading=no, pike_cv_sys_dynamic_loading=no) ], pike_cv_sys_dynamic_loading=yes, pike_cv_sys_dynamic_loading=no, pike_cv_sys_dynamic_loading=no)
CFLAGS="$OLD_CFLAGS" CFLAGS="$OLD_CFLAGS"
CC="$OLD_CC"
else else
pike_cv_sys_dynamic_loading=no pike_cv_sys_dynamic_loading=no
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment