diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2009-10-29 11:46:22 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-10-29 14:15:02 -0700 |
| commit | d30637339963950910e5f5fb755b8465ac7dddb4 (patch) | |
| tree | 09319e9020459762f92ddfb6ae574f4c5c861c13 | |
| parent | ec98d7fc78efefcf9fc61492529157c0d289c3f2 (diff) | |
Supply all code using dl*() with DLOPEN_LIBS
Previously DLOPEN_LIBS was managed in top-level configure.ac.
Instead bundle it with the code using dl*() functions to
avoid breakages in uncommon configurations.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | glx/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xfree86/loader/Makefile.am | 1 | ||||
| -rw-r--r-- | os/Makefile.am | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 02e9146bb..bdbbc7a1b 100644 --- a/configure.ac +++ b/configure.ac @@ -195,6 +195,7 @@ dnl Check to see if dlopen is in default libraries (like Solaris, which dnl has it in libc), or if libdl is needed to get it. AC_CHECK_FUNC([dlopen], [], AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) +AC_SUBST(DLOPEN_LIBS) dnl Checks for library functions. AC_FUNC_VPRINTF @@ -922,7 +923,7 @@ if test "x$GLX" = xyes; then AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) GLX_LIBS='$(top_builddir)/glx/libglx.la' - GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" + GLX_SYS_LIBS="$GLX_SYS_LIBS" else GLX=no fi @@ -1513,7 +1514,7 @@ if test "x$XORG" = xyes; then AC_CHECK_FUNCS([pci_device_vgaarb_init]) LIBS=$SAVE_LIBS CFLAGS=$SAVE_CFLAGS - XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" + XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIB" XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" case $host_os in diff --git a/glx/Makefile.am b/glx/Makefile.am index a23ae0a47..9d9fa3c31 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -58,6 +58,8 @@ if DRI2_AIGLX libglxdri_la_SOURCES += glxdri2.c endif +libglxdri_la_LIBADD = $(DLOPEN_LIBS) + libglx_la_SOURCES = \ $(indirect_sources) \ $(glapi_sources) \ @@ -95,3 +97,5 @@ libglx_la_SOURCES = \ swap_interval.c \ unpack.h \ xfont.c + +libglx_la_LIBADD = $(DLOPEN_LIBS) diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 0bfa7a283..d3c17d173 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -21,6 +21,7 @@ libloader_la_SOURCES = \ dlloader.c \ os.c \ sdksyms.c +libloader_la_LIBADD = $(DLOPEN_LIBS) CLEANFILES = sdksyms.c sdksyms.dep diff --git a/os/Makefile.am b/os/Makefile.am index 9902f045c..66a4a0f75 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -26,7 +26,7 @@ libos_la_SOURCES = \ xstrans.c \ xprintf.c \ $(XORG_SRCS) -libos_la_LIBADD = @SHA1_LIBS@ +libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) if SECURE_RPC libos_la_SOURCES += $(SECURERPC_SRCS) |