Merge branch 'anopeng' into anopeng-config

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1428 5417fbe8-f217-4b02-8779-1006273d7864

26 files changed, 253 insertions, 786 deletions

diff --git a/Changes b/Changes
index eda459a15..a2c3595b6 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,10 @@
+Anope Version SVN
+--------------------
+
+Anope Version 1.7.23b
+--------------------
+10/06 F Fixed issue with encrypted nick databases                         [ #00]
+
 Anope Version 1.7.23
 --------------------
 10/01 A Added modular database back-end for IGNORE.                       [#948]
diff --git a/Changes.conf b/Changes.conf
index 27699a96b..47434cbe5 100644
--- a/Changes.conf
+++ b/Changes.conf
@@ -1,3 +1,19 @@
+Anope Version SVN
+--------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES ** 
+
+Anope Version 1.7.23b
+--------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES ** 
+
 Anope Version 1.7.23
 --------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
diff --git a/Changes.lang b/Changes.lang
index 58242abbf..55ef49b99 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -1,3 +1,19 @@
+Anope Version SVN
+--------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+Anope Version 1.7.23b
+--------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
 Anope Version 1.7.23
 --------------------
 *** New Strings:
diff --git a/Changes.mysql b/Changes.mysql
index 7c531fc8b..038de3990 100644
--- a/Changes.mysql
+++ b/Changes.mysql
@@ -1,3 +1,11 @@
+Anope Version SVN
+--------------------
+- NONE
+
+Anope Version 1.7.23b
+--------------------
+- NONE
+
 Anope Version 1.7.23
 --------------------
 - NONE
diff --git a/Makefile.in b/Makefile.in
index 21da8f7c5..f30f5695e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,12 +1,10 @@
 CC=g++ # probably wrong but oh well.
 INCLUDEDIR=../include
 ANOPELIBS=@ANOPELIBS@
-CFLAGS=@CFLAGS@ -Wall -pedantic -Wshadow
-STRICT=-Wall -ansi -pedantic
+CFLAGS=@CFLAGS@ -Wall -ansi -pedantic -Wshadow
 PROFILE=-pg
 LDPROFILE=
 SHELL=/bin/sh
-SUBDIRS=src
 BINDEST=@BINDEST@
 DATDEST=@DATDEST@
 INSTALL=@INSTALL@
@@ -22,7 +20,6 @@ SHARED=@SHARED@
 MODULEFLAGS=@MODULEFLAGS@
 
 all:   language headers build core protocols tools modules 
-strict: language headers strict_build strict_core strict_protocols strict_tools strict_modules
 profile: language headers profile_build profile_core profile_protocols profile_tools profile_modules
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
@@ -33,99 +30,75 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'MYSQL=${MYSQL}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
 
 build: language headers
-	@for i in $(SUBDIRS); do \
-            echo "*** Building $$i";\
-            ( cd $$i; ${MAKE} ${MAKEARGS} all; ) \
-        done
-
-strict_build:  
-	@for i in $(SUBDIRS); do \
-            echo "*** Strict Building $$i";\
-            ( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; ) \
-        done
+	@${MAKE} -C src ${MAKEARGS} all
 
 profile_build:
-	@for i in $(SUBDIRS); do \
-            echo "*** Strict Building $$i";\
-            ( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' 'LDFLAGS=${LDFLAGS} ${PROFILE}' all; ) \
-        done
+	@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' 'LDFLAGS=${LDFLAGS} ${PROFILE}' all
 
 modules: build
-	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} all; )
+	@src/modules/configure src/modules
+	@${MAKE} -C src/modules ${MAKEARGS} all
 	@echo "*** All done, now (g)make install to install Anope/Modules";
 
 clean_modules:
-	(cd src ; ${MAKE} ${MAKEARGS} clean_modules )
+	@${MAKE} -C src ${MAKEARGS} clean_modules
 
 distclean_modules:
-	(cd src ; ${MAKE} ${MAKEARGS} distclean_modules )
+	@${MAKE} -C src ${MAKEARGS} distclean_modules
 
 protocols: build
 	@echo "*** Building protocol support";
-	(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} all; )
-
-strict_protocols: build
-	@echo "*** Building protocol support";
-	(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
+	@src/protocol/configure src/protocol
+	@${MAKE} -C src/protocol ${MAKEARGS} all
 
 profile_protocols: build
 	@echo "*** Building protocol support";
-	(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all; )
+	@src/protocol/configure src/protocol
+	@${MAKE} -C src/protocol ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
 
 core: build 
 	@echo "*** Building Core modules";
-	(cd src/ ; ${MAKE} ${MAKEARGS} core; )
-
-strict_core: build 
-	@echo "*** Building Core modules";
-	(cd src/ ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' core; )
+	 @${MAKE} -C src ${MAKEARGS} core
 
 profile_core: build 
 	@echo "*** Building Core modules";
-	(cd src/ ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core; )
+	@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core
 
 tools: build
-	(cd src/tools ; ${MAKE} ${MAKEARGS} all; )
-	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
-
-strict_tools: strict_build
-	(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
+	@${MAKE} -C src/tools ${MAKEARGS} all
 	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
 
 profile_tools: profile_build
-	(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all; )
+	@${MAKE} -C src/tools ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all
 	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
 
-strict_modules: strict_build
-	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=$(CFLAGS) $(STRICT)' all; )
-	@echo "*** All done, now (g)make install to install Anope/Modules";
-
 profile_modules: profile_build
-	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all; )
+	@src/modules/configure src/modules
+	@${MAKE} -C src/modules ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
 	@echo "*** All done, now (g)make install to install Anope/Modules";
 
 language:
-	(cd lang ; $(MAKE) ${MAKEARGS} all language.h ; )
+	@$(MAKE) -C lang ${MAKEARGS} all language.h
 
 headers:
-	(cd include ; ${MAKE} ${MAKEARGS} )
+	@${MAKE} -C include ${MAKEARGS}
 
 clean:
-	(cd lang ; ${MAKE} ${MAKEARGS} clean )
-	(cd include ; ${MAKE} ${MAKEARGS} clean )
-	(cd src ; ${MAKE} ${MAKEARGS} clean )
-	(cd src/tools ; ${MAKE} ${MAKEARGS} clean )
-
+	${MAKE} -C lang ${MAKEARGS} clean
+	${MAKE} -C include ${MAKEARGS} clean
+	${MAKE} -C src ${MAKEARGS} clean
+	${MAKE} -C src/tools ${MAKEARGS} clean
+                
 distclean: clean
-	(cd lang ; ${MAKE} distclean )
-	(cd include ; ${MAKE} distclean )
-	(cd src ; ${MAKE} distclean )
-	(cd src/tools ; ${MAKE} distclean )
+	${MAKE} -C lang ${MAKEARGS} distclean
+	${MAKE} -C include ${MAKEARGS} distclean
+	${MAKE} -C src ${MAKEARGS} distclean
+	${MAKE} -C src/tools ${MAKEARGS} distclean
 	rm -f config.log config.status config.cache Makefile src/bin/anoperc
 
 install: DUMMY
-	(cd src ; ${MAKE} ${MAKEARGS} install)
-	(cd src/tools ; ${MAKE} ${MAKEARGS} install)
+	${MAKE} -C src ${MAKEARGS} install
+	${MAKE} -C src/tools ${MAKEARGS} install
 	@echo "*** All done, Anope is now installed. Please read docs/INSTALL for details on what to do now.";
 
 DUMMY:
diff --git a/TODO b/TODO
index 66e667c99..e1ea8a3f8 100644
--- a/TODO
+++ b/TODO
@@ -61,3 +61,7 @@ anopeng-uid branch TODO
  - chan_set_modes should take BotInfo, possibly with override for User *?
 - SendClientIntroduction should take a UID param, rather than generating one(?)
 
+
+anopeng-config branch TODO
+
+- remove old config, replace with insp-inspired (albeit bind format) config
diff --git a/configure b/configure
index 77ffd2b01..d9e420987 100755
--- a/configure
+++ b/configure
@@ -6761,297 +6761,6 @@ fi
 
 
 
-for ac_func in strerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRERROR 1
-_ACEOF
-
-fi
-done
-
-
-for ac_func in sys_errlist
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_ERRLIST 1
-_ACEOF
-
-fi
-done
-
-
-for ac_func in snprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SNPRINTF 1
-_ACEOF
-
-fi
-done
-
-
 for ac_func in stricmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7440,103 +7149,6 @@ fi
 done
 
 
-for ac_func in strsignal
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRSIGNAL 1
-_ACEOF
-
-fi
-done
-
-
 for ac_func in gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/configure.in b/configure.in
index d5bce4b87..7e91eaed8 100644
--- a/configure.in
+++ b/configure.in
@@ -232,14 +232,10 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H,1,""))
 AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H,1,""))
 AC_CHECK_HEADER(execinfo.h,AC_DEFINE(HAVE_BACKTRACE,1,""))
 
