guile/guile-core configure.in

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/11/01 19:05:57

Modified files:
        guile-core     : configure.in 

Log message:
        * configure.in: Define AC_LIBTOOL_WIN32_DLL to build clean dlls
        on Win32 platforms.
        Checking for `ws2_32.dll', `winsock2.h', add `uname.o' and
        `dirent.o' and define extra compiler flags necessary to build
        clean dlls.
        Check for `regcomp()' inside `-lregex'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/configure.in.diff?cvsroot=OldCVS&tr1=1.168&tr2=1.169&r1=text&r2=text

Patches:
Index: guile/guile-core/configure.in
diff -u guile/guile-core/configure.in:1.168 guile/guile-core/configure.in:1.169
--- guile/guile-core/configure.in:1.168 Sun Oct 14 17:21:19 2001
+++ guile/guile-core/configure.in       Thu Nov  1 19:05:57 2001
@@ -152,9 +152,15 @@
 
 #--------------------------------------------------------------------
 
+dnl Some more checks for Win32
+AC_CYGWIN
+AC_MINGW32
+AC_LIBTOOL_WIN32_DLL
+
 AC_LIBLTDL_CONVENIENCE
 AC_CONFIG_SUBDIRS(libltdl)
 
+AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_CPP
 AC_LIBTOOL_DLOPEN
@@ -201,7 +207,7 @@
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(io.h 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/stdtypes.h sys/types.h sys/utime.h time.h unistd.h utime.h 
pwd.h winsock2.h grp.h sys/utsname.h)
+AC_CHECK_HEADERS(io.h 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/stdtypes.h sys/types.h sys/utime.h time.h unistd.h utime.h 
pwd.h grp.h sys/utsname.h direct.h)
 GUILE_HEADER_LIBC_WITH_UNISTD
 
 AC_TYPE_GETGROUPS
@@ -217,8 +223,26 @@
 if test $ac_cv_func_connect = no; then
     AC_CHECK_LIB(socket, connect)
 fi
+
+dnl
+dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
+dnl
+EXTRA_DEFS=""
+EXTRA_LIB_DEFS=""
+if test "$MINGW32" = "yes" ; then
+    AC_CHECK_HEADER(winsock2.h, [AC_DEFINE([HAVE_WINSOCK2_H], 1, 
+      [Define if you have the <winsock2.h> header file.])])
+    AC_CHECK_LIB(ws2_32, main)
+    LIBOBJS="$LIBOBJS uname.o dirent.o"
+    if test $enable_shared = yes ; then
+      EXTRA_DEFS="-D__SCM_IMPORT__ -D__REGEX_IMPORT__ -D__CRYPT_IMPORT__"
+      EXTRA_LIB_DEFS="-D__REGEX_IMPORT__ -D__CRYPT_IMPORT__"
+    fi
+fi
+AC_SUBST(EXTRA_DEFS)
+AC_SUBST(EXTRA_LIB_DEFS)
 
-# Check for dynamic linking
+dnl Check for dynamic linking
 
 use_modules=yes
 AC_ARG_WITH(modules,
@@ -407,11 +431,14 @@
       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"])]
+      GUILE_NAMED_CHECK_FUNC(regcomp, rx, [LIBOBJS="regex-posix.o $LIBOBJS"],
+     [AC_CHECK_LIB(regex, main)
+      GUILE_NAMED_CHECK_FUNC(regcomp, regex, [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_regex" = yes ||
         test "$ac_cv_func_regcomp_rx" = yes; then
        AC_DEFINE(HAVE_REGCOMP)
      fi