From 9aef9b424bc843f9c1262981cb50b4f264715190 Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Mon, 28 Oct 2002 23:25:31 +0000
Subject: [PATCH] Change include and library paths and fix another problem

---
 zsnes/src/configure.in | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/zsnes/src/configure.in b/zsnes/src/configure.in
index b34cb073..7c8e7727 100644
--- a/zsnes/src/configure.in
+++ b/zsnes/src/configure.in
@@ -21,11 +21,20 @@ AC_SUBST(VERSION)
 AC_ARG_WITH(nasm-prefix,[  --with-nasm-prefix=PFX Prefix where nasm is installed (optional)], nasm_prefix="$withval", nasm_prefix="")
 
 dnl -- Where is our compiler, and who are we compiling for?
-CFLAGS="-pipe -I. -Wall"
+CFLAGS="$CFLAGS -pipe -I. -Wall -I/usr/local/include -I/usr/include"
+
+dnl -- You might wanna change -I/usr/include if you're trying to do this with
+dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
+dnl else do -I/usr/include. Or some shit. You figure it out.
+
+LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
+
+dnl -- Same thing here.
+
 AC_CANONICAL_SYSTEM
 AC_PROG_CC
-AC_CHECK_TOOL(NASMPATH,nasm,"no",[$nasm_prefix:$PATH])
-if test x$nasmpath = xno; then
+AC_CHECK_TOOL(NASMPATH,nasm,"no",$nasm_prefix:$PATH)
+if test x$NASMPATH = xno; then
 AC_MSG_ERROR(You need NASM installed to compile ZSNES)
 fi
 NFLAGS="$NFLAGS -w-orphan-labels"
@@ -74,8 +83,12 @@ AC_ARG_WITH(opengl-prefix,[  --with-opengl-prefix=PFX Prefix where opengl is ins
 
 if test x$enable_opengl != xno; then
 AC_PATH_X
-CFLAGS="$CFLAGS -I$opengl_prefix/includes -I$x_includes"
-LDFLAGS="$LDFLAGS -L$opengl_prefix/lib -L$x_libraries"
+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
         echo checking for OpenGL... yes