-AC_CHECK_FUNCS(strerror,AC_DEFINE(HAVE_STRERROR,1))
-AC_CHECK_FUNCS(sys_errlist,AC_DEFINE(HAVE_SYS_ERRLIST,1))
-AC_CHECK_FUNCS(snprintf,AC_DEFINE(HAVE_SNPRINTF,1))
 AC_CHECK_FUNCS(stricmp,AC_DEFINE(HAVE_STRICMP,1))
 AC_CHECK_FUNCS(strcasecmp,AC_DEFINE(HAVE_STRCASECMP,1))
 AC_CHECK_FUNCS(strdup,AC_DEFINE(HAVE_STRDUP,1))
 AC_CHECK_FUNCS(strspn,AC_DEFINE(HAVE_STRSPN,1))
-AC_CHECK_FUNCS(strsignal,AC_DEFINE(HAVE_STRSIGNAL,1))
 AC_CHECK_FUNCS(gettimeofday,AC_DEFINE(HAVE_GETTIMEOFDAY,1))
 AC_CHECK_FUNCS(setgrent,AC_DEFINE(HAVE_SETGRENT,1))
 AC_CHECK_FUNCS(umask,AC_DEFINE(HAVE_UMASK,1))
diff --git a/include/extern.h b/include/extern.h
index fa421edae..7135f7229 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -213,14 +213,6 @@ E char *get_mlock_modes(ChannelInfo * ci, int complete);
 
 /**** compat.c ****/
 
