isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix x11 header checks when x11 is not in the default include path

Browse Source 
2002-07-24  jacob berkman  <jacob@ximian.com>

	* configure.in: fix x11 header checks when x11 is not in the
	default include path
This commit is contained in:
jacob berkman 2002-07-24 14:47:52 +00:00 committed by Jacob Berkman
parent f7b55bfdcc
commit 6f6e533380
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-07-24 jacob berkman <jacob@ximian.com>
* configure.in: fix x11 header checks when x11 is not in the
default include path
2002-07-23 Ross Burton <ross@burtonini.com> 2002-07-23 Ross Burton <ross@burtonini.com>
* src/menu.c (meta_window_menu_new): Use the real workspace names * src/menu.c (meta_window_menu_new): Use the real workspace names

6
configure.in
View File

@ -102,10 +102,10 @@ fi
AC_PATH_XTRA AC_PATH_XTRA
CFLAGS="$METACITY_CFLAGS $CFLAGS $X_CFLAGS"
XINERAMA_LIBS= XINERAMA_LIBS=
found_xinerama=false found_xinerama=false
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_LIB(Xext, XineramaQueryExtension, AC_CHECK_LIB(Xext, XineramaQueryExtension,
[AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [AC_CHECK_HEADERS(X11/extensions/Xinerama.h,
XINERAMA_LIBS=-lXinerama found_xinerama=true)], XINERAMA_LIBS=-lXinerama found_xinerama=true)],
@ -126,6 +126,8 @@ if test "$found_shape" = "true"; then
AC_DEFINE(HAVE_SHAPE) AC_DEFINE(HAVE_SHAPE)
fi fi
CPPFLAGS="$save_CPPFLAGS"
METACITY_LIBS="$XINERAMA_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS" METACITY_LIBS="$XINERAMA_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
METACITY_MESSAGE_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_MESSAGE_LIBS" METACITY_MESSAGE_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_MESSAGE_LIBS"
METACITY_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS" METACITY_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS"