Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11760/conf
Modified Files:
Tag: MonetDB_1-20
MonetDB.m4
Log Message:
check for rules.mk using test -e (not using AC_CHECK_FILES as that checks for
the files on the native system (ie not possible when cross-compiling)).
Include checks for sys/socket.h in conf/MonetDB.m4 (as we also check for
many of the other features of sockets here)
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -d -r1.37.2.4 -r1.37.2.5
--- MonetDB.m4 4 Oct 2007 07:58:05 -0000 1.37.2.4
+++ MonetDB.m4 10 Oct 2007 08:39:00 -0000 1.37.2.5
@@ -2050,6 +2050,8 @@
AC_CHECK_LIB(socket, setsockopt, [ SOCKET_LIBS="-lsocket
$SOCKET_LIBS"; have_setsockopt=yes; ]))
fi
+AC_CHECK_HEADERS([sys/socket.h winsock.h])
+
dnl incase of windows we need to use try_link because windows uses the
dnl pascal style of function calls and naming scheme. Therefore the
dnl function needs to be compiled with the correct header
@@ -2670,13 +2672,14 @@
BUILDTOOLS_CONFDIR=`"$BUILDTOOLS_CONFIG" --pkgdatadir`
AC_SUBST(BUILDTOOLS_CONFDIR)
rules_mk=$BUILDTOOLS_CONFDIR/rules.mk
-
- AC_CHECK_FILE($rules_mk,
- [have_buildtools=yes],
- [AC_MSG_WARN([$rules_mk could not be found.
+ if test -e $rules_mk; then
+ have_buildtools=yes;
+ else
+ have_buildtools=no;
+ AC_MSG_WARN([$rules_mk could not be found.
You won't be able to compile $PACKAGE_NAME
- from CVS sources.])])
-
+ from CVS sources.]);
+ fi
fi
fi
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
