diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2013-12-08 12:58:49 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2013-12-08 13:02:36 -0500 |
| commit | c8603e6d3673f06f84dc2b0ff0f96ede4ad881a8 (patch) | |
| tree | bd53b70cedf8c9b7dfc89fcee4b2ee3f4c7290b8 | |
| parent | 99828199bb83938d695385f59dd4b88b4e789420 (diff) | |
| download | dconf-c8603e6d3673f06f84dc2b0ff0f96ede4ad881a8.tar.gz | |
portability: only link to -ldl if needed
We use -ldl in some of our testcases to mock out some system calls via
interposing, using dlsym() to chain up.
Make sure we only use this if we really need to. Many systems have
dlsym() in the C library and no -ldl.
https://bugzilla.gnome.org/show_bug.cgi?id=720072
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 87356b6..f99e903 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,8 @@ fi # Check for programs AC_PROG_CC +AC_CHECK_LIB(c, dlsym, LIBDL="", [AC_CHECK_LIB(dl, dlsym, LIBDL="-ldl")]) +AC_SUBST(LIBDL) AM_PROG_VALAC([0.17.0]) AC_PROG_RANLIB AC_ARG_ENABLE(man, diff --git a/tests/Makefile.am b/tests/Makefile.am index fc77755..adc8519 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,7 +29,7 @@ shm_CFLAGS = $(glib_CFLAGS) shm_LDADD = \ ../shm/libdconf-shm.a \ $(glib_LIBS) \ - -ldl + $(LIBDL) shm_SOURCES = \ shm.c \ tmpdir.h \ @@ -79,7 +79,8 @@ engine_LDADD = \ ../common/libdconf-common.a \ libdconf-mock.a \ $(glib_LIBS) \ - -ldl -lm + $(LIBDL) \ + -lm engine_SOURCES = engine.c EXTRA_DIST += \ profile/broken-profile \ |