diff options
| author | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-07-25 18:31:30 +0000 |
|---|---|---|
| committer | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-07-25 18:31:30 +0000 |
| commit | e5e4057f22edb81b3783f7fd092d2addbfdf1d0a (patch) | |
| tree | 536e5b39d91fe18b7249076d54e0411c466c24d7 /configure.in | |
| parent | c6fe2b8f4df3b49aa3d0149302e8c95024dc96e6 (diff) | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/configure.in b/configure.in index cee3dadd0..8dd8d631e 100644 --- a/configure.in +++ b/configure.in @@ -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") - ]) -]) - -AC_CHECK_HEADER(sys/types.h,AC_DEFINE(HAS_SYS_TYPES_H,1,"Has sys/types.h")) +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) +],) + +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, |