Author: ivanovic
Date: Fri Apr 24 10:41:31 2009
New Revision: 35154
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35154&view=rev
Log:
port autotools change for BSD to cmake recipe:
Conditionalized sendfile support on the presence of sys/sendfile.h, since
FreeBSD version is slightly different.
Modified:
trunk/cmake/SearchForStuff.cmake
trunk/config.h.cmake
Modified: trunk/cmake/SearchForStuff.cmake
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/cmake/SearchForStuff.cmake?rev=35154&r1=35153&r2=35154&view=diff
==============================================================================
--- trunk/cmake/SearchForStuff.cmake (original)
+++ trunk/cmake/SearchForStuff.cmake Fri Apr 24 10:41:31 2009
@@ -16,9 +16,10 @@
CHECK_INCLUDE_FILES(poll.h HAVE_POLL_H)
CHECK_INCLUDE_FILES(sys/poll.h HAVE_SYS_POLL_H)
CHECK_INCLUDE_FILES(sys/select.h HAVE_SYS_SELECT_H)
-if(HAVE_POLL_H OR HAVE_SYS_POLL_H OR HAVE_SYS_SELECT_H)
+CHECK_INCLUDE_FILES(sys/sendfile.h HAVE_SYS_SENDFILE_H)
+if(HAVE_POLL_H OR HAVE_SYS_POLL_H OR HAVE_SYS_SELECT_H OR HAVE_SYS_SENDFILE_H)
CHECK_FUNCTION_EXISTS(sendfile HAVE_SENDFILE)
-endif(HAVE_POLL_H OR HAVE_SYS_POLL_H OR HAVE_SYS_SELECT_H)
+endif(HAVE_POLL_H OR HAVE_SYS_POLL_H OR HAVE_SYS_SELECT_H OR
HAVE_SYS_SENDFILE_H)
#in configure.ac it is not explicitly tested, if it is in 'm', instead the
first
#test is if "floor" is available in m and later on it is checked if round,
Modified: trunk/config.h.cmake
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/config.h.cmake?rev=35154&r1=35153&r2=35154&view=diff
==============================================================================
--- trunk/config.h.cmake (original)
+++ trunk/config.h.cmake Fri Apr 24 10:41:31 2009
@@ -4,5 +4,6 @@
#cmakedefine HAVE_POLL_H 1
#cmakedefine HAVE_SYS_POLL_H 1
#cmakedefine HAVE_SYS_SELECT_H 1
+#cmakedefine HAVE_SYS_SENDFILE_H 1
#cmakedefine HAVE_SENDFILE 1
#cmakedefine HAVE_ROUND 1
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
