diff options
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | include/sysconf.h.in | 10 | ||||
| -rw-r--r-- | version.log | 7 |
4 files changed, 25 insertions, 10 deletions
@@ -2237,7 +2237,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$ac_cv_c_compiler_gnu" = "yes"; then - CFLAGS="$CFLAGS -funsigned-char" +# CFLAGS="$CFLAGS -funsigned-char" echo "$as_me:$LINENO: checking if gcc has a working -pipe" >&5 echo $ECHO_N "checking if gcc has a working -pipe... $ECHO_C" >&6 @@ -8616,10 +8616,17 @@ fi; if test "${with_encryption+set}" = set; then withval="$with_encryption" + +cat >>confdefs.h <<_ACEOF +#define USE_ENCRYPTION +_ACEOF + + cat >>confdefs.h <<_ACEOF -#define USE_ENCRYPTION "USE_ENCRYPTION" +#define ENCRYPT_MD5 _ACEOF + fi; ac_config_files="$ac_config_files Makefile" diff --git a/configure.in b/configure.in index d6c311f43..cee3dadd0 100644 --- a/configure.in +++ b/configure.in @@ -20,7 +20,7 @@ fi AC_CONFIG_HEADER(include/sysconf.h) AC_PROG_CC if test "$ac_cv_prog_gcc" = "yes"; then - CFLAGS="$CFLAGS -funsigned-char" +# CFLAGS="$CFLAGS -funsigned-char" AC_CACHE_CHECK(if gcc has a working -pipe, ac_cv_pipe, [ save_cflags="$CFLAGS" CFLAGS="$CFLAGS -pipe" @@ -204,7 +204,10 @@ AC_ARG_WITH(ircd, [ --with-ircd=ircd Specify the first ircd type], [ fi ]) -AC_ARG_WITH(encryption, [ --with-encryption Use md5 database encryption], AC_DEFINE_UNQUOTED(USE_ENCRYPTION,"USE_ENCRYPTION","has encryption")) +AC_ARG_WITH(encryption, [ --with-encryption Use md5 database encryption], [ + AC_DEFINE_UNQUOTED(USE_ENCRYPTION,,"has encryption") + AC_DEFINE_UNQUOTED(ENCRYPT_MD5,,"Use md5") +]) AC_OUTPUT(Makefile) diff --git a/include/sysconf.h.in b/include/sysconf.h.in index ff01e38b6..2b5108676 100644 --- a/include/sysconf.h.in +++ b/include/sysconf.h.in @@ -1,11 +1,14 @@ -/* include/sysconf.h.in. Generated from ./autoconf/configure.in by autoheader. */ +/* include/sysconf.h.in. Generated from configure.in by autoheader. */ /* "Default umask Permissions" */ #undef DEFUMASK -/* "Underscore needed for dlopen" */ +/* "No prefix needed for dlopen" */ #undef DL_PREFIX +/* "Use md5" */ +#undef ENCRYPT_MD5 + /* "Has sys/types.h" */ #undef HAS_SYS_TYPES_H @@ -194,9 +197,6 @@ #undef u_int32_t /* Static config, copy from here to below before running autoheader! */ -#ifdef USE_ENCRYPTION -#define ENCRYPT_MD5 -#endif #ifdef HAS_SYS_TYPES_H #include <sys/types.h> diff --git a/version.log b/version.log index 30f1b20da..1f960335b 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,15 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="4" -VERSION_BUILD="268" +VERSION_BUILD="269" # $Log$ # +# BUILD : 1.7.4 (269) +# BUGS : N/A +# NOTES : dont use -funsigned-chars as the md5 encryption stuff (while it will still encrypt, probably in a way that is more normal md5) it wont be compatiable with the old md5 encryption, so for now, we will never use it, and itll be left to the OSs to just pick if chars are signed or unsigned.... +# +# # BUILD : 1.7.4 (268) # BUGS : N/A # NOTES : Fixed position of text after ./Config and make |