Changeset 244


Ignore:
Timestamp:
Dec 2, 2003, 11:27:27 PM (17 years ago)
Author:
Sam Hocevar
Message:
  • configure.ac: + Removed unused USE_* variables. + Export -lslang and -lncurses as @CACA_LIBS@.
  • examples/aafire.c: + Imported aafire.c from the AAlib tree and ported it to libcaca.
Location:
libcaca/trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r238 r244  
    2828AC_CHECK_FUNCS(vsnprintf getenv putenv)
    2929
    30 USE_SLANG=false
    31 USE_NCURSES=false
    32 USE_CONIO=false
    3330if test "${enable_conio}" = "yes"; then
    3431  AC_CHECK_HEADER(conio.h,:,AC_MSG_ERROR([cannot find conio.h header]))
     
    4037    AC_MSG_RESULT(no)])
    4138  AC_DEFINE(USE_CONIO, 1, Define if the backend driver is conio.h)
    42   USE_CONIO=:
    4339elif test "${enable_slang}" = "yes"; then
    4440  AC_CHECK_HEADER(slang.h,:,AC_MSG_ERROR([cannot find slang headers]))
    4541  AC_CHECK_LIB(slang,SLkp_init,:,AC_MSG_ERROR([cannot find slang library]))
    4642  AC_DEFINE(USE_SLANG, 1, Define if the backend driver is slang)
    47   USE_SLANG=:
     43  CACA_LIBS="${CACA_LIBS} -lslang"
    4844elif test "${enable_ncurses}" != "no"; then
    4945  AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([cannot find ncurses headers]))
    5046  AC_CHECK_LIB(ncurses,initscr,:,AC_MSG_ERROR([cannot find ncurses library]))
    5147  AC_DEFINE(USE_NCURSES, 1, Define if the backend driver is ncurses)
    52   USE_NCURSES=:
     48  CACA_LIBS="${CACA_LIBS} -lncurses"
    5349else
    5450  AC_MSG_ERROR([could not find any terminal graphics interface])
    5551fi
    5652
    57 AM_CONDITIONAL(USE_SLANG, ${USE_SLANG})
    58 AM_CONDITIONAL(USE_NCURSES, ${USE_NCURSES})
     53AC_SUBST(CACA_LIBS)
    5954
    6055# Optimizations
  • libcaca/trunk/examples/Makefile.am

    r236 r244  
    77EXTRA_DIST = caca.txt
    88
    9 if USE_SLANG
    10 LDFLAGS_slang = -lslang
    11 endif
    12 if USE_NCURSES
    13 LDFLAGS_ncurses = -lncurses
    14 endif
    15 
    16 bin_PROGRAMS = cacademo caca-spritedit $(cacaview)
     9bin_PROGRAMS = cacademo cacafire caca-spritedit $(cacaview)
    1710
    1811cacademo_SOURCES = demo.c
    19 cacademo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
     12cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ -lm
    2013cacademo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
    2114
     15cacafire_SOURCES = aafire.c
     16cacafire_LDADD = ../src/libcaca.a @CACA_LIBS@
     17cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
     18
    2219caca_spritedit_SOURCES = spritedit.c
    23 caca_spritedit_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
     20caca_spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
    2421caca_spritedit_CPPFLAGS = -I$(top_srcdir)/src
    2522
     
    2724cacaview = cacaview
    2825cacaview_SOURCES = view.c
    29 cacaview_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses)
     26cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@
    3027cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
    3128cacaview_CFLAGS = `imlib2-config --cflags`
Note: See TracChangeset for help on using the changeset viewer.