Changeset 2517 for libcaca


Ignore:
Timestamp:
Jul 5, 2008, 6:28:30 PM (12 years ago)
Author:
Sam Hocevar
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:
2 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/Makefile.am

    r2299 r2517  
    3232        $(extra_source) \
    3333        $(NULL)
     34libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@
    3435libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
    3536libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
     
    4041
    4142libx11_plugin_la_SOURCES = driver_x11.c
     43libx11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
    4244libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
    4345libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(X11_LIBS)
    4446
    4547libgl_plugin_la_SOURCES = driver_gl.c
     48libgl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GL_CFLAGS) #$(FTGL_CFLAGS)
    4649libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
    47 libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS)
     50libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS) #$(FTGL_LIBS)
    4851else
    4952extra_source = driver_x11.c driver_gl.c
  • libcaca/trunk/configure.ac

    r2425 r2517  
    218218    AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files])
    219219  fi
     220  PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"])
     221  AM_CONDITIONAL(USE_FTGL, test "${FTGL}" = "yes")
    220222fi
    221223
     
    306308  CACA_LIBS="${CACA_LIBS} -ldl"
    307309else
    308   CACA_LIBS="${CACA_LIBS} ${X11_LIBS} ${GL_LIBS}"
     310  CACA_CFLAGS="${CACA_CFLAGS} ${X11_CFLAGS} ${GL_CFLAGS} ${FTGL_CFLAGS}"
     311  CACA_LIBS="${CACA_LIBS} ${X11_LIBS} ${GL_LIBS} ${FTGL_LIBS}"
    309312fi
    310313AM_CONDITIONAL(USE_PLUGINS, test "${ac_cv_my_have_plugins}" = "yes")
     
    322325AC_SUBST(ZLIB_LIBS)
    323326AC_SUBST(GETOPT_LIBS)
     327AC_SUBST(CACA_CFLAGS)
    324328AC_SUBST(CACA_LIBS)
     329AC_SUBST(X11_CFLAGS)
    325330AC_SUBST(X11_LIBS)
     331AC_SUBST(GL_CFLAGS)
    326332AC_SUBST(GL_LIBS)
    327333
Note: See TracChangeset for help on using the changeset viewer.