mirror of
https://github.com/anope/anope.git
synced 2026-06-29 00:46:39 +02:00
BUILD : 1.7.4 (283) BUGS : N/A NOTES : Added better mysql detection to autoconf
git-svn-id: svn://svn.anope.org/anope/trunk@283 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@182 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b
parent
c6fe2b8f4d
commit
e5e4057f22
@@ -13,6 +13,7 @@ TOUCH=@TOUCH@
|
||||
MODULE_PATH=@MODULE_PATH@
|
||||
MYSQL=@MYSQL@
|
||||
RDB=@RDB@
|
||||
LDFLAGS=@LDFLAGS@
|
||||
|
||||
all: language headers build modules
|
||||
|
||||
|
||||
Vendored
+142
@@ -227,3 +227,145 @@ fi
|
||||
AC_LANG_RESTORE
|
||||
])dnl ACX_PTHREAD
|
||||
|
||||
dnl # Configure paths for mysql-client, GPLv2
|
||||
dnl #$Id: mysql.m4,v 1.1 2001/10/15 01:48:03 ken Exp $
|
||||
dnl #ken restivo modified 2001/08/04 to remove NULLs and use 0, in case NULL undefined.
|
||||
dnl # Markus Fischer <[EMAIL PROTECTED]>, 23.9.1999
|
||||
dnl # URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/mysql-client.m4
|
||||
dnl # Last Modified : Thu Sep 23 14:24:15 CEST 1999
|
||||
dnl #
|
||||
dnl # 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)
|
||||
])
|
||||
|
||||
+13
-17
@@ -42,24 +42,18 @@ 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 ")
|
||||
AC_CHECK_LIB(mysqlclient, mysql_real_connect,[
|
||||
ANOPELIBS="$ANOPELIBS-lmysqlclient "
|
||||
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)
|
||||
AC_CHECK_HEADER(mysql.h,[
|
||||
AC_DEFINE(HAVE_MYSQL_MYSQL_H,"1","We have the mysql Header file")
|
||||
])
|
||||
AC_CHECK_HEADER(mysql/mysql.h,[
|
||||
AC_DEFINE(HAVE_MYSQL_MYSQL_H,"1","We have the mysql Header file")
|
||||
AC_DEFINE(MYSQL_HEADER_PREFIX,"1","mysql.h is in a mysql/ folder")
|
||||
])
|
||||
])
|
||||
AM_PATH_MYSQLCLIENT(,[
|
||||
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)
|
||||
],)
|
||||
|
||||
AC_CHECK_HEADER(sys/types.h,AC_DEFINE(HAS_SYS_TYPES_H,1,"Has sys/types.h"))
|
||||
ANOPELIBS="$ANOPELIBS$MYSQLCLIENT_LIBS "
|
||||
CFLAGS="$CFLAGS $MYSQLCLIENT_CFLAGS "
|
||||
LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
|
||||
|
||||
ACX_PTHREAD([
|
||||
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
@@ -68,7 +62,9 @@ ACX_PTHREAD([
|
||||
])
|
||||
|
||||
AC_SUBST(ANOPELIBS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
AC_CHECK_HEADER(sys/types.h,AC_DEFINE(HAS_SYS_TYPES_H,1,"Has sys/types.h"))
|
||||
|
||||
dnl module checking based on Unreal's module checking code
|
||||
AC_DEFUN(AC_ENABLE_DYN,
|
||||
|
||||
+2
-11
@@ -58,17 +58,8 @@
|
||||
# define MYSQL_WARNING 2
|
||||
# define MYSQL_ERROR 4
|
||||
|
||||
#ifdef HAVE_MYSQL_MYSQL_H
|
||||
#ifdef MYSQL_HEADER_PREFIX
|
||||
#include <mysql/mysql.h>
|
||||
#include <mysql/errmsg.h>
|
||||
#else
|
||||
#include <mysql.h>
|
||||
#include <errmsg.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#include "mysql.h"
|
||||
#include "errmsg.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_STRINGS_H
|
||||
|
||||
@@ -44,8 +44,7 @@ AC_ARG_WITH(mysqlclient-lib,
|
||||
mysqlclient_fail=""
|
||||
|
||||
dnl test --with-mysqlclient-prefix
|
||||
for tryprefix in /usr /usr/local /usr/mysql /usr/local/mysql /usr/pkg
|
||||
$msqlclient_prefix; do
|
||||
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
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
|
||||
all: services
|
||||
|
||||
services: $(OBJS)
|
||||
$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(ELIBS)
|
||||
$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
|
||||
|
||||
$(OBJS): Makefile
|
||||
actions.o: actions.c $(INCLUDES)
|
||||
|
||||
+5
-1
@@ -8,10 +8,14 @@
|
||||
VERSION_MAJOR="1"
|
||||
VERSION_MINOR="7"
|
||||
VERSION_PATCH="4"
|
||||
VERSION_BUILD="282"
|
||||
VERSION_BUILD="283"
|
||||
|
||||
# $Log$
|
||||
#
|
||||
# BUILD : 1.7.4 (283)
|
||||
# BUGS : N/A
|
||||
# NOTES : Added better mysql detection to autoconf
|
||||
#
|
||||
# BUILD : 1.7.4 (282)
|
||||
# BUGS : N/A
|
||||
# NOTES : Starting to add better mysql detection / manaul option
|
||||
|
||||
Reference in New Issue
Block a user