# HG changeset patch
# User nkeynes
# Date 1280539004 -36000
# Node ID 174fa8e137b6e9d4792ce5b6b6707d26d898c0bb
# Parent  4cac5e474d4cc9eecb2eaafcac4a5465b0ced9f4
Add LIBGL_* package vars to LIBS and CPPFLAGS so subsequent checks still work

--- a/configure	Tue Jul 13 18:23:16 2010 +1000
+++ b/configure	Sat Jul 31 11:16:44 2010 +1000
@@ -9543,7 +9543,9 @@
 echo "${ECHO_T}yes" >&6; }
 	:
 fi
-                                   else
+                                      LIBS="$LIBS $LIBGL_LIBS";
+      CPPFLAGS="$CPPFLAGS $LIBGL_CFLAGS";
+   else
       { echo "$as_me:$LINENO: checking for NSOpenGLGetVersion" >&5
 echo $ECHO_N "checking for NSOpenGLGetVersion... $ECHO_C" >&6; }
 if test "${ac_cv_func_NSOpenGLGetVersion+set}" = set; then
--- a/configure.in	Tue Jul 13 18:23:16 2010 +1000
+++ b/configure.in	Sat Jul 31 11:16:44 2010 +1000
@@ -244,6 +244,8 @@
           dnl AC_MSG_FAILURE( ["The OpenGL library (libGL.so) could not be found, but is required."])])
       dnl AC_CHECK_HEADER([GL/gl.h], [], [
           dnl AC_MSG_FAILURE( ["The OpenGL header files (eg GL/gl.h) could not be found, but are required."])])
+      LIBS="$LIBS $LIBGL_LIBS";
+      CPPFLAGS="$CPPFLAGS $LIBGL_CFLAGS";
    else
       AC_CHECK_FUNC(NSOpenGLGetVersion, [
          HAVE_NSGL='yes'
--- a/src/Makefile.am	Tue Jul 13 18:23:16 2010 +1000
+++ b/src/Makefile.am	Sat Jul 31 11:16:44 2010 +1000
@@ -6,7 +6,7 @@
 	-DPACKAGE_PLUGIN_DIR=\""$(pkglibdir)"\" \
 	-DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
         -Ish4 \
-	@GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBGL_CFLAGS@ @LIBISOFS_CFLAGS@
+	@GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBISOFS_CFLAGS@
 
 SOEXT=@SOEXT@
 PLUGINCFLAGS = @PLUGINCFLAGS@ 
@@ -39,7 +39,7 @@
 genmach_SOURCES = tools/genmach.c tools/genmach.h tools/mdparse.c
 genglsl_SOURCES = tools/genglsl.c
 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
-lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBGL_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
+lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
 lxdream_SOURCES = \
         main.c version.c config.c config.h lxdream.h dream.h gui.h cpu.c cpu.h hook.h \
         gettext.h mem.c mem.h sdram.c mmio.h watch.c \
--- a/src/Makefile.in	Tue Jul 13 18:23:16 2010 +1000
+++ b/src/Makefile.in	Sat Jul 31 11:16:44 2010 +1000
@@ -538,7 +538,7 @@
 	-DPACKAGE_PLUGIN_DIR=\""$(pkglibdir)"\" \
 	-DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \
         -Ish4 \
-	@GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBGL_CFLAGS@ @LIBISOFS_CFLAGS@
+	@GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@ @LIBISOFS_CFLAGS@
 
 EXTRA_DIST = drivers/genkeymap.pl checkver.pl drivers/dummy.c
 AM_CFLAGS = -D__EXTENSIONS__ -D_BSD_SOURCE -D_GNU_SOURCE
@@ -558,9 +558,8 @@
 genglsl_SOURCES = tools/genglsl.c
 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
 lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ \
-	@LIBGL_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) $(am__append_18) \
-	$(am__append_20) $(am__append_22) $(am__append_24) \
-	$(am__append_26)
+	@LIBISOFS_LIBS@ $(INTLLIBS) $(am__append_18) $(am__append_20) \
+	$(am__append_22) $(am__append_24) $(am__append_26)
 lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \
 	gui.h cpu.c cpu.h hook.h gettext.h mem.c mem.h sdram.c mmio.h \
 	watch.c asic.c asic.h clock.h serial.h syscall.c syscall.h \