From 3fbba606c3fbb76a5bc045d4d7717528366ae84e Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sun, 19 Jul 2015 17:17:29 +0100 Subject: Fix checking whether kqueue is available. It seems like the newer OS X versions don't put headers into the system include directories. Switch to using a test file instead. --- configure | 18 ++---------------- make/check_kqueue.cpp | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 make/check_kqueue.cpp diff --git a/configure b/configure index 76ef8ce36..bdbcf6afe 100755 --- a/configure +++ b/configure @@ -382,22 +382,8 @@ print "yes\n" if $config{HAS_STRLCPY} eq "true"; print "no\n" if $config{HAS_STRLCPY} eq "false"; printf "Checking if kqueue exists... "; -$has_kqueue = 0; -$fail = 0; -open(KQUEUE, ")) { - chomp($line); - # try and find the delcaration of: - # int kqueue(void); - if ($line =~ /int(\0x9|\s)+kqueue/) { - $has_kqueue = 1; - } - } - close(KQUEUE); -} -print "yes\n" if $has_kqueue == 1; -print "no\n" if $has_kqueue == 0; +$has_kqueue = test_compile('kqueue'); +print $has_kqueue ? "yes\n" : "no\n"; printf "Checking for epoll support... "; $has_epoll = test_compile('epoll'); diff --git a/make/check_kqueue.cpp b/make/check_kqueue.cpp new file mode 100644 index 000000000..6034253df --- /dev/null +++ b/make/check_kqueue.cpp @@ -0,0 +1,26 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2015 Peter Powell + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include + +int main() { + int fd = kqueue(); + return (fd < 0); +} -- cgit v1.2.3 From e5cfa9c0c295596f688a18f5562cbb73b8e3997c Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 21 Jul 2015 23:22:17 +0100 Subject: Switch strlcpy test to use a test file too. --- configure | 19 ++----------------- make/check_strlcpy.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 make/check_strlcpy.cpp diff --git a/configure b/configure index bdbcf6afe..2eba9edb1 100755 --- a/configure +++ b/configure @@ -363,23 +363,8 @@ print "yes\n" if $config{HAS_STDINT} eq "true"; print "no\n" if $config{HAS_STDINT} eq "false"; printf "Checking if strlcpy exists... "; -# Perform the strlcpy() test.. -$config{HAS_STRLCPY} = "false"; -$fail = 0; -open(STRLCPY, ")) { - chomp($line); - # try and find the delcaration of: - # size_t strlcpy(...) - if ($line =~ /size_t(\0x9|\s)+strlcpy/) { - $config{HAS_STRLCPY} = "true"; - } - } - close(STRLCPY); -} -print "yes\n" if $config{HAS_STRLCPY} eq "true"; -print "no\n" if $config{HAS_STRLCPY} eq "false"; +$config{HAS_STRLCPY} = test_compile('strlcpy'); +print $config{HAS_STRLCPY} ? "yes\n" : "no\n"; printf "Checking if kqueue exists... "; $has_kqueue = test_compile('kqueue'); diff --git a/make/check_strlcpy.cpp b/make/check_strlcpy.cpp new file mode 100644 index 000000000..e51d18d40 --- /dev/null +++ b/make/check_strlcpy.cpp @@ -0,0 +1,25 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2015 Peter Powell + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include + +int main() { + char test[5]; + strlcpy(test, "test", sizeof(test)); +} -- cgit v1.2.3 From 4c751dbbe8945e5efc230a59b0ed51c2ba10cf92 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 21 Jul 2015 23:30:54 +0100 Subject: Switch test to use a test file too. --- configure | 10 ++-------- make/check_stdint.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 make/check_stdint.cpp diff --git a/configure b/configure index 2eba9edb1..fd00ff89c 100755 --- a/configure +++ b/configure @@ -353,14 +353,8 @@ $exec = $config{CC} . " -dumpversion | cut -c 3"; chomp($config{GCCMINOR} = `$exec`); printf "Checking if stdint.h exists... "; -$config{HAS_STDINT} = "true"; -our $fail = 0; -open(STDINT, " + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include + +int main() { + uint32_t ret = 0; + return ret; +} -- cgit v1.2.3 From 0b4285abd12323920d92fee51e199edd7527dbec Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 21 Jul 2015 23:34:05 +0100 Subject: Add missing copyright headers to test files. --- make/check_epoll.cpp | 1 + make/check_eventfd.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/make/check_epoll.cpp b/make/check_epoll.cpp index 918d3907e..a5ed1c10b 100644 --- a/make/check_epoll.cpp +++ b/make/check_epoll.cpp @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2009 Daniel De Graaf * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/check_eventfd.cpp b/make/check_eventfd.cpp index 980d04485..9b38b793b 100644 --- a/make/check_eventfd.cpp +++ b/make/check_eventfd.cpp @@ -1,6 +1,8 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2012 William Pitcock + * Copyright (C) 2009-2010 Daniel De Graaf * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public -- cgit v1.2.3