-#if !HAVE_SNPRINTF
-# if BAD_SNPRINTF
-#  define snprintf my_snprintf
-# endif
-# define vsnprintf my_vsnprintf
-E int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
-E int snprintf(char *buf, size_t size, const char *fmt, ...);
-#endif
 #if !HAVE_STRICMP && !HAVE_STRCASECMP
 E int stricmp(const char *s1, const char *s2);
 E int strnicmp(const char *s1, const char *s2, size_t len);
@@ -231,12 +223,6 @@ E char *strdup(const char *s);
 #if !HAVE_STRSPN
 E size_t strspn(const char *s, const char *accept);
 #endif
-#if !HAVE_STRERROR
-E char *strerror(int errnum);
-#endif
-#if !HAVE_STRSIGNAL
-char *strsignal(int signum);
-#endif
 #ifdef _WIN32
 char *sockstrerror(int error);
 #endif
diff --git a/include/services.h b/include/services.h
index 1160fb5c5..aafbb3ddc 100644
--- a/include/services.h
+++ b/include/services.h
@@ -23,12 +23,6 @@
 #define MAX_CMD_HASH 1024
 #endif
 
-/* Some Linux boxes (or maybe glibc includes) require this for the
- * prototype of strsignal(). */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 /* Some SUN fixs */
 #ifdef __sun
 /* Solaris specific code, types that do not exist in Solaris'
diff --git a/include/sysconf.h.in b/include/sysconf.h.in
index 3086d4250..f4b3f99e7 100644
--- a/include/sysconf.h.in
+++ b/include/sysconf.h.in
@@ -33,9 +33,6 @@
 /* Define to 1 if you have the `setgrent' function. */
 #undef HAVE_SETGRENT
 
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -48,9 +45,6 @@
 /* Define to 1 if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
 /* Define to 1 if you have the `stricmp' function. */
 #undef HAVE_STRICMP
 
@@ -66,15 +60,9 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
-/* Define to 1 if you have the `strsignal' function. */
-#undef HAVE_STRSIGNAL
-
 /* Define to 1 if you have the `strspn' function. */
 #undef HAVE_STRSPN
 
-/* Define to 1 if you have the `sys_errlist' function. */
-#undef HAVE_SYS_ERRLIST
-
 /* "" */
 #undef HAVE_SYS_SELECT_H
 
@@ -185,35 +173,6 @@
 #ifdef __STRICT_ANSI__
 #include <stdarg.h>
 #include <stdio.h>
