[1253] in Moira

home help back first fref pref prev next nref lref last post

moira configure.in patch to support local readline on Athena

daemon@ATHENA.MIT.EDU (Aaron M. Ucko)
Thu Feb 25 23:45:04 1999

To: bug-moira@MIT.EDU
From: amu@MIT.EDU (Aaron M. Ucko)
Date: 25 Feb 1999 23:44:59 -0500

With this patch, I can get a working mrtest binary on Linux-Athena 8.2
by running

HOSTTYPE=linux CONFIG_SITE=/mit/source-sipb/packs/build/config.site \
        ./configure --enable-athena --with-readline
make -C util/et
make

Index: configure.in
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/configure.in,v
retrieving revision 1.16
diff -c -r1.16 configure.in
*** configure.in	1999/01/26 20:07:21	1.16
--- configure.in	1999/02/26 04:39:27
***************
*** 32,38 ****
  
  if test "$athena" = true; then
      enable_athena=yes
!     with_readline=/mit/gnu
      unset with_com_err
      prefix=/afs/athena.mit.edu/system/moira
      bindir=$prefix/arch/$ATHENA_SYS/bin
--- 32,38 ----
  
  if test "$athena" = true; then
      enable_athena=yes
!     test -z "$with_readline" && with_readline=/mit/gnu
      unset with_com_err
      prefix=/afs/athena.mit.edu/system/moira
      bindir=$prefix/arch/$ATHENA_SYS/bin
***************
*** 327,335 ****
      [readline="$withval"],
      [AC_CHECK_LIB(readline, readline, [readline=yes], :, -ltermcap)])
  if test "$readline" != no; then
      if test "$readline" != yes; then
! 	READLINE_CPPFLAGS="-I$readline/include -I$readline/include/readline -DHAVE_READLINE"
! 	READLINE_LIBS="-L$readline/lib -lreadline -ltermcap"
      fi
  fi
  AC_SUBST(READLINE_CPPFLAGS)
--- 327,340 ----
      [readline="$withval"],
      [AC_CHECK_LIB(readline, readline, [readline=yes], :, -ltermcap)])
  if test "$readline" != no; then
+     READLINE_CPPFLAGS="-DHAVE_READLINE"
+     READLINE_LIBS="-lreadline -ltermcap"
      if test "$readline" != yes; then
! 	READLINE_CPPFLAGS="-I$readline/include -I$readline/include/readline $READLINE_CPPFLAGS"
! 	READLINE_LIBS="-L$readline/lib $READLINE_LIBS"
!     elif test -d /usr/include/readline; then
! 	# Yeah, this isn't too clean.  Oh well.
! 	READLINE_CPPFLAGS="-I/usr/include/readline $READLINE_CPPFLAGS"
      fi
  fi
  AC_SUBST(READLINE_CPPFLAGS)

-- 
Aaron M. Ucko, KB1CJC <amu@mit.edu> (finger amu@monk.mit.edu)

home help back first fref pref prev next nref lref last post