From 40a1bbacdfba922da72d4ac59a6551b892b9578b Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Wed, 5 Jan 2011 19:54:20 +0000
Subject: [PATCH] Fix for autoheader

autoheader wants a description for all definitions, so we have to provide one.
Meh.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2249 726aef4b-f618-498e-8847-2d620e286838
---
 configure    | 36 +++++++++++++++++++++++++-----------
 configure.in | 21 +++++++++++----------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/configure b/configure
index ab349b78..b969d6c5 100755
--- a/configure
+++ b/configure
@@ -2971,7 +2971,8 @@ fi
 # Check whether --enable-run-from-source was given.
 if test "${enable_run_from_source+set}" = set; then :
   enableval=$enable_run_from_source; if test "x$enableval" = "xyes" ; then
-		$as_echo "#define RUN_FROM_SOURCE 1" >>confdefs.h
+
+$as_echo "#define RUN_FROM_SOURCE 1" >>confdefs.h
 
 	fi
 	RUNFROMSOURCE="$enableval"
@@ -2988,14 +2989,18 @@ fi
 
 
 if test "$DEBUG" != "no"; then
-	$as_echo "#define _DEBUG 1" >>confdefs.h
+
+$as_echo "#define _DEBUG 1" >>confdefs.h
 
 	# These enable some debug options in g++'s STL, e.g. invalid use of iterators
-	$as_echo "#define _GLIBCXX_DEBUG 1" >>confdefs.h
 
-	$as_echo "#define _GLIBCXX_DEBUG_PEDANTIC 1" >>confdefs.h
+$as_echo "#define _GLIBCXX_DEBUG 1" >>confdefs.h
 
-	$as_echo "#define _GLIBCXX_CONCEPT_CHECKS 1" >>confdefs.h
+
+$as_echo "#define _GLIBCXX_DEBUG_PEDANTIC 1" >>confdefs.h
+
+
+$as_echo "#define _GLIBCXX_CONCEPT_CHECKS 1" >>confdefs.h
 
 else
 	if test "x$OPTIMIZE" = "xyes"; then
@@ -3004,7 +3009,8 @@ else
 fi
 
 if test "$IPV6" != "no"; then
-	$as_echo "#define HAVE_IPV6 1" >>confdefs.h
+
+$as_echo "#define HAVE_IPV6 1" >>confdefs.h
 
 fi
 
@@ -3013,7 +3019,8 @@ if test "x$GXX" = "xyes"; then
 fi
 
 if test "$POLL" = "yes"; then
-	$as_echo "#define CSOCK_USE_POLL 1" >>confdefs.h
+
+$as_echo "#define CSOCK_USE_POLL 1" >>confdefs.h
 
 fi
 
@@ -3062,11 +3069,16 @@ _ACEOF
 
 fi
 
-ac_fn_cxx_check_func "$LINENO" "lstat" "ac_cv_func_lstat"
+for ac_func in lstat
+do :
+  ac_fn_cxx_check_func "$LINENO" "lstat" "ac_cv_func_lstat"
 if test "x$ac_cv_func_lstat" = x""yes; then :
-  $as_echo "#define HAVE_LSTAT 1" >>confdefs.h
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LSTAT 1
+_ACEOF
 
 fi
+done
 
 
 
@@ -3350,7 +3362,8 @@ $as_echo "$as_me: WARNING: c-ares was not found and thus disabled" >&2;}
 	fi
 
 		else
-			$as_echo "#define HAVE_C_ARES 1" >>confdefs.h
+
+$as_echo "#define HAVE_C_ARES 1" >>confdefs.h
 
 			appendCXX $c_ares_CFLAGS
 			appendLib $c_ares_LIBS
@@ -3650,7 +3663,8 @@ $as_echo "$as_me: WARNING: OpenSSL was not found and thus disabled" >&2;}
 
 		NOSSL=1
 	else
-		$as_echo "#define HAVE_LIBSSL 1" >>confdefs.h
+
+$as_echo "#define HAVE_LIBSSL 1" >>confdefs.h
 
 		SSL=yes
 	fi
diff --git a/configure.in b/configure.in
index 7055a723..e0fa38e1 100644
--- a/configure.in
+++ b/configure.in
@@ -124,7 +124,8 @@ AC_ARG_ENABLE( [c-ares],
 AC_ARG_ENABLE( [run-from-source],
 	AS_HELP_STRING([--enable-run-from-source], [znc will be runnable without installation]),
 	[if test "x$enableval" = "xyes" ; then
-		AC_DEFINE([RUN_FROM_SOURCE])
+		AC_DEFINE([RUN_FROM_SOURCE], [1],
+			  [Define if ZNC should be runnable without installation])
 	fi
 	RUNFROMSOURCE="$enableval"],
 	[RUNFROMSOURCE="no"])
@@ -134,11 +135,11 @@ AC_ARG_ENABLE( [poll],
 	[POLL="yes"])
 
 if test "$DEBUG" != "no"; then
-	AC_DEFINE([_DEBUG])
+	AC_DEFINE([_DEBUG], [1], [Define for debugging])
 	# These enable some debug options in g++'s STL, e.g. invalid use of iterators
-	AC_DEFINE([_GLIBCXX_DEBUG])
-	AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC])
-	AC_DEFINE([_GLIBCXX_CONCEPT_CHECKS])
+	AC_DEFINE([_GLIBCXX_DEBUG], [1], [Enable extra debugging checks in libstdc++])
+	AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC], [1], [Enable extra debugging checks in libstdc++])
+	AC_DEFINE([_GLIBCXX_CONCEPT_CHECKS], [1], [Enable extra debugging checks in libstdc++])
 else
 	if test "x$OPTIMIZE" = "xyes"; then
 		appendCXX -O2
@@ -146,7 +147,7 @@ else
 fi
 
 if test "$IPV6" != "no"; then
-	AC_DEFINE([HAVE_IPV6])
+	AC_DEFINE([HAVE_IPV6], [1], [Define if IPv6 support is enabled])
 fi
 
 if test "x$GXX" = "xyes"; then
@@ -154,11 +155,11 @@ if test "x$GXX" = "xyes"; then
 fi
 
 if test "$POLL" = "yes"; then
-	AC_DEFINE([CSOCK_USE_POLL])
+	AC_DEFINE([CSOCK_USE_POLL], [1], [Use poll() instead of select()])
 fi
 
 AC_CHECK_LIB( gnugetopt, getopt_long,)
-AC_CHECK_FUNC([lstat], [AC_DEFINE([HAVE_LSTAT])])
+AC_CHECK_FUNCS([lstat])
 PKG_PROG_PKG_CONFIG()
 
 # ----- Check for dlopen
@@ -198,7 +199,7 @@ Disabling c-ares may result in a slight performance decrease but will not have a
 Disabling c-ares may result in a slight performance decrease but will not have any other side-effects],
 				[c-ares was not found and thus disabled])
 		else
-			AC_DEFINE([HAVE_C_ARES])
+			AC_DEFINE([HAVE_C_ARES], [1], [Define if c-ares is enabled])
 			appendCXX $c_ares_CFLAGS
 			appendLib $c_ares_LIBS
 			ARES=yes
@@ -233,7 +234,7 @@ if test "x$SSL" != "xno"; then
 			[OpenSSL was not found and thus disabled])
 		NOSSL=1
 	else
-		AC_DEFINE([HAVE_LIBSSL])
+		AC_DEFINE([HAVE_LIBSSL], [1], [Define if openssl is enabled])
 		SSL=yes
 	fi
 else