Skip to content

Commit

Permalink
Remove readline dependency from OMCompiler
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed Oct 26, 2015
1 parent ab452a3 commit 93d872f
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions configure.ac
Expand Up @@ -45,7 +45,6 @@ AC_SUBST(OMPCC)
AC_SUBST(RUNTIMECC)
AC_SUBST(RUNTIMECFLAGS)
AC_SUBST(MAKE)
AC_SUBST(LIBREADLINE)
AC_SUBST(LD_LAPACK)
AC_SUBST(NO_LAPACK)
AC_SUBST(WITH_SUNDIALS)
Expand Down Expand Up @@ -301,38 +300,6 @@ else
AC_MSG_ERROR([no antlr.Tool support (JRE not working)])
fi

AC_MSG_CHECKING([if the user wants to compile OMShell-terminal])
OMSHELL_TERMINAL="mosh"
AC_ARG_ENABLE(omshell-terminal, [ --disable-omshell-terminal Disables compilation of OMShell-terminal (enabled by default)],[test "xno" = x"$enableval" && OMSHELL_TERMINAL=""])
if test -z "$OMSHELL_TERMINAL" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
AC_CHECK_HEADER(readline/readline.h,,AC_MSG_ERROR([readline missing]))
AC_CHECK_HEADER(readline/history.h,,AC_MSG_ERROR([readline missing]))

AC_ARG_WITH(static-readline, [ --with-static-readline=DIR (default to dynamic linking; searches /usr if no other directory is provided)],[WANT_STATIC_READLINE="$withval"],[WANT_STATIC_READLINE="no"])

if test "$WANT_STATIC_READLINE" = "no"; then
LIBS=""
AC_SEARCH_LIBS(readline,readline,,[AC_MSG_ERROR([readline missing])])
LIBREADLINE=$LIBS
LIBS=""
else
if test "$WANT_STATIC_READLINE" = "yes"; then
READLINELIB=/usr/lib;
else
READLINELIB=$WANT_STATIC_READLINE/lib
fi
test -f $READLINELIB/*/libreadline.a && READLINELIB=`dirname $READLINELIB/*/libreadline.a`
LIBS="-lncurses $READLINELIB/libreadline.a -ltermcap"
AC_MSG_CHECKING([for static readline $LIBS])
AC_LINK_IFELSE([AC_LANG_CALL([], [rl_message])], [LIBREADLINE=$LIBS], [AC_MSG_ERROR([failed])])
AC_MSG_RESULT([ok])
LIBS=""
fi
fi

dnl Misc. headers

AC_CHECK_HEADER(expat.h,,AC_MSG_ERROR([expat missing]))
Expand Down

0 comments on commit 93d872f

Please sign in to comment.