# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1215698478 14400
# Node ID d74e515cb5358ca119591e80316c60f71514db10
# Parent  e998e81224b5cae39aef84372d45f91cb1841c50
configure.in: check for ftgl.h instead of FTGL.h

diff -r e998e81224b5 -r d74e515cb535 ChangeLog
--- a/ChangeLog	Thu Jul 10 08:59:18 2008 -0400
+++ b/ChangeLog	Thu Jul 10 10:01:18 2008 -0400
@@ -1,3 +1,8 @@
+2008-07-10  John W. Eaton  <jwe@octave.org>
+
+	* configure.in: Look for FTGL/ftgl.h instead of FTGL/FTGL.h.  Also
+	look for ftgl.h.
+
 2008-07-10  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* configure.in: new substituted variables GL_RENDER_SRC and
diff -r e998e81224b5 -r d74e515cb535 configure.in
--- a/configure.in	Thu Jul 10 08:59:18 2008 -0400
+++ b/configure.in	Thu Jul 10 10:01:18 2008 -0400
@@ -654,14 +654,18 @@
     [warn_graphics="FreeType library not found. Native renderer will not have on-screen text"])
   if test "x$warn_graphics" = "x" ; then
     AC_LANG_PUSH(C++)
-      AC_CHECK_HEADERS([FTGL/FTGL.h], [
+      AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], [
 	AC_MSG_CHECKING([for FTGLTextureFont in -lftgl])
         save_LIBS="$LIBS"
 	save_CXXFLAGS="$CXXFLAGS"
 	LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS -lftgl"
 	CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
         AC_TRY_LINK([
-#include <FTGL/FTGLTextureFont.h>], [
+#ifdef HAVE_FTGL_FTGL_H
+#include <FTGL/ftgl.h>
+#elif HAVE_FTGL_H
+#include <ftgl.h>
+#fi], [
 FTGLTextureFont font("");], [
           OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"
 	  LIBS="$save_LIBS"