Build System: backport from master

See commits bcae7b4e445e149179b4...e2872439e4a6f4eb353e for details.

Author: aaronmdjones

configure

@@ -122,6 +122,7 @@ VERSION ?= @VERSION@
 prefix ?= @prefix@
 CRACKLIB_C ?= @CRACKLIB_C@
 CRACKLIB_LIBS ?= @CRACKLIB_LIBS@
+LIBIDN_LIBS ?= @LIBIDN_LIBS@
 CONTRIB_ENABLE ?= @CONTRIB_ENABLE@
 PERL_ENABLE ?= @PERL_ENABLE@
 PERL_CFLAGS ?= @PERL_CFLAGS@

configure.ac

@@ -19,7 +19,7 @@
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
-/* Define if crypt() is available */
+/* Define to 1 if crypt(3) is available */
 #undef HAVE_CRYPT
 
 /* Define if the GNU dcgettext() function is already present or preinstalled.
@@ -32,6 +32,9 @@
 /* Define to 1 if you have the `explicit_bzero' function. */
 #undef HAVE_EXPLICIT_BZERO
 
+/* Define to 1 if you have the `flock' function. */
+#undef HAVE_FLOCK
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -62,6 +65,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if we have GNU libidn available. */
+#undef HAVE_LIBIDN
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
@@ -92,7 +98,7 @@
 /* Define to 1 if you have the `memset_s' function. */
 #undef HAVE_MEMSET_S
 
-/* Define to 1 if openssl is available */
+/* Define to 1 if OpenSSL is available */
 #undef HAVE_OPENSSL
 
 /* Define to 1 if you have the <openssl/ec.h> header file. */

extra.mk.in

@@ -0,0 +1,24 @@
+ATHEME_CC_TEST_CFLAGS_RESULT="no"
+
+AC_DEFUN([ATHEME_CC_TEST_CFLAGS],
+	[
+		AC_MSG_CHECKING([for C compiler flag(s) $1 ])
+
+		CFLAGS_SAVED="${CFLAGS}"
+		CFLAGS="${CFLAGS} $1"
+
+		AC_COMPILE_IFELSE(
+			[
+				AC_LANG_PROGRAM([[]], [[]])
+			], [
+				ATHEME_CC_TEST_CFLAGS_RESULT='yes'
+			], [
+				ATHEME_CC_TEST_CFLAGS_RESULT='no'
+				CFLAGS="${CFLAGS_SAVED}"
+			]
+		)
+
+		AC_MSG_RESULT([${ATHEME_CC_TEST_CFLAGS_RESULT}])
+		unset CFLAGS_SAVED
+	]
+)

include/sysconf.h.in

