diff options
| author | jcid <devnull@localhost> | 2007-10-12 00:19:47 +0200 |
|---|---|---|
| committer | jcid <devnull@localhost> | 2007-10-12 00:19:47 +0200 |
| commit | e2d68a9eea8e7d379742e550d66dd5b88a44cfd0 (patch) | |
| tree | 1b324b0b3627b56ad79bb9a9f2a442b5a1642219 | |
| parent | e73bdefa720054c1d938b6b962e95ecdfe908c39 (diff) | |
Improved FLTK library detection at configure time.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/IO/Makefile.am | 3 |
3 files changed, 8 insertions, 0 deletions
@@ -46,6 +46,8 @@ dillo-fltk2 - 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: diff --git a/configure.in b/configure.in index dd52bc1a..25bff711 100644 --- a/configure.in +++ b/configure.in @@ -147,10 +147,12 @@ AC_MSG_CHECKING([FLTK2]) 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(LIBSSL_LIBS) 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) diff --git a/src/IO/Makefile.am b/src/IO/Makefile.am index bff4667f..bc2dea7e 100644 --- a/src/IO/Makefile.am +++ b/src/IO/Makefile.am @@ -1,3 +1,6 @@ +AM_CFLAGS = @LIBFLTK_CFLAGS@ +AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@ + noinst_LIBRARIES = libDiof.a libDiof_a_SOURCES = \ |