From 728f69af6b90830b8690a547ec0e77e39cc32c2c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 29 Mar 2012 16:34:43 +0000 Subject: [PATCH] If gtk-doc is installed at configure stage but get removed after, the build will fail because gtkdoc-rebase will fail to run. --disable-gtk-doc has no effect on this behaviour so force setting ac_cv_path_* in CONFIGURE_ENV. --- x11/gnome/gnome.port.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/x11/gnome/gnome.port.mk b/x11/gnome/gnome.port.mk index c51749e1f15..27b6acd6293 100644 --- a/x11/gnome/gnome.port.mk +++ b/x11/gnome/gnome.port.mk @@ -1,7 +1,6 @@ -# $OpenBSD: gnome.port.mk,v 1.59 2012/03/29 07:45:55 ajacoutot Exp $ +# $OpenBSD: gnome.port.mk,v 1.60 2012/03/29 16:34:43 ajacoutot Exp $ # # Module for GNOME related ports -# .if (defined(GNOME_PROJECT) && defined(GNOME_VERSION)) DISTNAME= ${GNOME_PROJECT}-${GNOME_VERSION} @@ -26,6 +25,13 @@ MODULES+= textproc/intltool # "lib" which resulted in locale files being installed under the # wrong directory. CONFIGURE_ENV += DATADIRNAME=share + # If one of these tools is found at configure stage, it might be used, no + # matter whether we use --disable-gtk-doc or not. +. if !defined(MODGNOME_TOOLS) || defined(MODGNOME_TOOLS) && ! ${MODGNOME_TOOLS:Mgtk-doc} + CONFIGURE_ENV += ac_cv_path_GTKDOC_CHECK="" \ + ac_cv_path_GTKDOC_REBASE="" \ + ac_cv_path_GTKDOC_MKPDF="" +. endif . endif .endif