# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1241486556 14400
# Node ID 7ea76c8a59f75b928a0112321f975ee98d2a650a
# Parent  5baa4d43a2ae715cf51f386b99c3756ce12d3711
configure.in: put -lftgl ahead of $FT2_LIBS, and $FT2_LIBS ahead of $OPENGL_LIBS

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-04  John W. Eaton  <jwe@octave.org>
+
+	* configure.in: Put -lftgl ahead of $FT2_LIBS, and $FT2_LIBS ahead
+	of $OPENGL_LIBS.
+
 2009-05-04  Peter O'Gorman  <pogma@thewrittenword.com>
 
 	* aclocal.m4 (OCTAVE_HAVE_C99_VSNPRINTF): New macro.
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -698,18 +698,18 @@
       save_LIBS="$LIBS"
       save_CXXFLAGS="$CXXFLAGS"
       save_CPPFLAGS="$CPPFLAGS"
-      LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS"
+      LIBS="$LIBS $FT2_LIBS $OPENGL_LIBS"
       CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
       CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
       has_ftgl_h=yes
       AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], break, [
 	AC_CHECK_HEADERS([FTGL/FTGL.h FTGL.h], [
-          AC_DEFINE(HAVE_FTGL_UPPERCASE,1,[Define to 1 if you have FTGL.h or FTGL/FTGL.h])
+          AC_DEFINE(HAVE_FTGL_UPPERCASE, 1, [Define to 1 if you have FTGL.h or FTGL/FTGL.h])
 	  break
 	  ], has_ftgl_h=no)])
       if test "$has_ftgl_h" = yes; then
 	AC_MSG_CHECKING([for FTGLTextureFont in -lftgl])
-	LIBS="$LIBS -lftgl"
+	LIBS="$save_LIBS -lftgl $FT2_LIBS $OPENGL_LIBS"
         AC_TRY_LINK([
 #ifdef HAVE_FTGL_FTGL_H
 #ifdef HAVE_FTGL_UPPERCASE
@@ -727,12 +727,12 @@
 #include <FTGLTextureFont.h>
 #endif], [
 FTGLTextureFont font("");], [
-          OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"
+          OPENGL_LIBS="-lftgl $FT2_LIBS $OPENGL_LIBS"
 	  LIBS="$save_LIBS"
 	  CPPFLAGS="$save_CPPFLAGS"
           AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present])
 	  AC_MSG_RESULT(yes)
-	  XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],[
+	  XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], [
 	  AC_MSG_RESULT(no)
           warn_ftgl="FTGL library not found. Native renderer will not have on-screen text"
         ])