From 9aabca63f21ce111e1e79fc860360a406320e32d Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Mon, 17 Feb 2003 23:20:15 +0000
Subject: [PATCH] Remove -I/usr/X11R6/include from cflags, seems to fix zlib
 problems. Remove check for old zlib from autoconf stuff

---
 zsnes/src/acinclude.m4 | 22 ----------------------
 zsnes/src/configure.in |  1 -
 2 files changed, 23 deletions(-)

diff --git a/zsnes/src/acinclude.m4 b/zsnes/src/acinclude.m4
index ca7df4c6..60e410ef 100644
--- a/zsnes/src/acinclude.m4
+++ b/zsnes/src/acinclude.m4
@@ -15,28 +15,6 @@ AC_ARG_WITH(zlib-prefix,[  --with-zlib-prefix=PFX  Prefix where zlib is installe
 min_zlib_version=ifelse([$1], ,1.1.0,$1)
 AC_MSG_CHECKING(for zlib - version >= $min_zlib_version)
 
-dnl Deal with X11R6 stupidity first. Some distros include zlib with X11R6,
-dnl and we cant use that one. We have to bomb if we find it.
-
-if test [-e /usr/X11R6/lib/libz.a] ; then 
-AC_MSG_RESULT(error)
-echo
-echo configure: Found a copy of zlib from X11R6
-echo configure: Please delete /usr/X11R6/lib/libz.a and /usr/X11R6/include/unzip.h
-echo "           so we can use the real zlib on your system."
-AC_MSG_ERROR(Remove these files and rerun this script)
-fi
-if test [-e /usr/X11R6/include/unzip.h] ; then 
-AC_MSG_RESULT(error)
-echo
-echo configure: Found a copy of zlib from X11R6
-echo configure: Please delete /usr/X11R6/lib/libz.a and /usr/X11R6/include/unzip.h
-echo "           so we can use the real zlib on your system."
-AC_MSG_ERROR(Remove these files and rerun this script)
-fi
-
-dnl Okay, Stupidy Check is done.
-
 tempLIBS="$LIBS"
 tempCFLAGS="$CFLAGS"
 if test x$zlib_prefix != x ; then
diff --git a/zsnes/src/configure.in b/zsnes/src/configure.in
index 7c8e7727..b7b56116 100644
--- a/zsnes/src/configure.in
+++ b/zsnes/src/configure.in
@@ -87,7 +87,6 @@ if test x$opengl_prefix != x; then
 CFLAGS="$CFLAGS -I$opengl_prefix/include"
 LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
 fi
-CFLAGS="$CFLAGS -I$x_includes"
 LDFLAGS="$LDFLAGS -L$x_libraries"
 AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
 if test x$found_opengl = xyes; then