[tracker/wip/carlosg/domain-ontologies: 6/124] autotools: Don't set -Wl, --enable-new-dtags globally

[Carlos Garnacho <carlosg src gnome org>]

commit 0b57d30acd04100d7d0bee7674685d2b70327306
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jun 28 18:50:31 2017 +0200

    autotools: Don't set -Wl,--enable-new-dtags globally
    
    Just set it in library LDFLAGS, otherwise introspection may
    find the installed libraries before the ones being built, which
    is not the right thing if there are new symbols/types to be looked
    up.

 configure.ac                              |    4 +++-
 src/libtracker-control/Makefile.am        |    1 +
 src/libtracker-miner/Makefile.am          |    1 +
 src/libtracker-sparql-backend/Makefile.am |    1 +
 src/tracker-extract/Makefile.am           |    2 +-
 5 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3b6024a..f482c2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -600,9 +600,11 @@ LDFLAGS="-Wl,--enable-new-dtags $LDFLAGS"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
              [enable_new_dtags=yes; AC_MSG_RESULT(yes)], [enable_new_dtags=no; AC_MSG_RESULT(no)])
 LDFLAGS=$save_LDFLAGS
+DTAGS_LDFLAGS=
 if test "x$enable_new_dtags" = "xyes"; then
-    LDFLAGS="-Wl,--enable-new-dtags $LDFLAGS"
+    DTAGS_LDFLAGS="-Wl,--enable-new-dtags"
 fi
+AC_SUBST(DTAGS_LDFLAGS)
 
 ####################################################################
 # Check for minimal
diff --git a/src/libtracker-control/Makefile.am b/src/libtracker-control/Makefile.am
index 7a3b404..8e7eaf2 100644
--- a/src/libtracker-control/Makefile.am
+++ b/src/libtracker-control/Makefile.am
@@ -20,6 +20,7 @@ libtracker_controlinclude_HEADERS =                      \
        tracker-miner-manager.h
 
 libtracker_control_@TRACKER_API_VERSION@_la_LDFLAGS =    \
+       $(DTAGS_LDFLAGS)                                 \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 if !ENABLE_GCOV 
 # Using enable_gcov instead of have_unit_test because when doing a release
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 8063888..58ec600 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -101,6 +101,7 @@ libtracker_minerinclude_HEADERS =                      \
        tracker-miner-fs.h
 
 libtracker_miner_@TRACKER_API_VERSION@_la_LDFLAGS =    \
+       $(DTAGS_LDFLAGS)                               \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 if !ENABLE_GCOV 
 # Using enable_gcov instead of have_unit_test because when doing a release
diff --git a/src/libtracker-sparql-backend/Makefile.am b/src/libtracker-sparql-backend/Makefile.am
index 733776e..4d6f5d6 100644
--- a/src/libtracker-sparql-backend/Makefile.am
+++ b/src/libtracker-sparql-backend/Makefile.am
@@ -29,6 +29,7 @@ libtracker_sparql_@TRACKER_API_VERSION@_la_LIBADD =    \
        $(LIBTRACKER_SPARQL_LIBS)
 
 libtracker_sparql_@TRACKER_API_VERSION@_la_LDFLAGS =   \
+       $(DTAGS_LDFLAGS)                               \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-symbols-regex 
'^(tracker_sparql_(connection|cursor|builder|escape|error|value|get)_.*|tracker_namespace_manager_.*|tracker_resource_.*|tracker_notifier_.*)'
 
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 6e5ba83..9fd5856 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -3,7 +3,7 @@
 #
 rulesdir = $(TRACKER_EXTRACT_RULES_DIR)
 
-module_flags = -module -avoid-version -no-undefined
+module_flags = $(DTAGS_LDFLAGS) -module -avoid-version -no-undefined
 
 AM_CPPFLAGS = \
        $(BUILD_CFLAGS) \