diff --git a/caca/Makefile.am b/caca/Makefile.am index adbc274..700bfbb 100644 --- a/caca/Makefile.am +++ b/caca/Makefile.am @@ -31,6 +31,7 @@ libcaca_la_SOURCES = \ $(cocoa_source) \ $(extra_source) \ $(NULL) +libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@ libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@ @@ -39,12 +40,14 @@ plugin_LTLIBRARIES = libx11_plugin.la libgl_plugin.la plugindir = $(libdir)/caca libx11_plugin_la_SOURCES = driver_x11.c +libx11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS) libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(X11_LIBS) libgl_plugin_la_SOURCES = driver_gl.c +libgl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GL_CFLAGS) #$(FTGL_CFLAGS) libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version -libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS) +libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS) #$(FTGL_LIBS) else extra_source = driver_x11.c driver_gl.c endif diff --git a/configure.ac b/configure.ac index 189e8ce..b0c5128 100644 --- a/configure.ac +++ b/configure.ac @@ -217,6 +217,8 @@ if test "${enable_gl}" != "no"; then elif test "${enable_gl}" = "yes"; then AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files]) fi + PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"]) + AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes") fi if test "${enable_cocoa}" != "no"; then @@ -305,7 +307,8 @@ if test "${enable_plugins}" = "yes"; then AC_DEFINE(USE_PLUGINS, 1, Define to 1 to activate plugins) CACA_LIBS="${CACA_LIBS} -ldl" else - CACA_LIBS="${CACA_LIBS} ${X11_LIBS} ${GL_LIBS}" + CACA_CFLAGS="${CACA_CFLAGS} ${X11_CFLAGS} ${GL_CFLAGS} ${FTGL_CFLAGS}" + CACA_LIBS="${CACA_LIBS} ${X11_LIBS} ${GL_LIBS} ${FTGL_LIBS}" fi AM_CONDITIONAL(USE_PLUGINS, test "${ac_cv_my_have_plugins}" = "yes") @@ -321,8 +324,11 @@ fi AC_SUBST(MATH_LIBS) AC_SUBST(ZLIB_LIBS) AC_SUBST(GETOPT_LIBS) +AC_SUBST(CACA_CFLAGS) AC_SUBST(CACA_LIBS) +AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) +AC_SUBST(GL_CFLAGS) AC_SUBST(GL_LIBS) # How to get the C99 types. See cucul/cucul_types.h.in for details about