Update of /cvsroot/thplot/thplot
In directory usw-pr-cvs1:/tmp/cvs-serv26286
Modified Files:
configure.in
Log Message:
Improved search for freetype headers
Index: configure.in
===================================================================
RCS file: /cvsroot/thplot/thplot/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** configure.in 3 Jul 2002 16:13:19 -0000 1.4
--- configure.in 4 Jul 2002 13:17:24 -0000 1.5
***************
*** 36,49 ****
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
--- 36,61 ----
AC_CHECK_LIB(freetype,FT_Init_FreeType)
! #this is pure silliness, but AC_CHECK_HEADER(freetype2/ft2build.h)
! #doesn't seem to work
! save_CPPFLAGS=$CPPFLAGS
! AC_CHECK_HEADER(ft2build.h)
! if test "x$ac_cv_header_ft2build_h" = "xno"; then
! #try /usr/include/freetype2
unset ac_cv_header_ft2build_h
! CPPFLAGS="$save_CPPFLAGS -I/usr/include/freetype2"
! AC_CHECK_HEADER(ft2build.h)
! fi
!
! if test "x$ac_cv_header_ft2build_h" = "xno"; then
! #try /usr/local/include/freetype2
! unset ac_cv_header_ft2build_h
! CPPFLAGS="$save_CPPFLAGS -I/usr/local/include/freetype2"
! AC_CHECK_HEADER(ft2build.h)
! fi
!
! if test "x$ac_cv_header_ft2build_h" = "xno"; then
! CPPFLAGS=$save_CPPFLAGS
! fi
!
if test "x$is_cygwin" = "xyes" ; then
|
