summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEldad Zack <eldad@gentoo.org>2004-07-04 22:10:38 +0000
committerEldad Zack <eldad@gentoo.org>2004-07-04 22:10:38 +0000
commit70d1567dcd23b6627b965e3ac0bbc242f07c3660 (patch)
tree5803e469923dcad41ef4426183d137be1233f975 /net-analyzer/nagios-core
parentremoved 0.2.3 (Manifest recommit) (diff)
downloadgentoo-2-70d1567dcd23b6627b965e3ac0bbc242f07c3660.tar.gz
gentoo-2-70d1567dcd23b6627b965e3ac0bbc242f07c3660.tar.bz2
gentoo-2-70d1567dcd23b6627b965e3ac0bbc242f07c3660.zip
added missing die ; added pgsql include path, closes #45614
Diffstat (limited to 'net-analyzer/nagios-core')
-rw-r--r--net-analyzer/nagios-core/ChangeLog6
-rw-r--r--net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild4
-rw-r--r--net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild8
3 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 21ebc3347f3c..8c43e34330b9 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-core
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.30 2004/07/04 19:55:26 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.31 2004/07/04 22:10:38 eldad Exp $
+
+ 05 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r6.ebuild,
+ nagios-core-1.2-r1.ebuild:
+ Added missing make || die. Added include path for postgresql, closes #45614.
04 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
index 8d6105da176a..4358c8120095 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild,v 1.11 2004/07/04 19:55:26 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild,v 1.12 2004/07/04 22:10:38 eldad Exp $
inherit eutils
@@ -109,7 +109,7 @@ src_compile() {
--mandir=/usr/share/man \
${myconf} || die "./configure failed"
- make DESTDIR=${D} nagios contrib
+ make DESTDIR=${D} nagios contrib || die "make failed"
use noweb || make DESTDIR=${D} cgis # Only compile the CGI's if "noweb" useflag is not set.
}
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
index 2e5a5badfded..be26baa27e6d 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild,v 1.8 2004/07/04 19:55:26 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild,v 1.9 2004/07/04 22:10:38 eldad Exp $
inherit eutils
@@ -77,6 +77,10 @@ src_compile() {
--with-pgsql-extinfo \
--with-pgsql-retention \
--with-pgsql-downtime"
+
+ if [ -r /usr/include/postgresql/pgsql/libpq-fe.h ] ; then
+ myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql"
+ fi
fi
use mysql && myconf="${myconf} \
@@ -109,7 +113,7 @@ src_compile() {
--mandir=/usr/share/man \
${myconf} || die "./configure failed"
- make DESTDIR=${D} nagios contrib
+ make DESTDIR=${D} nagios contrib || die "make failed"
use noweb || make DESTDIR=${D} cgis # Only compile the CGI's if "noweb" useflag is not set.
}