summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2002-07-24 14:47:52 +0000
committerJacob Berkman <jberkman@src.gnome.org>2002-07-24 14:47:52 +0000
commit6f6e5333800f7be0e6854ff0e1f63eed2f14cd83 (patch)
treef7a9bd3890f253908fb81d622b01dda9547cff78 /configure.in
parentf7b55bfdcc5aab575efeb2e7a0225e34e9398c8a (diff)
downloadmetacity-6f6e5333800f7be0e6854ff0e1f63eed2f14cd83.tar.gz
metacity-6f6e5333800f7be0e6854ff0e1f63eed2f14cd83.tar.bz2
fix x11 header checks when x11 is not in the default include path
2002-07-24 jacob berkman <jacob@ximian.com> * configure.in: fix x11 header checks when x11 is not in the default include path
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index c38085c..f5e613c 100644
--- a/configure.in
+++ b/configure.in
@@ -102,10 +102,10 @@ fi
AC_PATH_XTRA
-CFLAGS="$METACITY_CFLAGS $CFLAGS $X_CFLAGS"
-
XINERAMA_LIBS=
found_xinerama=false
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_LIB(Xext, XineramaQueryExtension,
[AC_CHECK_HEADERS(X11/extensions/Xinerama.h,
XINERAMA_LIBS=-lXinerama found_xinerama=true)],
@@ -126,6 +126,8 @@ if test "$found_shape" = "true"; then
AC_DEFINE(HAVE_SHAPE)
fi
+CPPFLAGS="$save_CPPFLAGS"
+
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_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS"