ecasound-ac_fix.patch

   1 --- ecasound-2.1.0/configure.in.orig    Sun Oct  7 17:39:44 2001
   2 +++ ecasound-2.1.0/configure.in Mon Feb  4 04:13:30 2002
   3 @@ -71,15 +71,6 @@
   4
   5  dnl ------------------------------------------------------------------
   6
   7 -dnl ---
   8 -dnl Set CXXFLAGS.
   9 -dnl ---
  10 -CXXFLAGS="-O2 -D_REENTRANT -DNDEBUG -ffast-math -fstrict-aliasing -funroll-loops"
  11 -CFLAGS="$CXXFLAGS"
  12 -dnl --- CXXFLAGS="-O2 -D_REENTRANT -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -Wall -Wstrict-prototypes -pedantic -fstrict-aliasing"
  13 -
  14 -dnl ------------------------------------------------------------------
  15 -
  16  AC_MSG_CHECKING(whether to enable debugging)
  17  AC_ARG_ENABLE(debug,
  18  [  --enable-debug              Enable debugging (default = no)],
  19 @@ -189,25 +180,25 @@
  20  dnl ---
  21  dnl Check for ncurses/termcap
  22  dnl ---
  23 -AC_CHECK_LIB(ncurses, main, termcap_library=ncurses,
  24 -       AC_CHECK_LIB(termcap, main, termcap_library=termcap,
  25 +AC_CHECK_LIB(ncurses, main, [termcap_library=ncurses],
  26 +       AC_CHECK_LIB(termcap, main, [termcap_library=termcap],
  27                 AC_MSG_ERROR([** neither termcap nor ncurses library is installed (needed by the console mode user interface) **])))
  28  AC_ARG_ENABLE(ncurses,
  29  [  --disable-ncurses           Disable ncurses (default = no)],
  30 -termcap_library=none)
  31 -AM_CONDITIONAL(USE_NCURSES, test $termcap_library = ncurses)
  32 -AM_CONDITIONAL(USE_TERMCAP, test $termcap_library = termcap)
  33 +[termcap_library=none])
  34 +AM_CONDITIONAL(USE_NCURSES, [test $termcap_library = ncurses])
  35 +AM_CONDITIONAL(USE_TERMCAP, [test $termcap_library = termcap])
  36  if test x$termcap_library = xtermcap; then
  37         AC_DEFINE(USE_TERMCAP)
  38  fi
  39  if test x$termcap_library = xncurses; then
  40         AC_CHECK_HEADER(curses.h,
  41 -               AC_CHECK_HEADER(term.h,, AC_MSG_ERROR([*** curses headers not installed ***])),
  42 -                       AC_CHECK_HEADER(ncurses/curses.h, [
  43 -                               AC_CHECK_HEADER(ncurses/term.h,, AC_MSG_ERROR([*** curses headers not installed ***]))
  44 +               [AC_CHECK_HEADER(term.h, [], AC_MSG_ERROR([*** curses headers not installed ***]))],
  45 +                       [AC_CHECK_HEADER(ncurses/curses.h, [
  46 +                               AC_CHECK_HEADER(ncurses/term.h, [], AC_MSG_ERROR([*** curses headers not installed ***]))
  47                                 CXXFLAGS="-DHAVE_NCURSES_CURSES_H $CXXFLAGS"
  48                                 ],
  49 -                               AC_MSG_ERROR([*** curses headers not installed ***]))
  50 +                               AC_MSG_ERROR([*** curses headers not installed ***]))]
  51          )
  52         AC_DEFINE(USE_NCURSES)
  53  fi
  54 @@ -385,19 +376,19 @@
  55  dnl Check for readline.h or readline/readline.h (same with history.h)
  56  dnl and for readline and history libraries
  57  dnl
  58 -AM_CONDITIONAL(SYSTEM_READLINE, test x$enable_sysreadline = xyes)
  59 +AM_CONDITIONAL(SYSTEM_READLINE, [test x$enable_sysreadline = xyes])
  60  if test x$enable_sysreadline = xyes; then
  61 -  AC_CHECK_HEADER(readline.h, readline_includes=/usr/include,
  62 -    AC_CHECK_HEADER(readline/readline.h,
  63 -      readline_includes=/usr/include/readline,
  64 -      AC_MSG_ERROR([*** readline headers not installed ***]))
  65 +  AC_CHECK_HEADER(readline.h, [readline_includes=/usr/include],
  66 +    [AC_CHECK_HEADER(readline/readline.h,
  67 +      [readline_includes=/usr/include/readline],
  68 +      AC_MSG_ERROR([*** readline headers not installed ***]))]
  69    )
  70 -  AC_CHECK_HEADER(history.h,,
  71 -    AC_CHECK_HEADER(readline/history.h,,
  72 -      AC_MSG_ERROR([*** readline history headers not installed ***]))
  73 +  AC_CHECK_HEADER(history.h, [],
  74 +    [AC_CHECK_HEADER(readline/history.h, [],
  75 +      AC_MSG_ERROR([*** readline history headers not installed ***]))]
  76    )
  77 -  AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***]))
  78 -  AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***]))
  79 +  AC_CHECK_LIB(readline, main, [], AC_MSG_ERROR([*** readline support not installed ***]))
  80 +  AC_CHECK_LIB(history, main, [], AC_MSG_ERROR([*** readline history support not installed ***]))
  81    AC_SUBST(readline_includes)
  82  else
  83    AC_CONFIG_SUBDIRS(readline-4.0)