← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nagios3/saucy-proposed

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt
  • Date: 2009-08-16 14:14:23 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090816141423-efjzq1r3jekwd7l7
Tags: 3.2.0-1
http://bugs.debian.org/542957
http://bugs.debian.org/539882
http://bugs.debian.org/543657
http://bugs.debian.org/540554
http://bugs.debian.org/479338
http://bugs.debian.org/485466
* New upstream release (Closes: #542957)
  - Timeperiods should work as expected now (Closes: #539882)
  - Recovery notifications fixed (Closes: #543657)
* Update standards version 
  - Add README.source
* Manpage errors fixed (Closes: #540554)
* Split up the webfrontend into its own package (Closes: #479338, #485466)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
9
9
AC_PREFIX_DEFAULT(/usr/local/nagios)
10
10
 
11
11
PKG_NAME=nagios
12
 
PKG_VERSION="3.0.6"
 
12
PKG_VERSION="3.2.0"
13
13
PKG_HOME_URL="http://www.nagios.org/"
14
 
PKG_REL_DATE="12-01-2008"
 
14
PKG_REL_DATE="08-12-2009"
15
15
 
16
16
dnl Figure out how to invoke "install" and what install options to use.
17
17
AC_PROG_INSTALL
507
507
                if test x$TRYSTATUSMAP = xyep; then
508
508
                        AC_DEFINE_UNQUOTED(USE_STATUSMAP)
509
509
                        CGIEXTRAS="$CGIEXTRAS statusmap.cgi"
 
510
                        AC_CHECK_LIB(gd,gdImageCreateTrueColor,
 
511
                                AC_DEFINE(HAVE_GDIMAGECREATETRUECOLOR,1,
 
512
                                        [Define if your gd library has gdImageCreateTrueColor])) 
510
513
                fi
511
514
 
512
515
                dnl compile trends CGI
519
522
        fi
520
523
fi
521
524
 
522
 
dnl Try and locate glib
523
 
GLIB_INCLUDE=`pkg-config --cflags glib-2.0`
524
 
AC_SUBST(GLIB_INCLUDE)
525
 
GLIB_LIBS=`pkg-config --libs glib-2.0`
526
 
AC_SUBST(GLIB_LIBS)
527
 
if test "x$GLIB_LIBS" != x; then
528
 
        AC_DEFINE_UNQUOTED(HAVE_GLIB)
529
 
        AC_DEFINE_UNQUOTED(HAVE_GLIB_H)
530
 
fi
531
 
 
532
 
 
533
525
AC_ARG_WITH(cgiurl,--with-cgiurl=<local-url> sets URL for cgi programs (do not use a trailing slash),cgiurl=$withval,cgiurl=/nagios/cgi-bin)
534
526
AC_ARG_WITH(htmurl,--with-htmurl=<local-url> sets URL for public html,htmurl=$withval,htmurl=/nagios)
535
527
AC_SUBST(htmurl)
752
744
[AC_MSG_RESULT(yes)],
753
745
[AC_DEFINE(NEED_VA_LIST) AC_MSG_RESULT(no)])
754
746
 
 
747
dnl Check if we should build local libtap
 
748
dnl From Nagios Plugins
 
749
dnl Have disabled autodetection of system library until later
 
750
AC_ARG_ENABLE(libtap,
 
751
  AC_HELP_STRING([--enable-libtap],
 
752
                [Enable built-in libtap for unit-testing (default: no).]),
 
753
        [enable_libtap=$enableval],
 
754
        [enable_libtap=no])
 
755
#Disabled for moment
 
756
#AM_CONDITIONAL([USE_LIBTAP_LOCAL],[test "$enable_libtap" = "yes"])
 
757
 
 
758
# Disabled for moment
 
759
# If not local, check if we can use the system one
 
760
#if test "$enable_libtap" != "yes" ; then
 
761
#        dnl Check for libtap, to run perl-like tests
 
762
#        AC_CHECK_LIB(tap, plan_tests,
 
763
#                enable_libtap="yes"
 
764
#                )
 
765
#fi
 
766
 
 
767
# Finally, define tests if we use libtap
 
768
if test "$enable_libtap" = "yes" ; then
 
769
        AC_CONFIG_SUBDIRS([tap])
 
770
        USE_LIBTAP=yes
 
771
else
 
772
        USE_LIBTAP=no
 
773
fi
 
774
 
 
775
 
 
776
AC_SUBST(USE_LIBTAP)
755
777
AC_SUBST(CGIEXTRAS)
756
778
AC_SUBST(GDLIBS)
757
779
AC_SUBST(PERLLIBS)
763
785
AC_SUBST(USE_EVENTBROKER)
764
786
 
765
787
AC_PATH_PROG(PERL,perl)
766
 
AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init html/index.html html/side.html)
 
788
 
 
789
AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile)
767
790
 
768
791
 
769
792
perl subst include/locations.h
 
793
perl subst html/config.inc.php
 
794
 
770
795
 
771
796
echo ""
772
797
echo "Creating sample config files in sample-config/ ..."