brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[build] Put the X11 pc dependencies in another variable

Browse Source 
If X11 comes with pkg-config files (like it should) we should not add
those dependencies to the generic BACKEND_PC_FILES variable: that
variable is meant only for backend-specific dependencies handled by
pkg-config -- and Clutter supports non-X11 backends as well.

The X11_PC_FILES variable will only contain X11-related dependencies,
and will be set as part of BACKEND_PC_FILES only inside the GLX and
EGLX backends sections.
This commit is contained in:
Emmanuele Bassi 2009-02-26 11:55:53 +00:00
parent 402e2e0d82
commit 259443b145
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -153,6 +153,7 @@ then
fi fi
BACKEND_PC_FILES="" BACKEND_PC_FILES=""
X11_PC_FILES=""
# Check for X though could be redundant if backend does not need it. # Check for X though could be redundant if backend does not need it.
AC_MSG_CHECKING([for X11]) AC_MSG_CHECKING([for X11])
@ -179,7 +180,7 @@ if test "x$have_x11" = "xno"; then
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
fi fi
else else
BACKEND_PC_FILES="$BACKEND_PC_FILES x11" X11_PC_FILES="x11"
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
fi fi
@ -188,7 +189,7 @@ PKG_CHECK_EXISTS([xfixes >= 3], [have_xfixes=yes], [have_xfixes=no])
if test "x$have_xfixes" = "xyes"; then if test "x$have_xfixes" = "xyes"; then
AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if we have the XFIXES X extension]) AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if we have the XFIXES X extension])
X11_LIBS="$X11_LIBS -lXfixes" X11_LIBS="$X11_LIBS -lXfixes"
BACKEND_PC_FILES="$BACKEND_PC_FILES xfixes" X11_PC_FILES="$X11_PC_FILES xfixes"
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
else else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
@ -199,7 +200,7 @@ PKG_CHECK_EXISTS([xdamage], [have_xdamage=yes], [have_xdamage=no])
if test "x$have_xdamage" = "xyes"; then if test "x$have_xdamage" = "xyes"; then
AC_DEFINE(HAVE_XDAMAGE, 1, [Define to 1 if we have the XDAMAGE X extension]) AC_DEFINE(HAVE_XDAMAGE, 1, [Define to 1 if we have the XDAMAGE X extension])
X11_LIBS="$X11_LIBS -lXdamage" X11_LIBS="$X11_LIBS -lXdamage"
BACKEND_PC_FILES="$BACKEND_PC_FILES xdamage" X11_PC_FILES="$X11_PC_FILES xdamage"
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
else else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
@ -210,7 +211,7 @@ PKG_CHECK_EXISTS([xcomposite >= 0.4], [have_xcomposite=yes], [have_xcomposite=no
if test "x$have_xcomposite" = "xyes"; then if test "x$have_xcomposite" = "xyes"; then
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Define to 1 if we have the XCOMPOSITE X extension]) AC_DEFINE(HAVE_XCOMPOSITE, 1, [Define to 1 if we have the XCOMPOSITE X extension])
X11_LIBS="$X11_LIBS -lXcomposite" X11_LIBS="$X11_LIBS -lXcomposite"
BACKEND_PC_FILES="$BACKEND_PC_FILES xcomposite" X11_PC_FILES="$X11_PC_FILES xcomposite"
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
else else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
@ -246,7 +247,7 @@ AC_ARG_ENABLE(xinput,
if test "x$xinput" = "xyes"; then if test "x$xinput" = "xyes"; then
AC_DEFINE(USE_XINPUT, 1, Use the XINPUT X extension) AC_DEFINE(USE_XINPUT, 1, Use the XINPUT X extension)
X11_LIBS="$X11_LIBS -lXi" X11_LIBS="$X11_LIBS -lXi"
BACKEND_PC_FILES="$BACKEND_PC_FILES xi" BACKEND_PC_FILES="$X11_PC_FILES xi"
fi fi
dnl This is only used to decide whether to build dnl This is only used to decide whether to build
@ -402,6 +403,8 @@ case $clutterbackend in
if test "x$have_gl_pc" = "xyes"; then if test "x$have_gl_pc" = "xyes"; then
BACKEND_PC_FILES="$BACKEND_PC_FILES gl" BACKEND_PC_FILES="$BACKEND_PC_FILES gl"
fi fi
BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES"
;; ;;
eglx) eglx)
@ -429,6 +432,8 @@ case $clutterbackend in
EGL_LIBS="$GLES_LIBS $TSLIB_LIBS" EGL_LIBS="$GLES_LIBS $TSLIB_LIBS"
EGL_CFLAGS="$TSLIB_CFLAGS" EGL_CFLAGS="$TSLIB_CFLAGS"
BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES"
;; ;;
fruity) fruity)