@@ -0,0 +1,97 @@
+AC_DEFUN([ATHEME_CC_ENABLE_WARNINGS],
+	[
+		ATHEME_CC_TEST_CFLAGS([-Werror=unknown-warning-option])
+		ATHEME_CC_TEST_CFLAGS([-Werror=implicit])
+
+		ATHEME_CC_TEST_CFLAGS([-Weverything])
+
+		AS_IF([test "x${ATHEME_CC_TEST_CFLAGS_RESULT}" = "xyes"],
+			[
+
+			ATHEME_CC_TEST_CFLAGS([-Wno-address-of-packed-member])
+			ATHEME_CC_TEST_CFLAGS([-Wno-disabled-macro-expansion])
+			ATHEME_CC_TEST_CFLAGS([-Wno-format-pedantic])
+			ATHEME_CC_TEST_CFLAGS([-Wno-missing-variable-declarations])
+			ATHEME_CC_TEST_CFLAGS([-Wno-pedantic])
+			ATHEME_CC_TEST_CFLAGS([-Wno-reserved-id-macro])
+			ATHEME_CC_TEST_CFLAGS([-Wno-unused-command-line-argument])
+
+			], [
+
+			ATHEME_CC_TEST_CFLAGS([-Wall])
+			ATHEME_CC_TEST_CFLAGS([-Wextra])
+
+			ATHEME_CC_TEST_CFLAGS([-Waggregate-return])
+			ATHEME_CC_TEST_CFLAGS([-Waggressive-loop-optimizations])
+			ATHEME_CC_TEST_CFLAGS([-Walloc-zero])
+			ATHEME_CC_TEST_CFLAGS([-Walloca])
+			ATHEME_CC_TEST_CFLAGS([-Wbad-function-cast])
+			ATHEME_CC_TEST_CFLAGS([-Wc99-c11-compat])
+			ATHEME_CC_TEST_CFLAGS([-Wcast-qual])
+			ATHEME_CC_TEST_CFLAGS([-Wdangling-else])
+			ATHEME_CC_TEST_CFLAGS([-Wdate-time])
+			ATHEME_CC_TEST_CFLAGS([-Wdisabled-optimization])
+			ATHEME_CC_TEST_CFLAGS([-Wdouble-promotion])
+			ATHEME_CC_TEST_CFLAGS([-Wduplicated-branches])
+			ATHEME_CC_TEST_CFLAGS([-Wduplicated-cond])
+			ATHEME_CC_TEST_CFLAGS([-Wfatal-errors])
+			ATHEME_CC_TEST_CFLAGS([-Wfloat-equal])
+			ATHEME_CC_TEST_CFLAGS([-Wformat-nonliteral])
+			ATHEME_CC_TEST_CFLAGS([-Wformat-security])
+			ATHEME_CC_TEST_CFLAGS([-Wformat-signedness])
+			ATHEME_CC_TEST_CFLAGS([-Wformat-y2k])
+			ATHEME_CC_TEST_CFLAGS([-Winline])
+			ATHEME_CC_TEST_CFLAGS([-Winit-self])
+			ATHEME_CC_TEST_CFLAGS([-Winvalid-pch])
+			ATHEME_CC_TEST_CFLAGS([-Wjump-misses-init])
+			ATHEME_CC_TEST_CFLAGS([-Wlogical-op])
+			ATHEME_CC_TEST_CFLAGS([-Wmissing-declarations])
+			ATHEME_CC_TEST_CFLAGS([-Wmissing-format-attribute])
+			ATHEME_CC_TEST_CFLAGS([-Wmissing-include-dirs])
+			ATHEME_CC_TEST_CFLAGS([-Wmissing-prototypes])
+			ATHEME_CC_TEST_CFLAGS([-Wnested-externs])
+			ATHEME_CC_TEST_CFLAGS([-Wnormalized=nfkc])
+			ATHEME_CC_TEST_CFLAGS([-Wnull-dereference])
+			ATHEME_CC_TEST_CFLAGS([-Wold-style-definition])
+			ATHEME_CC_TEST_CFLAGS([-Woverlength-strings])
+			ATHEME_CC_TEST_CFLAGS([-Wpointer-arith])
+			ATHEME_CC_TEST_CFLAGS([-Wpointer-compare])
+			ATHEME_CC_TEST_CFLAGS([-Wredundant-decls])
+			ATHEME_CC_TEST_CFLAGS([-Wregister])
+			ATHEME_CC_TEST_CFLAGS([-Wrestrict])
+			ATHEME_CC_TEST_CFLAGS([-Wshadow])
+			ATHEME_CC_TEST_CFLAGS([-Wstack-protector])
+
+			ATHEME_CC_TEST_CFLAGS([-Wstrict-overflow=3])
+			AS_IF([test "x${ATHEME_CC_TEST_CFLAGS_RESULT}" = "xno"],
+				[ATHEME_CC_TEST_CFLAGS([-Wstrict-overflow])]
+			)
+
+			ATHEME_CC_TEST_CFLAGS([-Wstrict-prototypes])
+			ATHEME_CC_TEST_CFLAGS([-Wstringop-overflow=4])
+			ATHEME_CC_TEST_CFLAGS([-Wstringop-truncation])
+			ATHEME_CC_TEST_CFLAGS([-Wtrampolines])
+			ATHEME_CC_TEST_CFLAGS([-Wundef])
+			ATHEME_CC_TEST_CFLAGS([-Wunsafe-loop-optimizations])
+			ATHEME_CC_TEST_CFLAGS([-Wunsuffixed-float-constants])
+			ATHEME_CC_TEST_CFLAGS([-Wunused])
+			ATHEME_CC_TEST_CFLAGS([-Wvla])
+			ATHEME_CC_TEST_CFLAGS([-Wwrite-strings])
+
+			]
+		)
+
+		ATHEME_CC_TEST_CFLAGS([-Wno-cast-align])
+		ATHEME_CC_TEST_CFLAGS([-Wno-conversion])
+		ATHEME_CC_TEST_CFLAGS([-Wno-inline])
+		ATHEME_CC_TEST_CFLAGS([-Wno-missing-declarations])
+		ATHEME_CC_TEST_CFLAGS([-Wno-missing-include-dirs])
+		ATHEME_CC_TEST_CFLAGS([-Wno-missing-prototypes])
+		ATHEME_CC_TEST_CFLAGS([-Wno-packed])
+		ATHEME_CC_TEST_CFLAGS([-Wno-padded])
+		ATHEME_CC_TEST_CFLAGS([-Wno-sign-conversion])
+		ATHEME_CC_TEST_CFLAGS([-Wno-suggest-attribute=format])
+		ATHEME_CC_TEST_CFLAGS([-Wno-unused-parameter])
+		ATHEME_CC_TEST_CFLAGS([-Wno-unused-variable])
+	]
+)

m4/atheme-c.m4

@@ -22,6 +22,4 @@ include ../../buildsys.mk
 include ../../buildsys.module.mk
 
 CPPFLAGS	+= -I../../include
-LIBS		+= ${SSL_LIBS}
-LIBS 		+= -L../../libathemecore -lathemecore ${LDFLAGS_RPATH}
-
+LIBS 		+= -L../../libathemecore -lathemecore ${LDFLAGS_RPATH} ${SSL_LIBS} ${LIBIDN_LIBS}