[v2] readline: Drop obsolete code, add pkg-config support

[libvirt] [PATCH v2 2/7] m4: readline: Fix indentation

Posted by Andrea Bolognani 6 years, 10 months ago

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 m4/virt-readline.m4 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4
index 34b3ff3c4a..4823a27788 100644
--- a/m4/virt-readline.m4
+++ b/m4/virt-readline.m4
@@ -32,8 +32,7 @@ AC_DEFUN([LIBVIRT_CHECK_READLINE],[
     AC_SEARCH_LIBS([tgetent], [ncurses curses termcap termlib])
     case $LIBS in
       no*) ;;  # handle "no" and "none required"
-      *) # anything else is a -lLIBRARY
-	extra_LIBS=$LIBS ;;
+      *) extra_LIBS=$LIBS ;; # anything else is a -lLIBRARY
     esac
     LIBS="$lv_saved_libs $extra_LIBS"
   fi
@@ -41,7 +40,7 @@ AC_DEFUN([LIBVIRT_CHECK_READLINE],[
   AC_CHECK_DECLS([rl_completion_quote_character],
                  [], [],
                  [[#include <stdio.h>
-                  #include <readline/readline.h>]])
+                   #include <readline/readline.h>]])
 
   if test "$ac_cv_have_decl_rl_completion_quote_character" = "no" ; then
     if test "$with_readline" = "yes" ; then
@@ -58,9 +57,9 @@ AC_DEFUN([LIBVIRT_CHECK_READLINE],[
   # function, to ensure we aren't being confused by caching.
   LIBS=$lv_saved_libs
   AC_CHECK_LIB([readline], [rl_initialize],
-    [READLINE_CFLAGS="-D_FUNCTION_DEF $READLINE_CFLAGS"
-     AC_SUBST(READLINE_CFLAGS)],
-    [READLINE_LIBS="$READLINE_LIBS $extra_LIBS"])
+               [READLINE_CFLAGS="-D_FUNCTION_DEF $READLINE_CFLAGS"
+                AC_SUBST(READLINE_CFLAGS)],
+               [READLINE_LIBS="$READLINE_LIBS $extra_LIBS"])
   LIBS=$lv_saved_libs
 ])
 
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 2/7] m4: readline: Fix indentation

Posted by Daniel P. Berrangé 6 years, 10 months ago

On Tue, Apr 09, 2019 at 04:27:45PM +0200, Andrea Bolognani wrote:
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  m4/virt-readline.m4 | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list