From: Jaak Ristioja <jaak.ristioja@cyber.ee>
Date: Tue, 29 Jan 2013 08:48:14 +0000 (+0200)
Subject: Prevent libdane pkgconfig stuff from being installed if libdane support is disabled.
X-Git-Tag: gnutls_3_1_8~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=857b78842e7b4d0bc02869e21fa9da967df7bc6c;p=thirdparty%2Fgnutls.git

Prevent libdane pkgconfig stuff from being installed if libdane support is disabled.
---

diff --git a/Makefile.am b/Makefile.am
index c4a4bfada6..a37e7e1c20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,9 +21,13 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
 
-SUBDIRS = gl lib extra libdane po
+SUBDIRS = gl lib extra
 
-SUBDIRS += src doc tests
+if ENABLE_DANE
+SUBDIRS += libdane
+endif
+
+SUBDIRS += po src doc tests
 
 if HAVE_GUILE
 SUBDIRS += guile
diff --git a/libdane/Makefile.am b/libdane/Makefile.am
index d880cc8aaa..debf502def 100644
--- a/libdane/Makefile.am
+++ b/libdane/Makefile.am
@@ -32,13 +32,8 @@ AM_CPPFLAGS = \
 
 SUBDIRS = includes
 
-defexecdir = $(bindir)
-defexec_DATA = 
-
-
 libgnutls_dane_la_LDFLAGS = -no-undefined
 
-if ENABLE_DANE
 lib_LTLIBRARIES = libgnutls-dane.la
 
 libgnutls_dane_la_SOURCES = dane.c dane-params.c errors.c libdane.map
@@ -56,16 +51,16 @@ else
 libgnutls_dane_la_LDFLAGS += -export-symbols-regex '^(dane).*'
 endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnutls-dane.pc
+DISTCLEANFILES = $(pkgconfig_DATA)
+
 if HAVE_LD_OUTPUT_DEF
 libgnutls_dane_la_LDFLAGS += \
 	-Wl,--output-def,libgnutls-dane-$(DLL_VERSION).def
 libgnutls_dane-$(DLL_VERSION).def: libgnutls-dane.la
-defexec_DATA += libgnutls-dane-$(DLL_VERSION).def
-endif
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnutls-dane.pc
-DISTCLEANFILES = $(pkgconfig_DATA)
 
+defexecdir = $(bindir)
+defexec_DATA = libgnutls-dane-$(DLL_VERSION).def
 DISTCLEANFILES += $(defexec_DATA)
+endif
diff --git a/libdane/includes/Makefile.am b/libdane/includes/Makefile.am
index 59fdcbe6ed..e67c5029d8 100644
--- a/libdane/includes/Makefile.am
+++ b/libdane/includes/Makefile.am
@@ -18,8 +18,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-nobase_include_HEADERS = 
-
-if ENABLE_DANE
-nobase_include_HEADERS += gnutls/dane.h
-endif
+nobase_include_HEADERS = gnutls/dane.h