Make dynamic linking work on Dec Unix. (Thanks to Clark McGrew)

[bpt/guile.git] / configure.in

diff --git a/configure.in b/configure.in
index b7f8427..67ab605 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,17 +45,13 @@ AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h regex.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h)
+AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h regex.h rxposix.h rx/rxposix.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h)
 GUILE_HEADER_LIBC_WITH_UNISTD
 
 AC_TYPE_GETGROUPS
 AC_TYPE_SIGNAL
 AC_TYPE_MODE_T
 
-AC_CHECK_LIB(rx, main)
-
-# Checks for dynamic linking
-
 AC_CHECK_LIB(m, main)
 AC_CHECK_FUNC(gethostbyname)
 if test $ac_cv_func_gethostbyname = no; then
@@ -66,6 +62,8 @@ if test $ac_cv_func_connect = no; then
     AC_CHECK_LIB(socket, connect)
 fi
 
+# Checks for dynamic linking
+
 if test "$enable_dynamic_linking" = "yes"; then
 
 AC_CHECK_LIB(dl,dlopen)
@@ -79,6 +77,11 @@ else
 AC_CHECK_FUNCS(shl_load)
 if test "$ac_cv_func_shl_load" = "yes"; then
   AC_DEFINE(DYNAMIC_LINKING)
+else
+AC_CHECK_FUNCS(dlopen)
+if test "$ac_cv_func_dlopen" = "yes"; then
+  AC_DEFINE(DYNAMIC_LINKING)
+fi
 fi
 fi
 fi
@@ -97,17 +100,31 @@ fi
 
 AC_CHECK_FUNCS(socketpair getgroups setpwent pause tzset)
 
-cp confdefs.h confdefs.h.bak
-for func in sethostent endhostent getnetent setnetent endnetent getprotoent endprotoent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof ; do
-cp confdefs.h.bak confdefs.h
-cat >> confdefs.h << EOF 
-#ifdef __CYGWIN32__
-#define $func cygwin32_$func
-#endif
-EOF
-AC_CHECK_FUNC($func)
-done
-cp confdefs.h.bak confdefs.h
+dnl I don't know what this prefixing of cygwin32_ is for.
+dnl scmconfig.h wasn't updated with the test results.
+dnl so use AC_CHECK_FUNCS for now.
+
+dnl how about:
+dnl save confdefs.h
+dnl if test $ac_cv_cigwin = yes; then
+dnl   modify confdefs.h
+dnl fi
+dnl AC_CHECK_FUNCS...
+dnl restore confdefs.h
+
+dnl cp confdefs.h confdefs.h.bak
+dnl for func in sethostent endhostent getnetent setnetent endnetent getprotoent endprotoent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof ; do
+dnl cp confdefs.h.bak confdefs.h
+dnl cat >> confdefs.h << EOF 
+dnl #ifdef __CYGWIN32__
+dnl #define $func cygwin32_$func
+dnl #endif
+dnl EOF
+dnl AC_CHECK_FUNC($func)
+dnl done
+dnl cp confdefs.h.bak confdefs.h
+
+AC_CHECK_FUNCS(sethostent endhostent getnetent setnetent endnetent getprotoent endprotoent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof)
 
 dnl </GNU-WIN32 hacks>
 
@@ -124,13 +141,28 @@ if test $scm_cv_restarts = yes; then
        AC_DEFINE(HAVE_RESTARTS)
 fi
 
-if test "$ac_cv_header_regex_h" = yes; then
-  AC_CHECK_FUNCS(regcomp, [LIBOBJS="regex-posix.o $LIBOBJS"])
+if test "$ac_cv_header_regex_h" = yes ||
+   test "$ac_cv_header_rxposix_h" = yes ||
+   test "$ac_cv_header_rx_rxposix_h" = yes; then
+  GUILE_NAMED_CHECK_FUNC(regcomp, norx, [LIBOBJS="regex-posix.o $LIBOBJS"],
+  [AC_CHECK_LIB(rx, main)
+   GUILE_NAMED_CHECK_FUNC(regcomp, rx, [LIBOBJS="regex-posix.o $LIBOBJS"])]
+  )
+  dnl The following should not be necessary, but for some reason
+  dnl autoheader misses it if we don't include it!
+  if test "$ac_cv_func_regcomp_norx" = yes ||
+     test "$ac_cv_func_regcomp_rx" = yes; then
+    AC_DEFINE(HAVE_REGCOMP)
+  fi
 fi
 
 AC_REPLACE_FUNCS(inet_aton putenv strerror)
 
+# When testing for the presence of alloca, we need to add alloca.o
+# explicitly to LIBOBJS to make sure that it is translated to
+# `alloca.lo' for libtool later on.  This can and should be done more cleanly.
 AC_FUNC_ALLOCA
+if test "$ALLOCA" = "alloca.o"; then LIBOBJS="alloca.o $LIBOBJS"; fi
 
 AC_STRUCT_ST_RDEV
 AC_STRUCT_ST_BLKSIZE
@@ -341,7 +373,7 @@ i[3456]86-*-*)
        qtmd_h=md/i386.h
        qtmdc_c=$qtsrcdir/md/null.c 
        ;;
-mips-sgi-irix5*)
+mips-sgi-irix[56]*)
        qtmds_s=$qtsrcdir/md/mips-irix5.s
        qtmd_h=md/mips.h
        qtmdc_c=$qtsrcdir/md/null.c
@@ -365,6 +397,12 @@ sparc-*-*)
        qtmds_s=$qtsrcdir/md/sparc.s
        qtdmdb_s=$qtsrcdir/md/sparc_b.s 
        ;;
+alpha-*-*)
+       qtmd_h=md/axp.h
+       qtmdc_c=$qtsrcdir/md/null.c
+       qtmds_s=$qtsrcdir/md/axp.s
+       qtdmdb_s=$qtsrcdir/md/axp_b.s 
+       ;;
 *)
        echo "Unknown configuration; threads package disabled"
        threads_enabled=false
@@ -392,7 +430,7 @@ AC_SUBST(qtmds_s)
 AC_SUBST(qtmds_o)
 AC_SUBST(qtmdb_s)
 
-AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile], [chmod +x libguile/guile-snarf])
+AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile], [chmod +x libguile/guile-snarf])
 
 dnl Local Variables:
 dnl comment-start: "dnl "