1
0
mirror of https://github.com/anope/anope.git synced 2026-06-30 22:06:38 +02:00

BUILD : 1.7.14 (1051) BUGS : NOTES : Changed mysql detection to use mysql_config instead of home brewn mysql.m4

git-svn-id: svn://svn.anope.org/anope/trunk@1051 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@775 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b
2006-06-14 21:34:52 +00:00
parent 4b2c1c6512
commit dffa3a16fe
7 changed files with 2074 additions and 671 deletions
+1
View File
@@ -23,6 +23,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006
06/13 F Added cleanup code to tools/anopesmtp. [#464]
06/13 F Fixed a lot of redundant function declarations. [#510]
06/14 F Removed last traces of threading support. [#498]
06/14 F Changed mysql detection to use mysql_config. [ #00]
Provided by ThaPrince <jon@vile.com> - 2006
05/19 A Plexus 3 support. [ #00]
Vendored
+29 -140
View File
@@ -829,146 +829,35 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
AC_LIB_PROG_LD_GNU
])
# Configure paths for mysql-client, GPLv2
#$Id$
#ken restivo modified 2001/08/04 to remove NULLs and use 0, in case NULL undefined.
# Markus Fischer <[EMAIL PROTECTED]>, 23.9.1999
# URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/mysql-client.m4
# Last Modified : Thu Sep 23 14:24:15 CEST 1999
#
# written from scratch
dnl Test for libmysqlclient and
dnl define MYSQLCLIENT_CFLAGS, MYSQLCLIENT_LDFLAGS and MYSQLCLIENT_LIBS
dnl usage:
dnl AM_PATH_MYSQLCLIENT(
dnl [MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [,
dnl ACTION-IF-NOT-FOUND ]]])
dnl Macro: anope_CHECK_TYPE_SIZES
dnl
AC_DEFUN(AM_PATH_MYSQLCLIENT,
[
AC_ARG_WITH(mysqlclient-prefix,
[ --with-mysqlclient-prefix=PFX Prefix where mysqlclient is
installed],
mysqlclient_prefix="$withval",
mysqlclient_prefix="")
AC_ARG_WITH(mysqlclient-include, [ --with-mysqlclient-include=DIR Directory pointing
to mysqlclient include files],
mysqlclient_include="$withval",
mysqlclient_include="")
AC_ARG_WITH(mysqlclient-lib,
[ --with-mysqlclient-lib=LIB Directory pointing to mysqlclient library
(Note: -include and -lib do override
paths found with -prefix)
],
mysqlclient_lib="$withval",
mysqlclient_lib="")
AC_MSG_CHECKING([for mysqlclient ifelse([$1], , ,[>= v$1])])
MYSQLCLIENT_LDFLAGS=""
MYSQLCLIENT_CFLAGS=""
MYSQLCLIENT_LIBS="-lmysqlclient"
mysqlclient_fail=""
dnl test --with-mysqlclient-prefix
for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg $msqlclient_prefix; do
#testloop
for hloc in lib/mysql lib ; do
if test -e "$tryprefix/$hloc/libmysqlclient.so"; then
MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
fi
done
for iloc in include/mysql include; do
if test -e "$tryprefix/$iloc/mysql.h"; then
MYSQLCLIENT_CFLAGS="-I$tryprefix/$iloc"
fi
done
# testloop
done
dnl test --with-mysqlclient-include
if test "x$mysqlclient_include" != "x" ; then
echo "checking for mysql includes... "
if test -d "$mysqlclient_include/mysql" ; then
MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
echo " found $MYSQLCLIENT_CFLAGS"
elif test -d "$mysqlclient_include/include/mysql" ; then
MYSQLCLIENT_CFLAGS="-I$mysqlclient_include/include"
echo " found $MYSQLCLIENT_CFLAGS"
elif test -d "$mysqlclient_include" ; then
MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
echo "found $MYSQLCLIENT_CFLAGS"
else
echo "not found! no include dir found in $mysqlclient_include"
fi
fi
dnl test --with-mysqlclient-lib
if test "x$mysqlclient_lib" != "x" ; then
echo "checking for mysql libx... "
if test -d "$mysqlclient_lib/lib/mysql" ; then
MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib/mysql"
echo "found $MYSQLCLIENT_LDFLAGS"
elif test -d "$mysqlclient_lib/lin" ; then
MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib"
echo "found $MYSQLCLIENT_LDFLAGS"
else
MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib"
echo "defaultd to $MYSQLCLIENT_LDFLAGS"
fi
fi
ac_save_CFLAGS="$CFLAGS"
ac_save_LDFLAGS="$LDFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="-v $CFLAGS $MYSQLCLIENT_CFLAGS"
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS"
LIBS="$LIBS $MYSQLCLIENT_LIBS"
dnl if no minimum version is given, just try to compile
dnl else try to compile AND run
AC_TRY_COMPILE([
#include <mysql.h>
#include <mysql_version.h>
],[
mysql_connect( 0, 0, 0, 0);
], [AC_MSG_RESULT(yes $MYSQLCLIENT_CFLAGS $MYSQLCLIENT_LDFLAGS)
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
ifelse([$2], ,:,[$2])
],[
echo "no"
echo "can't compile a simple app with mysql_connnect in it.
bad."
mysqlclient_fail="yes"
])
if test "x$mysqlclient_fail" != "x" ; then
dnl AC_MSG_RESULT(no)
echo
echo "***"
echo "*** mysqlclient test source had problems, check your config.log ."
echo "*** Also try one of the following switches :"
echo "*** --with-mysqlclient-prefix=PFX"
echo "*** --with-mysqlclient-include=DIR"
echo "*** --with-mysqlclient-lib=DIR"
echo "***"
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
ifelse([$3], ,:,[$3])
fi
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
AC_SUBST(MYSQLCLIENT_LDFLAGS)
AC_SUBST(MYSQLCLIENT_CFLAGS)
AC_SUBST(MYSQLCLIENT_LIBS)
dnl Check the size of several types and define a valid int16_t and int32_t.
dnl
AC_DEFUN(anope_CHECK_TYPE_SIZES,
[dnl Check type sizes
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
if test "$ac_cv_sizeof_int" = 2 ; then
AC_CHECK_TYPE(int16_t, int)
AC_CHECK_TYPE(u_int16_t, unsigned int)
elif test "$ac_cv_sizeof_short" = 2 ; then
AC_CHECK_TYPE(int16_t, short)
AC_CHECK_TYPE(u_int16_t, unsigned short)
else
AC_MSG_ERROR([Cannot find a type with size of 16 bits])
fi
if test "$ac_cv_sizeof_int" = 4 ; then
AC_CHECK_TYPE(int32_t, int)
AC_CHECK_TYPE(u_int32_t, unsigned int)
elif test "$ac_cv_sizeof_short" = 4 ; then
AC_CHECK_TYPE(int32_t, short)
AC_CHECK_TYPE(u_int32_t, unsigned short)
elif test "$ac_cv_sizeof_long" = 4 ; then
AC_CHECK_TYPE(int32_t, long)
AC_CHECK_TYPE(u_int32_t, unsigned long)
else
AC_MSG_ERROR([Cannot find a type with size of 32 bits])
fi
])
+31
View File
@@ -0,0 +1,31 @@
dnl Macro: anope_CHECK_TYPE_SIZES
dnl
dnl Check the size of several types and define a valid int16_t and int32_t.
dnl
AC_DEFUN(anope_CHECK_TYPE_SIZES,
[dnl Check type sizes
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
if test "$ac_cv_sizeof_int" = 2 ; then
AC_CHECK_TYPE(int16_t, int)
AC_CHECK_TYPE(u_int16_t, unsigned int)
elif test "$ac_cv_sizeof_short" = 2 ; then
AC_CHECK_TYPE(int16_t, short)
AC_CHECK_TYPE(u_int16_t, unsigned short)
else
AC_MSG_ERROR([Cannot find a type with size of 16 bits])
fi
if test "$ac_cv_sizeof_int" = 4 ; then
AC_CHECK_TYPE(int32_t, int)
AC_CHECK_TYPE(u_int32_t, unsigned int)
elif test "$ac_cv_sizeof_short" = 4 ; then
AC_CHECK_TYPE(int32_t, short)
AC_CHECK_TYPE(u_int32_t, unsigned short)
elif test "$ac_cv_sizeof_long" = 4 ; then
AC_CHECK_TYPE(int32_t, long)
AC_CHECK_TYPE(u_int32_t, unsigned long)
else
AC_MSG_ERROR([Cannot find a type with size of 32 bits])
fi
])
Vendored
+1981 -368
View File
File diff suppressed because it is too large Load Diff
+27 -20
View File
@@ -43,7 +43,6 @@ 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";
dnl Does this platform require array notation to assign to a va_list?
dnl If cross-compiling, we assume va_list is "normal". If this breaks
@@ -75,24 +74,32 @@ fi
DIS_MYSQL=" MySql: No"
AC_ARG_WITH(mysql, [ --without-mysql Do not use MySQL even if we find it],,[
AM_PATH_MYSQLCLIENT(,[
AC_DEFINE_UNQUOTED(USE_MYSQL,1,"Use Mysql")
AC_DEFINE_UNQUOTED(USE_RDB,1,"Use RDB")
AC_CHECK_HEADER(mysql/mysql.h,AC_DEFINE(MYSQL_HEADER_PREFIX,1,"Has mysql/mysql.h"))
MYSQL=" mysql.c "
RDB=" rdb.c "
AC_SUBST(MYSQL)
AC_SUBST(RDB)
x="1";
],)
if test "$x" = "1"; then
ANOPELIBS="$ANOPELIBS$MYSQLCLIENT_LIBS "
CFLAGS="$CFLAGS $MYSQLCLIENT_CFLAGS "
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
DIS_MYSQL=" MySql: Yes"
fi
AC_ARG_WITH(mysql, [ --without-mysql Do not use MySQL or attempt to find it],,[
AC_ARG_WITH(mysqlconfig-path, [ --with-mysqlconfig-path=PATH Complete path to the mysql_config executable],
mysql_config_path="$withval", mysql_config_path="")
MYSQLCONF=""
if test "$mysql_config_path" != ""; then
if test -x "$mysql_config_path"; then
MYSQLCONF="$mysql_config_path"
echo "checking for mysql_config... $MYSQLCONF"
fi
fi
if test "$MYSQLCONF" = ""; then
AC_PATH_PROG(MYSQLCONF,mysql_config, "")
fi
if test "$MYSQLCONF" != ""; then
AC_DEFINE_UNQUOTED(USE_MYSQL,1,"Use Mysql")
AC_DEFINE_UNQUOTED(USE_RDB,1,"Use RDB")
MYSQL=" mysql.c "
RDB=" rdb.c "
AC_SUBST(MYSQL)
AC_SUBST(RDB)
MYSQL_CFLAGS="`$MYSQLCONF --cflags`"
MYSQL_LIBS="`$MYSQLCONF --libs`"
CFLAGS="$CFLAGS $MYSQL_CFLAGS"
LDFLAGS="$LDFLAGS $MYSQL_LIBS"
DIS_MYSQL=" MySql: Yes"
fi
])
AC_SUBST(ANOPELIBS)
@@ -187,7 +194,7 @@ AC_DEFINE(USE_MODULES,1,"Modules available")
])
AC_ENABLE_DYN
unreal_CHECK_TYPE_SIZES
anope_CHECK_TYPE_SIZES
AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H,1,""))
AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H,1,""))
-142
View File
@@ -1,142 +0,0 @@
# Configure paths for mysql-client, GPLv2
#$Id$
#ken restivo modified 2001/08/04 to remove NULLs and use 0, in case NULL undefined.
# Markus Fischer <[EMAIL PROTECTED]>, 23.9.1999
# URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/mysql-client.m4
# Last Modified : Thu Sep 23 14:24:15 CEST 1999
#
# written from scratch
dnl Test for libmysqlclient and
dnl define MYSQLCLIENT_CFLAGS, MYSQLCLIENT_LDFLAGS and MYSQLCLIENT_LIBS
dnl usage:
dnl AM_PATH_MYSQLCLIENT(
dnl [MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [,
dnl ACTION-IF-NOT-FOUND ]]])
dnl
AC_DEFUN(AM_PATH_MYSQLCLIENT,
[
AC_ARG_WITH(mysqlclient-prefix,
[ --with-mysqlclient-prefix=PFX Prefix where mysqlclient is
installed],
mysqlclient_prefix="$withval",
mysqlclient_prefix="")
AC_ARG_WITH(mysqlclient-include, [ --with-mysqlclient-include=DIR Directory pointing
to mysqlclient include files],
mysqlclient_include="$withval",
mysqlclient_include="")
AC_ARG_WITH(mysqlclient-lib,
[ --with-mysqlclient-lib=LIB Directory pointing to mysqlclient library
(Note: -include and -lib do override
paths found with -prefix)
],
mysqlclient_lib="$withval",
mysqlclient_lib="")
AC_MSG_CHECKING([for mysqlclient ifelse([$1], , ,[>= v$1])])
MYSQLCLIENT_LDFLAGS=""
MYSQLCLIENT_CFLAGS=""
MYSQLCLIENT_LIBS="-lmysqlclient"
mysqlclient_fail=""
dnl test --with-mysqlclient-prefix
for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg $msqlclient_prefix; do
#testloop
for hloc in lib/mysql lib ; do
if test -e "$tryprefix/$hloc/libmysqlclient.so"; then
MYSQLCLIENT_LDFLAGS="-L$tryprefix/$hloc"
fi
done
for iloc in include/mysql include; do
if test -e "$tryprefix/$iloc/mysql.h"; then
MYSQLCLIENT_CFLAGS="-I$tryprefix/$iloc"
fi
done
# testloop
done
dnl test --with-mysqlclient-include
if test "x$mysqlclient_include" != "x" ; then
echo "checking for mysql includes... "
if test -d "$mysqlclient_include/mysql" ; then
MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
echo " found $MYSQLCLIENT_CFLAGS"
elif test -d "$mysqlclient_include/include/mysql" ; then
MYSQLCLIENT_CFLAGS="-I$mysqlclient_include/include"
echo " found $MYSQLCLIENT_CFLAGS"
elif test -d "$mysqlclient_include" ; then
MYSQLCLIENT_CFLAGS="-I$mysqlclient_include"
echo "found $MYSQLCLIENT_CFLAGS"
else
echo "not found! no include dir found in $mysqlclient_include"
fi
fi
dnl test --with-mysqlclient-lib
if test "x$mysqlclient_lib" != "x" ; then
echo "checking for mysql libx... "
if test -d "$mysqlclient_lib/lib/mysql" ; then
MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib/mysql"
echo "found $MYSQLCLIENT_LDFLAGS"
elif test -d "$mysqlclient_lib/lin" ; then
MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib/lib"
echo "found $MYSQLCLIENT_LDFLAGS"
else
MYSQLCLIENT_LDFLAGS="-L$mysqlclient_lib"
echo "defaultd to $MYSQLCLIENT_LDFLAGS"
fi
fi
ac_save_CFLAGS="$CFLAGS"
ac_save_LDFLAGS="$LDFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="-v $CFLAGS $MYSQLCLIENT_CFLAGS"
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS"
LIBS="$LIBS $MYSQLCLIENT_LIBS"
dnl if no minimum version is given, just try to compile
dnl else try to compile AND run
AC_TRY_COMPILE([
#include <mysql.h>
#include <mysql_version.h>
],[
mysql_connect( 0, 0, 0, 0);
], [AC_MSG_RESULT(yes $MYSQLCLIENT_CFLAGS $MYSQLCLIENT_LDFLAGS)
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
ifelse([$2], ,:,[$2])
],[
echo "no"
echo "can't compile a simple app with mysql_connnect in it.
bad."
mysqlclient_fail="yes"
])
if test "x$mysqlclient_fail" != "x" ; then
dnl AC_MSG_RESULT(no)
echo
echo "***"
echo "*** mysqlclient test source had problems, check your config.log ."
echo "*** Also try one of the following switches :"
echo "*** --with-mysqlclient-prefix=PFX"
echo "*** --with-mysqlclient-include=DIR"
echo "*** --with-mysqlclient-lib=DIR"
echo "***"
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
ifelse([$3], ,:,[$3])
fi
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
AC_SUBST(MYSQLCLIENT_LDFLAGS)
AC_SUBST(MYSQLCLIENT_CFLAGS)
AC_SUBST(MYSQLCLIENT_LIBS)
])
+5 -1
View File
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="14"
VERSION_EXTRA=""
VERSION_BUILD="1050"
VERSION_BUILD="1051"
# $Log$
#
# BUILD : 1.7.14 (1051)
# BUGS :
# NOTES : Changed mysql detection to use mysql_config instead of home brewn mysql.m4
#
# BUILD : 1.7.14 (1050)
# BUGS : 498
# NOTES : Removed last traces of threading support and added a W-flag in our version response if we run on windows