Mercurial > octave-nkf

comparison configure.in @ 9176:7ea76c8a59f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.in: put -lftgl ahead of $FT2_LIBS, and $FT2_LIBS ahead of $OPENGL_LIBS
author John W. Eaton <jwe@octave.org>
date Mon, 04 May 2009 21:22:36 -0400
parents 224634b2e6e3
children a6375c37dad4
comparison
equal deleted inserted replaced
9175:5baa4d43a2ae 9176:7ea76c8a59f7
696 if test -z "$warn_freetype"; then 696 if test -z "$warn_freetype"; then
697 AC_LANG_PUSH(C++) 697 AC_LANG_PUSH(C++)
698 save_LIBS="$LIBS" 698 save_LIBS="$LIBS"
699 save_CXXFLAGS="$CXXFLAGS" 699 save_CXXFLAGS="$CXXFLAGS"
700 save_CPPFLAGS="$CPPFLAGS" 700 save_CPPFLAGS="$CPPFLAGS"
701 LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS" 701 LIBS="$LIBS $FT2_LIBS $OPENGL_LIBS"
702 CXXFLAGS="$CXXFLAGS $FT2_CFLAGS" 702 CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
703 CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" 703 CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
704 has_ftgl_h=yes 704 has_ftgl_h=yes
705 AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], break, [ 705 AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], break, [
706 AC_CHECK_HEADERS([FTGL/FTGL.h FTGL.h], [ 706 AC_CHECK_HEADERS([FTGL/FTGL.h FTGL.h], [
707 AC_DEFINE(HAVE_FTGL_UPPERCASE,1,[Define to 1 if you have FTGL.h or FTGL/FTGL.h]) 707 AC_DEFINE(HAVE_FTGL_UPPERCASE, 1, [Define to 1 if you have FTGL.h or FTGL/FTGL.h])
708 break 708 break
709 ], has_ftgl_h=no)]) 709 ], has_ftgl_h=no)])
710 if test "$has_ftgl_h" = yes; then 710 if test "$has_ftgl_h" = yes; then
711 AC_MSG_CHECKING([for FTGLTextureFont in -lftgl]) 711 AC_MSG_CHECKING([for FTGLTextureFont in -lftgl])
712 LIBS="$LIBS -lftgl" 712 LIBS="$save_LIBS -lftgl $FT2_LIBS $OPENGL_LIBS"
713 AC_TRY_LINK([ 713 AC_TRY_LINK([
714 #ifdef HAVE_FTGL_FTGL_H 714 #ifdef HAVE_FTGL_FTGL_H
715 #ifdef HAVE_FTGL_UPPERCASE 715 #ifdef HAVE_FTGL_UPPERCASE
716 #include <FTGL/FTGL.h> 716 #include <FTGL/FTGL.h>
717 #else 717 #else
725 #include <ftgl.h> 725 #include <ftgl.h>
726 #endif 726 #endif
727 #include <FTGLTextureFont.h> 727 #include <FTGLTextureFont.h>
728 #endif], [ 728 #endif], [
729 FTGLTextureFont font("");], [ 729 FTGLTextureFont font("");], [
730 OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl" 730 OPENGL_LIBS="-lftgl $FT2_LIBS $OPENGL_LIBS"
731 LIBS="$save_LIBS" 731 LIBS="$save_LIBS"
732 CPPFLAGS="$save_CPPFLAGS" 732 CPPFLAGS="$save_CPPFLAGS"
733 AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present]) 733 AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present])
734 AC_MSG_RESULT(yes) 734 AC_MSG_RESULT(yes)
735 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],[ 735 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], [
736 AC_MSG_RESULT(no) 736 AC_MSG_RESULT(no)
737 warn_ftgl="FTGL library not found. Native renderer will not have on-screen text" 737 warn_ftgl="FTGL library not found. Native renderer will not have on-screen text"
738 ]) 738 ])
739 LIBS="$save_LIBS" 739 LIBS="$save_LIBS"
740 CXXFLAGS="$save_CXXFLAGS" 740 CXXFLAGS="$save_CXXFLAGS"