mirror of
https://github.com/anope/anope.git
synced 2026-07-05 23:33:12 +02:00
BUILD : 1.7.5 (317) BUGS : N/A NOTES : autoconf should now deal with no mysql properly
git-svn-id: svn://svn.anope.org/anope/trunk@317 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@195 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b
parent
8da5da23a9
commit
1a1155a0ed
@@ -1,12 +1,13 @@
|
||||
Anope Version 1.7.5
|
||||
-------------------
|
||||
Provided by Anope Dev. <dev@anope.org> - 2004
|
||||
08/10 F Fixed previous BotServ buffer fix. [#131]
|
||||
07/17 A Switched to autoconf for configure script. [ #00]
|
||||
07/05 A Warning when LocalAddress conflicts with RemoteServer. [#118]
|
||||
06/18 A Added proper Bahamut1.8 support. [ #55]
|
||||
08/07 F configure will be ok if you dont have mysqlclient lib file [ #00]
|
||||
08/10 F Fixed previous BotServ buffer fix. [#131]
|
||||
08/10 F Updated documentation to reflect the changed build process. [ #00]
|
||||
07/23 F Fixed BotServ buffer [#131]
|
||||
07/23 F Fixed BotServ buffer [#131]
|
||||
07/23 F Fixed BotServ buffer [#131]
|
||||
07/22 F Free NSNickTracking when a user quits. [#126]
|
||||
07/22 F NOOP bug with wildcards. [#115]
|
||||
07/22 F Removed RESTRICTED from incorrectly labeled lang file entry. [#111]
|
||||
|
||||
@@ -2739,6 +2739,8 @@ if test $ac_cv_lib_bsd_revoke = yes; then
|
||||
ANOPELIBS="$ANOPELIBS-lbsd "
|
||||
fi
|
||||
|
||||
x="0";
|
||||
DIS_MYSQL=" MySql: No"
|
||||
|
||||
|
||||
# Check whether --with-mysqlclient-prefix or --without-mysqlclient-prefix was given.
|
||||
@@ -2888,6 +2890,7 @@ _ACEOF
|
||||
RDB=" rdb.c "
|
||||
|
||||
|
||||
x="1";
|
||||
|
||||
|
||||
else
|
||||
@@ -2926,10 +2929,15 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
|
||||
|
||||
ANOPELIBS="$ANOPELIBS$MYSQLCLIENT_LIBS "
|
||||
CFLAGS="$CFLAGS $MYSQLCLIENT_CFLAGS "
|
||||
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
|
||||
if test "$x" = "1"; then
|
||||
ANOPELIBS="$ANOPELIBS$MYSQLCLIENT_LIBS "
|
||||
CFLAGS="$CFLAGS $MYSQLCLIENT_CFLAGS "
|
||||
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
|
||||
DIS_MYSQL=" MySql: Yes"
|
||||
fi
|
||||
|
||||
|
||||
DIS_THREAD="Threads: No"
|
||||
ac_aux_dir=
|
||||
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||||
if test -f $ac_dir/install-sh; then
|
||||
@@ -3473,6 +3481,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define USE_THREADS 1
|
||||
_ACEOF
|
||||
|
||||
DIS_THREAD="Threads: Yes"
|
||||
|
||||
:
|
||||
else
|
||||
@@ -4125,6 +4134,8 @@ fi
|
||||
|
||||
|
||||
|
||||
DIS_MODULES="Modules: NO"
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4294,6 +4305,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||
_ACEOF
|
||||
|
||||
USE_MODULES="yes"
|
||||
DIS_MODULES="Modules: Yes"
|
||||
|
||||
else
|
||||
|
||||
@@ -9577,6 +9589,11 @@ fi
|
||||
|
||||
|
||||
cat <<EOT
|
||||
|
||||
$DIS_MODULES
|
||||
$DIS_THREAD
|
||||
$DIS_MYSQL
|
||||
|
||||
All done! Now run "make" (or possibly "gmake") to compile Anope.
|
||||
See the INSTALL, README and FAQ files if you have any problems.
|
||||
EOT
|
||||
|
||||
+20
-3
@@ -42,6 +42,8 @@ AC_CHECK_LIB(nsl,inet_ntoa,ANOPELIBS="$ANOPELIBS-lnsl ")
|
||||
AC_CHECK_LIB(socket, socket,ANOPELIBS="$ANOPELIBS-lsocket ")
|
||||
AC_CHECK_LIB(resolv, res_query,ANOPELIBS="$ANOPELIBS-lresolv ")
|
||||
AC_CHECK_LIB(bsd, revoke,ANOPELIBS="$ANOPELIBS-lbsd ")
|
||||
x="0";
|
||||
DIS_MYSQL=" MySql: No"
|
||||
AM_PATH_MYSQLCLIENT(,[
|
||||
AC_DEFINE_UNQUOTED(USE_MYSQL,1,"Use Mysql")
|
||||
AC_DEFINE_UNQUOTED(USE_RDB,1,"Use RDB")
|
||||
@@ -49,16 +51,23 @@ AM_PATH_MYSQLCLIENT(,[
|
||||
RDB=" rdb.c "
|
||||
AC_SUBST(MYSQL)
|
||||
AC_SUBST(RDB)
|
||||
x="1";
|
||||
],)
|
||||
|
||||
ANOPELIBS="$ANOPELIBS$MYSQLCLIENT_LIBS "
|
||||
CFLAGS="$CFLAGS $MYSQLCLIENT_CFLAGS "
|
||||
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
|
||||
if test "$x" = "1"; then
|
||||
ANOPELIBS="$ANOPELIBS$MYSQLCLIENT_LIBS "
|
||||
CFLAGS="$CFLAGS $MYSQLCLIENT_CFLAGS "
|
||||
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
|
||||
DIS_MYSQL=" MySql: Yes"
|
||||
fi
|
||||
|
||||
|
||||
DIS_THREAD="Threads: No"
|
||||
ACX_PTHREAD([
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
ANOPELIBS="$ANOPELIBS$PTHREAD_LIBS "
|
||||
AC_DEFINE_UNQUOTED(USE_THREADS,1,"Use threads")
|
||||
DIS_THREAD="Threads: Yes"
|
||||
])
|
||||
|
||||
AC_SUBST(ANOPELIBS)
|
||||
@@ -66,6 +75,8 @@ AC_SUBST(LDFLAGS)
|
||||
|
||||
AC_CHECK_HEADER(sys/types.h,AC_DEFINE(HAS_SYS_TYPES_H,1,"Has sys/types.h"))
|
||||
|
||||
DIS_MODULES="Modules: NO"
|
||||
|
||||
dnl module checking based on Unreal's module checking code
|
||||
AC_DEFUN(AC_ENABLE_DYN,
|
||||
[
|
||||
@@ -73,6 +84,7 @@ AC_CHECK_FUNC(dlopen,, AC_CHECK_LIB(dl,dlopen,[
|
||||
ANOPELIBS="$ANOPELIBS -ldl"
|
||||
AC_DEFINE(USE_MODULES,1,"Modules are available")
|
||||
USE_MODULES="yes"
|
||||
DIS_MODULES="Modules: Yes"
|
||||
],
|
||||
[
|
||||
AC_MSG_WARN(Dynamic linking is not enabled because dlopen was not found)
|
||||
@@ -208,6 +220,11 @@ AC_ARG_WITH(encryption, [ --with-encryption Use md5 database encryption], [
|
||||
AC_OUTPUT(Makefile)
|
||||
|
||||
cat <<EOT
|
||||
|
||||
$DIS_MODULES
|
||||
$DIS_THREAD
|
||||
$DIS_MYSQL
|
||||
|
||||
All done! Now run "make" (or possibly "gmake") to compile Anope.
|
||||
See the INSTALL, README and FAQ files if you have any problems.
|
||||
EOT
|
||||
|
||||
+5
-1
@@ -8,10 +8,14 @@
|
||||
VERSION_MAJOR="1"
|
||||
VERSION_MINOR="7"
|
||||
VERSION_PATCH="5"
|
||||
VERSION_BUILD="316"
|
||||
VERSION_BUILD="317"
|
||||
|
||||
# $Log$
|
||||
#
|
||||
# BUILD : 1.7.5 (317)
|
||||
# BUGS : N/A
|
||||
# NOTES : autoconf should now deal with no mysql properly
|
||||
#
|
||||
# BUILD : 1.7.5 (316)
|
||||
# BUGS : 131
|
||||
# NOTES : Fixed bugs in previous BotServ buffer fix.
|
||||
|
||||
Reference in New Issue
Block a user