From 4a584d412ecdd32d34dfa4dc09ec68d217b19d07 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Sun, 22 Feb 2009 00:45:50 +0100
Subject: [PATCH] Rerun autoconf.

---
 configure | 158 ++----------------------------------------------------
 1 file changed, 4 insertions(+), 154 deletions(-)

diff --git a/configure b/configure
index 5eed440d6..7056ef28b 100755
--- a/configure
+++ b/configure
@@ -12893,81 +12893,6 @@ echo "${ECHO_T}no" >&6; }
  fi
 
 
- { echo "$as_me:$LINENO: checking GCC flag(s) -Wbad-function-cast" >&5
-echo $ECHO_N "checking GCC flag(s) -Wbad-function-cast... $ECHO_C" >&6; }
- if test "${GCC-no}" = yes
- then
-  if test "${charybdis_cv_c_gcc_w_bad_function_cast+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-   oldcflags="${CFLAGS-}"
-   CFLAGS="${CFLAGS-} ${CWARNS} -Wbad-function-cast -Werror"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <string.h>
-#include <stdio.h>
-int main(void);
-
-int
-main ()
-{
-
-    (void)strcmp("a","b"); fprintf(stdout,"test ok\n");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  charybdis_cv_c_gcc_w_bad_function_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	charybdis_cv_c_gcc_w_bad_function_cast=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS="${oldcflags}"
-fi
-
-  if test "x$charybdis_cv_c_gcc_w_bad_function_cast" = xyes; then
-   CWARNS="${CWARNS}-Wbad-function-cast "
-   { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
-  else
-   charybdis_cv_c_gcc_w_bad_function_cast=''
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  fi
- else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
-
-
  { echo "$as_me:$LINENO: checking GCC flag(s) -Wunused-function -Wunused-label -Wunused-value -Wunused-variable" >&5
 echo $ECHO_N "checking GCC flag(s) -Wunused-function -Wunused-label -Wunused-value -Wunused-variable... $ECHO_C" >&6; }
  if test "${GCC-no}" = yes
@@ -13193,8 +13118,8 @@ echo "${ECHO_T}no" >&6; }
  fi
 
 
- { echo "$as_me:$LINENO: checking GCC flag(s) -Wformat -Wformat-y2k -Wformat-security" >&5
-echo $ECHO_N "checking GCC flag(s) -Wformat -Wformat-y2k -Wformat-security... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking GCC flag(s) -Wformat -Wformat-y2k -Wno-format-security" >&5
+echo $ECHO_N "checking GCC flag(s) -Wformat -Wformat-y2k -Wno-format-security... $ECHO_C" >&6; }
  if test "${GCC-no}" = yes
  then
   if test "${charybdis_cv_c_gcc_w_format+set}" = set; then
@@ -13202,7 +13127,7 @@ echo $ECHO_N "checking GCC flag(s) -Wformat -Wformat-y2k -Wformat-security... $E
 else
 
    oldcflags="${CFLAGS-}"
-   CFLAGS="${CFLAGS-} ${CWARNS} -Wformat -Wformat-y2k -Wformat-security -Werror"
+   CFLAGS="${CFLAGS-} ${CWARNS} -Wformat -Wformat-y2k -Wno-format-security -Werror"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13254,7 +13179,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
   if test "x$charybdis_cv_c_gcc_w_format" = xyes; then
-   CWARNS="${CWARNS}-Wformat -Wformat-y2k -Wformat-security "
+   CWARNS="${CWARNS}-Wformat -Wformat-y2k -Wno-format-security "
    { echo "$as_me:$LINENO: result: ok" >&5
 echo "${ECHO_T}ok" >&6; }
   else
@@ -13268,81 +13193,6 @@ echo "${ECHO_T}no" >&6; }
  fi
 
 
- { echo "$as_me:$LINENO: checking GCC flag(s) -pedantic" >&5
-echo $ECHO_N "checking GCC flag(s) -pedantic... $ECHO_C" >&6; }
- if test "${GCC-no}" = yes
- then
-  if test "${charybdis_cv_c_gcc_pedantic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-   oldcflags="${CFLAGS-}"
-   CFLAGS="${CFLAGS-} ${CWARNS} -pedantic -Werror"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <string.h>
-#include <stdio.h>
-int main(void);
-
-int
-main ()
-{
-
-    (void)strcmp("a","b"); fprintf(stdout,"test ok\n");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  charybdis_cv_c_gcc_pedantic=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	charybdis_cv_c_gcc_pedantic=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS="${oldcflags}"
-fi
-
-  if test "x$charybdis_cv_c_gcc_pedantic" = xyes; then
-   CWARNS="${CWARNS}-pedantic "
-   { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
-  else
-   charybdis_cv_c_gcc_pedantic=''
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  fi
- else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
-
-
 IRC_CFLAGS="$CFLAGS"
 
 fi