colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix wrongly linking against libreadline in all applications

Browse Source 
Every Makefile in the subtrees would include -lreadline
as part of LIBS, hence every application would link against
the library.

This was broken since we added 'm4/ax_lib_readline.m4'.

Fixes: 29297f8531
This commit is contained in:
Thomas Haller
2014-11-26 11:40:40 +01:00
parent f32075d2fc
commit 94274c6fcd
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
m4/ax_lib_readline.m4
View File

@@ -90,6 +90,7 @@ AC_DEFUN([AX_LIB_READLINE], [
AC_MSG_ERROR([readline library with terminfo support is required (one of ncurses, curses, or termcap)]) AC_MSG_ERROR([readline library with terminfo support is required (one of ncurses, curses, or termcap)])
fi fi
ORIG_LIBS="$LIBS"
LIBS="$LIBS $ax_cv_lib_readline" LIBS="$LIBS $ax_cv_lib_readline"
AC_CHECK_HEADERS(readline.h readline/readline.h) AC_CHECK_HEADERS(readline.h readline/readline.h)
@@ -114,6 +115,7 @@ AC_DEFUN([AX_LIB_READLINE], [
AC_MSG_ERROR(rl_echo_signal_char() is required (install readline6?)) AC_MSG_ERROR(rl_echo_signal_char() is required (install readline6?))
fi fi
LIBS="$ORIG_LIBS"
READLINE_LIBS="$ax_cv_lib_readline" READLINE_LIBS="$ax_cv_lib_readline"
AC_SUBST(READLINE_LIBS) AC_SUBST(READLINE_LIBS)
])dnl ])dnl