a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove -I/usr/X11R6/include from cflags, seems to fix zlib problems.

Browse Source 
Remove check for old zlib from autoconf stuff
This commit is contained in:
theoddone33
2003-02-17 23:20:15 +00:00
parent a9793331c6
commit 9aabca63f2
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zsnes/src/acinclude.m4
View File

@@ -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) min_zlib_version=ifelse([$1], ,1.1.0,$1)
AC_MSG_CHECKING(for zlib - version >= $min_zlib_version) 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" tempLIBS="$LIBS"
tempCFLAGS="$CFLAGS" tempCFLAGS="$CFLAGS"
if test x$zlib_prefix != x ; then if test x$zlib_prefix != x ; then

1
zsnes/src/configure.in
View File

@@ -87,7 +87,6 @@ if test x$opengl_prefix != x; then
CFLAGS="$CFLAGS -I$opengl_prefix/include" CFLAGS="$CFLAGS -I$opengl_prefix/include"
LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib" LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
fi fi
CFLAGS="$CFLAGS -I$x_includes"
LDFLAGS="$LDFLAGS -L$x_libraries" LDFLAGS="$LDFLAGS -L$x_libraries"
AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,) AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
if test x$found_opengl = xyes; then if test x$found_opengl = xyes; then