Changeset 244 for libcaca/trunk/configure.acTweet

Timestamp:

Dec 2, 2003, 11:27:27 PM (18 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.

File:

• libcaca/trunk/configure.ac (modified) (2 diffs)

libcaca/trunk/configure.ac

@@ -28 +28 @@
 AC_CHECK_FUNCS(vsnprintf getenv putenv)
 
-USE_SLANG=false
-USE_NCURSES=false
-USE_CONIO=false
 if test "${enable_conio}" = "yes"; then
   AC_CHECK_HEADER(conio.h,:,AC_MSG_ERROR([cannot find conio.h header]))
@@ -40 +37 @@
     AC_MSG_RESULT(no)])
   AC_DEFINE(USE_CONIO, 1, Define if the backend driver is conio.h)
-  USE_CONIO=:
 elif test "${enable_slang}" = "yes"; then
   AC_CHECK_HEADER(slang.h,:,AC_MSG_ERROR([cannot find slang headers]))
   AC_CHECK_LIB(slang,SLkp_init,:,AC_MSG_ERROR([cannot find slang library]))
   AC_DEFINE(USE_SLANG, 1, Define if the backend driver is slang)
-  USE_SLANG=:
+  CACA_LIBS="${CACA_LIBS} -lslang"
 elif test "${enable_ncurses}" != "no"; then
   AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([cannot find ncurses headers]))
   AC_CHECK_LIB(ncurses,initscr,:,AC_MSG_ERROR([cannot find ncurses library]))
   AC_DEFINE(USE_NCURSES, 1, Define if the backend driver is ncurses)
-  USE_NCURSES=:
+  CACA_LIBS="${CACA_LIBS} -lncurses"
 else
   AC_MSG_ERROR([could not find any terminal graphics interface])
 fi
 
-AM_CONDITIONAL(USE_SLANG, ${USE_SLANG})
-AM_CONDITIONAL(USE_NCURSES, ${USE_NCURSES})
+AC_SUBST(CACA_LIBS)
 
 # Optimizations