[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.48,1.49

[Jeremy T. Bouse]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv11153

Modified Files:
	configure.in 
Log Message:
Added getaddrinfo.[ch] & gethostbyname.[ch] to provide RFC2553 functions
	if missing in system libs and lwres not present
Moved all references to netdb.h and sys/socket.h into common.h.in
Modified automake call in tools/setup to include adding missing files
	so config.sub and config.guess will be available


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** configure.in	6 Mar 2003 06:40:46 -0000	1.48
--- configure.in	7 Mar 2003 22:11:23 -0000	1.49
***************
*** 12,15 ****
--- 12,16 ----
  AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
  AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
+ AC_CANONICAL_HOST
  
  AC_PREFIX_DEFAULT(/usr/local/nagios)
***************
*** 53,62 ****
  
  dnl CGIURL has changed for Nagios with 1.0 beta
! AC_ARG_WITH(cgiurl,--with-cgiurl=<dir> sets URL for cgi programs,cgiurl=$withval,cgiurl=/nagios/cgi-bin)
  CGIURL="$cgiurl"
  AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
  
! AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name to run nagios,nagios_usr=$withval,nagios_usr=nagios)
! AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
  AC_SUBST(nagios_usr)
  AC_SUBST(nagios_grp)
--- 54,78 ----
  
  dnl CGIURL has changed for Nagios with 1.0 beta
! dnl AC_ARG_WITH(cgiurl,--with-cgiurl=<dir> sets URL for cgi programs,cgiurl=$withval,cgiurl=/nagios/cgi-bin)
! AC_ARG_WITH(cgiurl,
! 	ACX_HELP_STRING([--with-cgiurl=DIR],
! 		[sets URL for cgi programs]),
! 	cgiurl=$withval,
! 	cgiurl=/nagios/cgi-bin)
  CGIURL="$cgiurl"
  AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
  
! dnl AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name to run nagios,nagios_usr=$withval,nagios_usr=nagios)
! AC_ARG_WITH(nagios_user,
! 	ACX_HELP_STRING([--with-nagios-user=USER],
! 		[set user name to run nagios]),
! 	nagios_usr=$withval,
! 	nagios_usr=nagios)
! dnl AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)
! AC_ARG_WITH(nagios_group,
! 	ACX_HELP_STRING([--with-nagios-group=GROUP],
! 		[set group name to run nagios]),
! 	nagios_grp=$withval,
! 	nagios_grp=nagios)
  AC_SUBST(nagios_usr)
  AC_SUBST(nagios_grp)
***************
*** 64,68 ****
  AC_SUBST(INSTALL_OPTS)
  
! AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
  AC_SUBST(trusted_path)
  
--- 80,89 ----
  AC_SUBST(INSTALL_OPTS)
  
! dnl AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
! AC_ARG_WITH(trusted_path,
! 	ACX_HELP_STRING([--with-trusted-path=PATH],
! 		[sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]),
! 	trusted_path=$withval,
! 	trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)
  AC_SUBST(trusted_path)
  
***************
*** 85,88 ****
--- 106,121 ----
  AC_PATH_PROG(BASENAME,basename)
  
+ dnl
+ dnl Check for miscellaneous stuff
+ dnl 
+ 
+ case $host_vender-$host_os in
+ sun*)
+ 	AC_DEFINE(__EXTENSIONS__,1,[Sun's netdb.h needs this for getaddrinfo])
+ 	;;
+ osf*)
+ 	AC_DEFINE(_OSF_SOURCE,1,[OSF needs this for getaddrinfo])
+ 	;;
+ esac
  
  dnl
***************
*** 99,103 ****
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
! AC_ARG_WITH(pgsql,--with-pgsql=<dir> sets path to pgsql installation,[PGSQL=$withval])
  AC_CHECK_LIB(crypt,main)
  if test "$ac_cv_lib_crypt_main" = "yes"; then
--- 132,140 ----
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
! dnl AC_ARG_WITH(pgsql,--with-pgsql=<dir> sets path to pgsql installation,[PGSQL=$withval])
! AC_ARG_WITH(pgsql,
! 	ACX_HELP_STRING([--with-pgsql=DIR],
! 		[sets path to pgsql installation]),
! 	PGSQL=$withval,)
  AC_CHECK_LIB(crypt,main)
  if test "$ac_cv_lib_crypt_main" = "yes"; then
***************
*** 176,180 ****
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
! 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
--- 213,221 ----
  _SAVEDLIBS="$LIBS"
  _SAVEDCPPFLAGS="$CPPFLAGS"
! dnl AC_ARG_WITH(mysql,--with-mysql=<dir> sets path to mysql installation (assumes lib/mysql and include subdirs),[MYSQL=$withval])
! AC_ARG_WITH(mysql,
! 	ACX_HELP_STRING([--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
***************
*** 230,234 ****
    OPENSSL=/usr/local/ssl
  fi
! AC_ARG_WITH(openssl,--with-openssl=<dir> sets path to openssl installation,[OPENSSL=$withval])
  
  dnl #########################################################################
--- 271,279 ----
    OPENSSL=/usr/local/ssl
  fi
! dnl AC_ARG_WITH(openssl,--with-openssl=<dir> sets path to openssl installation,[OPENSSL=$withval])
! AC_ARG_WITH(openssl,
! 	ACX_HELP_STRING([--with-openssl=DIR],
! 		[sets path to openssl installation]),
! 	OPENSSL=$withval,)
  
  dnl #########################################################################
***************
*** 786,790 ****
  fi
  
! AC_ARG_WITH(df_command,--with-df-command=<syntax> sets syntax for df,DF_COMMAND=$withval)
  if test -n "$DF_COMMAND"
  then
--- 831,839 ----
  fi
  
! dnl AC_ARG_WITH(df_command,--with-df-command=<syntax>,sets syntax for df,DF_COMMAND=$withval)
! AC_ARG_WITH(df_command,
! 	ACX_HELP_STRING([--with-df-command=SYNTAX],
! 		[sets syntax for df]),
! 	DF_COMMAND=$withval,)
  if test -n "$DF_COMMAND"
  then
***************
*** 816,820 ****
  AC_PATH_PROG(PATH_TO_PING,ping)
  
! AC_ARG_WITH(ping_command,--with-ping-command=<syntax> sets syntax for ping,PING_COMMAND=$withval)
  if test -n "$PING_COMMAND"
  then
--- 865,873 ----
  AC_PATH_PROG(PATH_TO_PING,ping)
  
! dnl AC_ARG_WITH(ping_command,--with-ping-command=<syntax> sets syntax for ping,PING_COMMAND=$withval)
! AC_ARG_WITH(ping_command,
! 	ACX_HELP_STRING([--with-ping-command=SYNTAX],
! 		[sets syntax for ping]),
! 	PING_COMMAND=$withval,)
  if test -n "$PING_COMMAND"
  then