Changeset 224


Ignore:
Timestamp:
Nov 27, 2003, 10:43:56 AM (17 years ago)
Author:
Sam Hocevar
Message:
  • configure.ac: + More sensible imlib2 detection, works with cross-compilation.
  • Makefile.am: + Don't forget to include NOTES to the dist tarball.
Location:
libcaca/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/Makefile.am

    r207 r224  
    66DIST_SUBDIRS = $(SUBDIRS) autotools debian
    77
    8 EXTRA_DIST = BUGS bootstrap caca-config.in
     8EXTRA_DIST = BUGS NOTES bootstrap caca-config.in
    99AUTOMAKE_OPTIONS = dist-bzip2
    1010
  • libcaca/trunk/configure.ac

    r222 r224  
    2626
    2727AC_CHECK_HEADERS(inttypes.h)
     28AC_CHECK_FUNCS(vsnprintf)
    2829
    2930USE_SLANG=false
     
    7475
    7576# Build cacaview?
     77save_CPPFLAGS="${CPPFLAGS}"
    7678AC_PATH_PROG(IMLIB2_CONFIG, imlib2-config, no)
    77 AM_CONDITIONAL(IMLIB2_CONFIG, test "${IMLIB2_CONFIG}" != "no")
     79if test "${IMLIB2_CONFIG}" != "no"; then
     80  CPPFLAGS="${CPPFLAGS} `imlib2-config --cflags` -DX_DISPLAY_MISSING=1"
     81fi
     82AC_CHECK_HEADER(Imlib2.h, USE_IMLIB2=:, USE_IMLIB2=false)
     83CPPFLAGS="${save_CPPFLAGS}"
     84AM_CONDITIONAL(USE_IMLIB2, ${USE_IMLIB2})
    7885
    7986# Build documentation?
  • libcaca/trunk/examples/Makefile.am

    r217 r224  
    2424caca_spritedit_CPPFLAGS = -I$(top_srcdir)/src
    2525
    26 if IMLIB2_CONFIG
     26if USE_IMLIB2
    2727cacaview = cacaview
    2828cacaview_SOURCES = view.c
Note: See TracChangeset for help on using the changeset viewer.