diff options
Diffstat (limited to 'web/attachments/156702-nagios.configure.patch')
-rw-r--r-- | web/attachments/156702-nagios.configure.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/web/attachments/156702-nagios.configure.patch b/web/attachments/156702-nagios.configure.patch new file mode 100644 index 0000000..554cd7a --- /dev/null +++ b/web/attachments/156702-nagios.configure.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | --- nagios-plugins-1.4.2/configure.in 2005-09-19 23:51:19.000000000 +1000 | ||
2 | +++ nagios-plugins-1.4.2.new/configure.in 2005-11-17 15:36:08.000000000 +1100 | ||
3 | @@ -227,45 +227,27 @@ | ||
4 | dnl Check for mysql libraries | ||
5 | _SAVEDLIBS="$LIBS" | ||
6 | _SAVEDCPPFLAGS="$CPPFLAGS" | ||
7 | -AC_ARG_WITH(mysql, | ||
8 | - ACX_HELP_STRING([--with-mysql=DIR], | ||
9 | - [sets path to mysql installation (assumes lib/mysql and include subdirs]), | ||
10 | - MYSQL=$withval,) | ||
11 | -if test -n "$MYSQL"; then | ||
12 | - MYSQLLIBDIR=$MYSQL/lib/mysql | ||
13 | - CPPFLAGS="-I$MYSQL/include" | ||
14 | - AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz) | ||
15 | - AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") | ||
16 | -elif test -f /usr/lib/libmysqlclient.so; then | ||
17 | - AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) | ||
18 | - AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") | ||
19 | -elif test -f /usr/lib/libmysqlclient.a; then | ||
20 | - AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) | ||
21 | - AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient") | ||
22 | -elif test -f /usr/lib/mysql/libmysqlclient.so; then | ||
23 | - AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz) | ||
24 | - AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) | ||
25 | -elif test -f /usr/lib/mysql/libmysqlclient.a; then | ||
26 | - AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql -lz) | ||
27 | - AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) | ||
28 | -fi | ||
29 | -if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then | ||
30 | - AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" ) | ||
31 | - if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then | ||
32 | - EXTRAS="$EXTRAS check_mysql" | ||
33 | - AC_SUBST(MYSQLINCLUDE) | ||
34 | - AC_SUBST(MYSQLLIBS) | ||
35 | - AC_SUBST(check_mysql_LDFLAGS) | ||
36 | - else | ||
37 | + | ||
38 | +AC_PATH_PROG(MYSQLCONFIG,mysql_config) | ||
39 | + | ||
40 | +if test -z "$MYSQLCONFIG"; then | ||
41 | AC_MSG_WARN([Skipping mysql plugin]) | ||
42 | AC_MSG_WARN([install mysql client headers to compile this plugin (see REQUIREMENTS).]) | ||
43 | - fi | ||
44 | -else | ||
45 | - AC_MSG_WARN([Skipping mysql plugin]) | ||
46 | - AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).]) | ||
47 | +else | ||
48 | + MYSQLINCLUDE=`$MYSQLCONFIG --include` | ||
49 | + MYSQLCFLAGS=`$MYSQLCONFIG --cflags` | ||
50 | + MYSQLLIBS=`$MYSQLCONFIG --libs` | ||
51 | + check_mysql_LDFLAGS="$MYSQLLIBS" | ||
52 | + EXTRAS="$EXTRAS check_mysql" | ||
53 | + | ||
54 | + AC_SUBST(MYSQLINCLUDE) | ||
55 | + AC_SUBST(MYSQLLIBS) | ||
56 | + AC_SUBST(MYSQLCFLAGS) | ||
57 | + AC_SUBST(check_mysql_LDFLAGS) | ||
58 | fi | ||
59 | -CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE" | ||
60 | -LIBS="$_SAVEDLIBS" | ||
61 | + | ||
62 | +CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLCFLAGS" | ||
63 | +LIBS="$_SAVEDLIBS" | ||
64 | |||
65 | AC_CHECK_HEADERS(unistd.h) | ||
66 | |||