← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2009-01-06 22:27:46 UTC
  • mto: This revision was merged to the branch mainline in revision 762.
  • Revision ID: mordred@inaugust.com-20090106222746-j8ysp73xlq3zn0sx
Added check for ncurses back. This time, only do it if readline fails first.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
466
466
# Check for libreadline or compatible (libedit on Mac OS X)
467
467
#--------------------------------------------------------------------
468
468
 
 
469
dnl First, search for readline. If that fails, search for ncurses then
 
470
dnl search for readline again... on some platforms *cough* solaris *cough*
 
471
dnl you need to link with ncurses directly to get readline to work
469
472
 
470
 
SEARCH_FOR_LIB(readline, rl_initialize, readline/readline.h,
471
 
               AC_MSG_ERROR([libreadline is required for Drizzle]))
 
473
SEARCH_FOR_LIB(readline, rl_initialize, readline/readline.h,[
 
474
        SEARCH_FOR_LIB(ncurses, tgetent, ncurses/ncurses.h, [
 
475
                SEARCH_FOR_LIB(tinfo, tgetent, ncurses/ncurses.h,
 
476
                        AC_MSG_ERROR([Couldn't find ncurses])
 
477
                )
 
478
                ]
 
479
        )
 
480
        SEARCH_FOR_LIB(readline, rl_initialize, readline/readline.h,
 
481
               AC_MSG_ERROR([libreadline is required for Drizzle]),
 
482
               [$NCURSES_LIBS]) 
 
483
        ]
 
484
)
472
485
 
473
486
save_CPPFLAGS="$CPPFLAGS"
474
487
CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"