build-sys: export experimental symbols only with --enable-kdbus

diff --git a/Makefile.am b/Makefile.am
index 724e89b626cb0ce0221abde91343594c53a9f38d..d275021a6c59c70865d74b8557f1f326052e20c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1925,7 +1925,6 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
@@ -1991,6 +1990,7 @@ libsystemd_internal_la_SOURCES = \
        src/login/login-shared.h
 
 nodist_libsystemd_internal_la_SOURCES = \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
 libsystemd_internal_la_CFLAGS = \
@@ -2012,14 +2012,19 @@ noinst_LTLIBRARIES += \
        libsystemd-dump.la
 
 EXTRA_DIST += \
+       src/libsystemd/libsystemd.sym.m4 \
+       src/libsystemd/libsystemd.pc.in \
        src/libsystemd/sd-bus/bus-error-mapping.gperf \
        src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
-       src/libsystemd/libsystemd.pc.in
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/bus-error-mapping.c
 
+BUILT_SOURCES += \
+       src/libsystemd/libsystemd.sym
+
 libsystemd_la_SOURCES = \
        $(libsystemd_internal_la_SOURCES) \
        $(libsystemd_journal_internal_la_SOURCES)
@@ -2034,7 +2039,7 @@ libsystemd_la_CFLAGS = \
 libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
        libsystemd-shared.la \
@@ -4879,7 +4884,7 @@ define generate-sym-test
 endef
 
 test-libsystemd-sym.c: \
-               src/libsystemd/libsystemd.sym \
+               $(top_builddir)/src/libsystemd/libsystemd.sym \
                src/systemd/sd-journal.h \
                src/systemd/sd-daemon.h \
                src/systemd/sd-login.h \

diff --git a/src/libsystemd/.gitignore b/src/libsystemd/.gitignore
index 50a169237457e7c08ce1da9907cfb4fe58a704ed..d48e1cdd13623f403556e3939118d25c655d224a 100644 (file)
--- a/src/libsystemd/.gitignore
+++ b/src/libsystemd/.gitignore
@@ -1 +1,2 @@
+/libsystemd.sym
 /libsystemd.pc

diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym.m4
similarity index 99%
rename from src/libsystemd/libsystemd.sym
rename to src/libsystemd/libsystemd.sym.m4
index dda0447cf3057d946d04b0a783497326fe035ace..2ba02073e3c6f06ba9f9b453d0fd934094db6ae4 100644 (file)
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -123,6 +123,7 @@ global:
         sd_session_get_remote_user;
         sd_session_get_remote_host;
 
+m4_ifdef(`HAVE_KDBUS',
         /* sd-bus */
         sd_bus_default;
         sd_bus_default_user;
@@ -376,7 +377,7 @@ global:
         /* sd-utf8 */
         sd_utf8_is_valid;
         sd_ascii_is_valid;
-
+)
 local:
        *;
 };