[Thplot-cvs] CVS: thplot configure.in,1.3,1.4

[Tony P. <ap...@us...>]

Update of /cvsroot/thplot/thplot
In directory usw-pr-cvs1:/tmp/cvs-serv4624

Modified Files:
	configure.in 
Log Message:
Improved freetype headers search


Index: configure.in
===================================================================
RCS file: /cvsroot/thplot/thplot/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure.in	2 Jul 2002 17:22:11 -0000	1.3
--- configure.in	3 Jul 2002 16:13:19 -0000	1.4
***************
*** 26,37 ****
  ],is_cygwin=yes, is_cygwin=no)
  
  
  echo "IS_CYGWIN = $is_cygwin"
  AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
  #
  if test "x$is_cygwin" = "xyes" ; then
    AC_DEFINE(IS_CYGWIN)
-   AC_CHECK_LIB(png,png_create_read_struct)
- 	AC_CHECK_LIB(freetype,FT_Init_FreeType)
    AC_CHECK_PROG(have_fltk_config,fltk-config,"yes","no")
  	if test "x$have_fltk_config" = "xyes" ; then
--- 26,52 ----
  ],is_cygwin=yes, is_cygwin=no)
  
+ #display all warnings
+ CXXFLAGS="$CXXFLAGS -Wall"
  
  echo "IS_CYGWIN = $is_cygwin"
  AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
  #
+ 
+ AC_CHECK_LIB(png,png_create_read_struct)
+ AC_CHECK_LIB(freetype,FT_Init_FreeType)
+ 
+ # took this check from configure.ac distributed with OGLFT 0.7
+ AC_CHECK_HEADER(ft2build.h,,
+   AC_MSG_WARN([could not successfully compile with FreeType2 using the])
+   AC_MSG_WARN([default compiler flags; re-trying with])
+   AC_MSG_WARN([CPPFLAGS=$CPPFLAGS -I/usr/include/freetype2])
+   CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
+   unset ac_cv_header_ft2build_h
+   AC_CHECK_HEADER(ft2build.h,,
+     AC_MSG_ERROR([could not find FreeType2 headers]))
+ )
+ 
  if test "x$is_cygwin" = "xyes" ; then
    AC_DEFINE(IS_CYGWIN)
    AC_CHECK_PROG(have_fltk_config,fltk-config,"yes","no")
  	if test "x$have_fltk_config" = "xyes" ; then
***************
*** 45,49 ****
  		#punt and cross our fingers
  		LIBS="$LIBS -Wl,-e,_mainCRTStartup -L/usr/local/lib -lfltk_gl -lfltk -mwindows -lglu32 -lopengl32 -lole32 -luuid -lcomctl32 -lwsock32 -lm"
! 	    CXXFLAGS="$CXXFLAGS -I/usr/local/include -mwindows -DWIN32"
  	fi
  	echo $LIBS
--- 60,64 ----
  		#punt and cross our fingers
  		LIBS="$LIBS -Wl,-e,_mainCRTStartup -L/usr/local/lib -lfltk_gl -lfltk -mwindows -lglu32 -lopengl32 -lole32 -luuid -lcomctl32 -lwsock32 -lm"
! 	  CXXFLAGS="$CXXFLAGS -DWIN32"
  	fi
  	echo $LIBS
***************
*** 52,61 ****
    AC_CHECK_LIB(GL, glNewList)
    AC_CHECK_LIB(GLU, gluGetString)
-   AC_CHECK_LIB(freetype,FT_Init_FreeType)
  	AC_CHECK_LIB(fltk,fl_yes)
  	AC_CHECK_LIB(fltk_gl,fl_visual)
  	AC_CHECK_HEADER(FL/Fl.h)
    AC_CHECK_HEADER(FL/gl.h)
!   CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2"
  fi	
  
--- 67,75 ----
    AC_CHECK_LIB(GL, glNewList)
    AC_CHECK_LIB(GLU, gluGetString)
  	AC_CHECK_LIB(fltk,fl_yes)
  	AC_CHECK_LIB(fltk_gl,fl_visual)
  	AC_CHECK_HEADER(FL/Fl.h)
    AC_CHECK_HEADER(FL/gl.h)
!   #CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2"
  fi