More linking fixes for --no-add-needed.
SVN revision: 46173
This commit is contained in:
parent
c692f63aae
commit
b3494caba9
|
@ -95,7 +95,6 @@ if test "x$enable_sound_pulse" = "xyes"; then
|
||||||
PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
|
PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
|
||||||
enable_sound=pulseaudio
|
enable_sound=pulseaudio
|
||||||
enable_sound_esound=no
|
enable_sound_esound=no
|
||||||
PA_LIBS="$PA_LIBS $AUDIOFILE_LIBS"
|
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(USE_LIBPA, test "x$enable_sound_pulse" = "xyes")
|
AM_CONDITIONAL(USE_LIBPA, test "x$enable_sound_pulse" = "xyes")
|
||||||
|
|
||||||
|
@ -190,7 +189,8 @@ if test "x$enable_glx" = "xyes"; then
|
||||||
AC_MSG_ERROR([Cannot find GLX libraries])
|
AC_MSG_ERROR([Cannot find GLX libraries])
|
||||||
])
|
])
|
||||||
AC_CHECK_LIB(GL, glXBindTexImageEXT,
|
AC_CHECK_LIB(GL, glXBindTexImageEXT,
|
||||||
AC_DEFINE(HAVE_GLX_glXBindTexImageEXT, 1, [glXBindTexImageEXT is available]))
|
AC_DEFINE(HAVE_GLX_glXBindTexImageEXT, 1, [glXBindTexImageEXT is available]),
|
||||||
|
GLX_LIBS="$GLX_LIBS -ldl")
|
||||||
AC_SUBST(GLX_LIBS)
|
AC_SUBST(GLX_LIBS)
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(ENABLE_GLX, test "x$enable_glx" = "xyes")
|
AM_CONDITIONAL(ENABLE_GLX, test "x$enable_glx" = "xyes")
|
||||||
|
|
|
@ -148,6 +148,7 @@ LDADD = \
|
||||||
if BUILD_MODULES
|
if BUILD_MODULES
|
||||||
|
|
||||||
e16_LDFLAGS = -export-dynamic
|
e16_LDFLAGS = -export-dynamic
|
||||||
|
MODULE_LIBS = $(DLOPEN_LIBS)
|
||||||
|
|
||||||
libe16dir = $(pkglibdir)
|
libe16dir = $(pkglibdir)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue