Link libraries directly to compile on some systems (debian).

If program (A) is linked to library (B) which is linked to library (C),
then A must also link C directly in order to use things from it directly.
This commit is contained in:
Mikael Magnusson 2011-05-22 17:42:34 +02:00 committed by Dana Jansens
parent 65315ca437
commit cc4e44e837
3 changed files with 58 additions and 0 deletions

View file

@ -170,6 +170,8 @@ openbox_openbox_CPPFLAGS = \
-DCONFIGDIR=\"$(configdir)\" \
-DG_LOG_DOMAIN=\"Openbox\"
openbox_openbox_LDADD = \
$(XINERAMA_LIBS) \
$(XRANDR_LIBS) \
$(SM_LIBS) \
$(GLIB_LIBS) \
$(X_LIBS) \
@ -321,9 +323,11 @@ tools_obxprop_obxprop_SOURCES = \
## gdm-control ##
tools_gdm_control_gdm_control_CPPFLAGS = \
$(XAUTH_CFLAGS) \
$(X_CFLAGS) \
$(GLIB_CFLAGS)
tools_gdm_control_gdm_control_LDADD = \
$(XAUTH_LIBS) \
$(X_LIBS) \
$(GLIB_LIBS)
tools_gdm_control_gdm_control_SOURCES = \

View file

@ -208,6 +208,7 @@ X11_EXT_XRANDR
X11_EXT_SHAPE
X11_EXT_XINERAMA
X11_EXT_SYNC
X11_EXT_AUTH
AC_CONFIG_FILES([
Makefile

View file

@ -302,6 +302,59 @@ AC_DEFUN([X11_EXT_SYNC],
fi
])
# X11_EXT_AUTH()
#
# Check for the presence of the "Xau" X Window System extension.
# Defines "AUTH, sets the $(AUTH) variable to "yes", and sets the $(LIBS)
# appropriately if the extension is present.
AC_DEFUN([X11_EXT_AUTH],
[
AC_REQUIRE([X11_DEVEL])
# Store these
OLDLIBS=$LIBS
OLDCPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS"
AC_CHECK_LIB([Xau], [XauReadAuth],
AC_MSG_CHECKING([for X11/Xauth.h])
AC_TRY_LINK(
[
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xauth.h>
],
[
],
[
AC_MSG_RESULT([yes])
AUTH="yes"
AC_DEFINE([AUTH], [1], [Found the Xauth extension])
XAUTH_CFLAGS=""
XAUTH_LIBS="-lXau"
AC_SUBST(XAUTH_CFLAGS)
AC_SUBST(XAUTH_LIBS)
],
[
AC_MSG_RESULT([no])
AUTH="no"
])
)
LIBS=$OLDLIBS
CPPFLAGS=$OLDCPPFLAGS
AC_MSG_CHECKING([for the Xauth extension])
if test "$AUTH" = "yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
])
# X11_SM()
#
# Check for the presence of SMlib for session management.