From 1d1726fd4625f2df7038b9ff254764d8cade9c19 Mon Sep 17 00:00:00 2001 From: Marcus Sundberg Date: Wed, 17 May 2000 19:51:02 +0000 Subject: [PATCH] Fix X-detection. --- configure.in | 8 +------- source/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index c8c6e07..1186582 100644 --- a/configure.in +++ b/configure.in @@ -190,17 +190,11 @@ dnl Checks for X11 and XShm AC_PATH_XTRA if test "x$no_x" = x; then HAVE_X=yes - X_INCLUDES="-I$x_includes" - X_LIBS="-L$x_libraries" AC_CHECK_LIB(Xext, XShmQueryExtension, [X_SHM_LIB=-lXext], [HAVE_X="no"], [ $X_LIBS -lX11 $X_EXTRA_LIBS ] ) fi -AC_SUBST(HAVE_X) -AC_SUBST(X_INCLUDES) -AC_SUBST(X_LIBS) -AC_SUBST(X_PRE_LIBS) AC_SUBST(X_SHM_LIB) dnl Checks for OpenGL support @@ -306,7 +300,7 @@ AC_SUBST(OPENGL_CFLAGS) AC_SUBST(OPENGL_INCLUDES) AC_SUBST(OPENGL_LIBS) -dnl Set $prefix and $exec_prefix to $ac_default_prefix if they haven't been set +dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' diff --git a/source/Makefile.am b/source/Makefile.am index d719bc5..4050c31 100644 --- a/source/Makefile.am +++ b/source/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES= @X_INCLUDES@ @OPENGL_INCLUDES@ -I$(top_srcdir)/include +INCLUDES= -I$(top_srcdir)/include @OPENGL_INCLUDES@ $(X_CFLAGS) bin_PROGRAMS = @TARGETS@