Changeset 2517

Timestamp:

07/05/08 18:28:30 (5 years ago)

Author:

sam

Message:

• Check for FTGL in the configure step, because we will use it later.
• Better CFLAGS and LDFLAGS propagation to the Makefiles.

Location:

libcaca/trunk

Files:

• caca/Makefile.am (modified) (2 diffs)
• configure.ac (modified) (3 diffs)

libcaca/trunk/caca/Makefile.am

@@ -32 +32 @@
         $(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@
@@ -40 +41 @@
 
 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

libcaca/trunk/configure.ac

@@ -218 +218 @@
     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
 
@@ -306 +308 @@
   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")
@@ -322 +325 @@
 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)