Ignore:
Timestamp:
Dec 26, 2003, 12:59:48 AM (17 years ago)
Author:
Sam Hocevar
Message:
  • src/caca.c: + Prefer the X11 driver if $DISPLAY is set. + The slang driver is now preferred over the ncurses driver.
  • configure.ac: + Autodetect conio.h.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r284 r285  
    1919
    2020AC_ARG_ENABLE(slang,
    21   [  --enable-slang          slang graphics support (default enabled)])
     21  [  --enable-slang          slang graphics support (autodetected)])
    2222AC_ARG_ENABLE(ncurses,
    23   [  --enable-ncurses        ncurses graphics support (default enabled)])
     23  [  --enable-ncurses        ncurses graphics support (autodetected)])
    2424AC_ARG_ENABLE(conio,
    2525  [  --enable-conio          DOS conio.h graphics support (default disabled)])
    2626AC_ARG_ENABLE(x11,
    27   [  --enable-x11            X11 support (default disabled) (default enabled)])
     27  [  --enable-x11            X11 support (autodetected)])
    2828
    2929AC_CHECK_HEADERS(inttypes.h endian.h)
     
    3232CACA_DRIVERS=""
    3333
    34 if test "${enable_conio}" = "yes"; then
    35   AC_CHECK_HEADERS(conio.h,:,AC_MSG_ERROR([cannot find conio.h header]))
    36   AC_MSG_CHECKING(for ScreenUpdate in pc.h)
    37   AC_EGREP_HEADER(ScreenUpdate,pc.h,
    38    [AC_MSG_RESULT(yes)
    39     AC_DEFINE(SCREENUPDATE_IN_PC_H, 1,
    40               Define if <pc.h> defines ScreenUpdate.)],
    41    [AC_MSG_RESULT(no)])
    42   CACA_DRIVERS="${CACA_DRIVERS} conio"
    43   AC_DEFINE(USE_CONIO, 1, Define to activate the conio.h backend driver)
     34if test "${enable_conio}" != "no"; then
     35  AC_CHECK_HEADERS(conio.h,
     36   [ac_cv_my_have_conio="yes"
     37    AC_MSG_CHECKING(for ScreenUpdate in pc.h)
     38    AC_EGREP_HEADER(ScreenUpdate,pc.h,
     39     [AC_MSG_RESULT(yes)
     40      AC_DEFINE(SCREENUPDATE_IN_PC_H, 1,
     41                Define if <pc.h> defines ScreenUpdate.)],
     42     [AC_MSG_RESULT(no)])
     43    AC_DEFINE(USE_CONIO, 1, Define to activate the conio.h backend driver)
     44    CACA_DRIVERS="${CACA_DRIVERS} conio"],
     45   [ac_cv_my_have_conio="no"])
     46  if test "${ac_cv_my_have_conio}" = "no" -a "${enable_conio}" = "yes"; then
     47    AC_MSG_ERROR([cannot find conio.h])
     48  fi
    4449fi
    4550
Note: See TracChangeset for help on using the changeset viewer.