[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.7,1.8

[Subhendu Ghosh]

Update of /cvsroot/nagiosplug/nagiosplug
In directory usw-pr-cvs1:/tmp/cvs-serv9130

Modified Files:
	configure.in 
Log Message:
more Mysql patches

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** configure.in	4 Sep 2002 02:11:16 -0000	1.7
--- configure.in	4 Sep 2002 06:00:14 -0000	1.8
***************
*** 156,166 ****
  LIBS="$_SAVEDLIBS"
  
  dnl Check for mysql libraries
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
! CPPFLAGS="-I/usr/include"
! AC_ARG_WITH(mysqllibdir,--with-mysqllibdir=<dir> sets path to mysql libraries,[MYSQLLIBDIR=$withval])
! if test -n "$MYSQLLIBDIR"; then
!   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz)
  elif test -f /usr/lib/libmysqlclient.so; then
    AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
--- 156,171 ----
  LIBS="$_SAVEDLIBS"
  
+ 
  dnl Check for mysql libraries
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
! dnl CPPFLAGS="-I/usr/include"
! 
! AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
! if test -n "$MYSQL"; then
!   MYSQLLIBDIR=$MYSQL/lib/mysql
!   CPPFLAGS="-I$MYSQL/include"
!   AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR ",,-L$MYSQLLIBDIR -lz)
!   AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient")
  elif test -f /usr/lib/libmysqlclient.so; then
    AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
***************
*** 177,183 ****
  fi
  if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
!   AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h)
    if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
      EXTRAS="$EXTRAS check_mysql"
      AC_SUBST(MYSQLLIBS)
      AC_SUBST(check_mysql_LDFLAGS)
--- 182,189 ----
  fi
  if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
!   AC_CHECK_HEADERS(mysql/mysql.h mysql/errmsg.h, MYSQLINCLUDE="-I$MYSQL/include" )
    if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
      EXTRAS="$EXTRAS check_mysql"
+ 	CPPFLAGS="$_SAVEDCPPFLAGS -I$MYSQL/include"
      AC_SUBST(MYSQLLIBS)
      AC_SUBST(check_mysql_LDFLAGS)
***************
*** 185,195 ****
      AC_MSG_WARN([Skipping mysql plugin])
      AC_MSG_WARN([install mysql client headers to compile this plugin (see Requirements).])
    fi
  else
    AC_MSG_WARN([Skipping mysql plugin])
    AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
  fi
  LIBS="$_SAVEDLIBS"
- CPPFLAGS="$_SAVEDCPPFLAGS"
  
  dnl Check for OpenSSL location
--- 191,202 ----
      AC_MSG_WARN([Skipping mysql plugin])
      AC_MSG_WARN([install mysql client headers to compile this plugin (see Requirements).])
+     CPPFLAGS="$_SAVEDCPPFLAGS"
    fi
  else
    AC_MSG_WARN([Skipping mysql plugin])
    AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
+   CPPFLAGS="$_SAVEDCPPFLAGS"
  fi
  LIBS="$_SAVEDLIBS"
  
  dnl Check for OpenSSL location