-
-/* We KNOW these are not ansi, we are defining them here to suppress the warning
- *  * s messages on a "make strict" compile */
-#ifndef snprintf
-int snprintf(char *str, size_t size, const char *format, ...);
-#endif
-#ifndef vprintf
-int vprintf(const char *format, va_list ap);
-#endif
-#ifndef vfprintf
-int vfprintf(FILE *stream, const char *format, va_list ap);
-#endif
-#ifndef vsprintf
-int vsprintf(char *str, const char *format, va_list ap);
-#endif
-#ifndef vsnprintf
-int vsnprintf(char *str, size_t size, const char *format, va_list ap);
-#endif
-
-FILE *popen(const char *command, const char *type);
-int pclose(FILE *stream);
-FILE *fdopen(int fildes, const char *mode);
-
-int ftruncate(int fd, off_t length);
-
-#ifdef HAVE_STRSIGNAL
-char *strsignal(int sig);
-#endif
-
 #endif
 
 
diff --git a/include/sysconf.h.win32 b/include/sysconf.h.win32
index a11694469..fb6d5a6e9 100644
--- a/include/sysconf.h.win32
+++ b/include/sysconf.h.win32
@@ -16,10 +16,6 @@ typedef unsigned __int8 u_int8_t;
 #define HAVE_SYS_SELECT_H	0

 #define HAVE_SYS_SYSPROTO_H	0

 

-#define HAVE_STRERROR		1

-#define HAVE_SYS_ERRLIST	0

-#define HAVE_SNPRINTF		1

-#define BAD_SNPRINTF		0

 #define HAVE_STRICMP		1

 #define HAVE_STRCASECMP		0

 #define HAVE_STRDUP		1

diff --git a/include/version.sh.c b/include/version.sh.c
index f69fe8992..a3d0ba7e4 100644
--- a/include/version.sh.c
+++ b/include/version.sh.c
@@ -16,6 +16,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <cstdlib>
+#include <cctype>
 
 #define CTRL "version.log"
 
@@ -46,10 +48,10 @@ int main()
     load_ctrl(fd);
     fclose(fd);
 
-    _snprintf(version, 1024, "%d.%d.%d%s (%d)", version_major, version_minor,
+    _snprintf(version, 1024, "%ld.%ld.%ld%s (%ld)", version_major, version_minor,
               version_patch, (version_extra ? version_extra : ""), version_build);
 
-    _snprintf(version_dotted, 1024, "%d.%d.%d%s.%d", version_major, version_minor,
+    _snprintf(version_dotted, 1024, "%ld.%ld.%ld%s.%ld", version_major, version_minor,
               version_patch, (version_extra ? version_extra : ""), version_build);
 
     fd = fopen("version.h", "r");
@@ -106,7 +108,11 @@ char *strip(char *str)
 
 long get_value(char *string)
 {
-    return atol(get_value_str(string));
+	// XXX : if the fields in version.log are empty strtok returns a double quote, dont try to atol it then
+	if (*string != '"')
+	    return atol(get_value_str(string));
+	else
+		return 0;
 }
 
 char *get_value_str(char *string)
@@ -165,10 +171,12 @@ void write_version(FILE * fd)
         strip(buf);
 
         if (until_eof)
+        {
             if (!strcmp(buf, "EOF"))
                 break;
             else
                 parse_line(fd, buf);
+        }
 
         if (!strcmp(buf, "cat >version.h <<EOF"))
             until_eof = 1;
@@ -197,18 +205,18 @@ void parse_line(FILE * fd, char *line)
 
                 *var = 0;
                 if (!strcmp(varbegin, "VERSION_MAJOR"))
-                    fprintf(fd, "%d", version_major);
+                    fprintf(fd, "%ld", version_major);
                 else if (!strcmp(varbegin, "VERSION_MINOR"))
-                    fprintf(fd, "%d", version_minor);
+                    fprintf(fd, "%ld", version_minor);
                 else if (!strcmp(varbegin, "VERSION_PATCH"))
-                    fprintf(fd, "%d", version_patch);
+                    fprintf(fd, "%ld", version_patch);
                 else if (!strcmp(varbegin, "VERSION_EXTRA")) {
                     if (version_extra)
                         fprintf(fd, "%s", version_extra);
                 } else if (!strcmp(varbegin, "VERSION_BUILD"))
-                    fprintf(fd, "%d", version_bu