changeset 6:c390daa639ce

Improved FLTK library detection at configure time.
author jcid
date Fri, 12 Oct 2007 00:19:47 +0200
parents 17a3024e47ff
children b552e3bce9fb
files ChangeLog configure.in src/IO/Makefile.am
diffstat 3 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 11 22:15:17 2007 +0200
+++ b/ChangeLog	Fri Oct 12 00:19:47 2007 +0200
@@ -46,6 +46,8 @@
  - Improved scrolling performance on large pages by copying screen data
     instead of rendering.
    Patches: Johannes Hofmann
++- Improved FLTK library detection at configure time.
+   Patch: Frank Gevaerts
 
  TODO:
 
--- a/configure.in	Thu Oct 11 22:15:17 2007 +0200
+++ b/configure.in	Fri Oct 12 00:19:47 2007 +0200
@@ -147,10 +147,12 @@
 if sh -c "fltk2-config --version" >/dev/null 2>&1
 then AC_MSG_RESULT(yes)
      LIBFLTK_CXXFLAGS=`fltk2-config --cxxflags`
+     LIBFLTK_CFLAGS=`fltk2-config --cflags`
      LIBFLTK_LIBS=`fltk2-config --use-images --ldflags`
 else if sh -c "fltk-config --version" >/dev/null 2>&1
      then AC_MSG_RESULT(yes)
           LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
+          LIBFLTK_CFLAGS=`fltk-config --cflags`
           LIBFLTK_LIBS=`fltk-config --ldflags`
      else AC_MSG_RESULT(no)
           AC_ERROR(FLTK2 must be installed!)
@@ -467,6 +469,7 @@
 AC_SUBST(LIBPTHREAD_LIBS)
 AC_SUBST(LIBPTHREAD_LDFLAGS)
 AC_SUBST(LIBFLTK_CXXFLAGS)
+AC_SUBST(LIBFLTK_CFLAGS)
 AC_SUBST(LIBFLTK_LIBS)
 AC_SUBST(datadir)
 AC_SUBST(src doc)
--- a/src/IO/Makefile.am	Thu Oct 11 22:15:17 2007 +0200
+++ b/src/IO/Makefile.am	Fri Oct 12 00:19:47 2007 +0200
@@ -1,3 +1,6 @@
+AM_CFLAGS = @LIBFLTK_CFLAGS@
+AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+
 noinst_LIBRARIES = libDiof.a
 
 libDiof_a_SOURCES = \