X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=57b2a090601942a72b0271b78b1e1c8055787eea;hp=5299ab3ee5490675d3be999ae10cbbe4792e8d18;hb=979da669432983d6fedecbd004d6dd20f46486dc;hpb=d7783603566abe1a1784cd3cc25f0ab16bc2b8d5

diff --git a/configure.in b/configure.in
index 5299ab3..57b2a09 100644
--- a/configure.in
+++ b/configure.in
@@ -161,16 +161,15 @@ then
 	READLINE=""
 	echo "Not including readline support"
 else
-	READLINE="-lreadline -ltermcap"
+	READLINE="yes"
 	AC_DEFINE([HAVE_READLINE],1,[Define if you want to include readline support.])
 	echo "Including readline support"
 fi
 ,
-READLINE="-lreadline -ltermcap"
+READLINE="yes"
 AC_DEFINE([HAVE_READLINE],1,[Define if you want to include readline support.])
 echo "Including readline support by default"
 )
-AC_SUBST(READLINE)
 
 dnl
 dnl Handle --enable-oldsylefscript
@@ -432,25 +431,47 @@ AC_TRY_COMPILE([#include <stdio.h>
 AC_MSG_RESULT(no))
 
 dnl
-dnl Check for termcap libraries
+dnl Check for blkid headers libraries
+dnl
+AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-])
+AC_CHECK_LIB(blkid, blkid_get_devname, [blkid_lib=yes], [blkid_lib=no], [-luuid])
+if test "$blkid_h" = yes -a "$blkid_lib" = yes; then
+	AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
+	BLKID="-lblkid -luuid"
+fi
+AC_SUBST(BLKID)
+
+dnl
+dnl Check for ncurses or termcap libraries
 dnl
+AC_CHECK_LIB(ncurses, tgetent, [ncurses_lib=yes], [ncurses_lib=no])
 AC_CHECK_LIB(termcap, tgetent, [termcap_lib=yes], [termcap_lib=no])
-if test "$termcap_lib" = no; then
-	if test "$READLINE" = "-lreadline -ltermcap"; then
-		AC_MSG_ERROR(You need to install the GNU termcap library or configure without --enable-readline)
+
+if test "$ncurses_lib" = no -a "$termcap_lib" = no; then
+	if test "$READLINE" = "yes"; then
+		AC_MSG_ERROR(You need to install the ncurses or termcap library or configure without --enable-readline)
 	fi
 fi
+if test "$ncurses_lib" = yes; then
+	rdllib="-lncurses"
+elif test "$termcap_lib" = yes; then
+	rdllib="-ltermcap"
+fi
 
 dnl
 dnl Check for readline headers and libraries
 dnl
 AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no], [-])
-AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], "-ltermcap")
+AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], $rdllib)
 if test "$readline_h" = no -o "$readline_lib" = no; then
-	if test "$READLINE" = "-lreadline -ltermcap"; then
+	if test "$READLINE" = "yes"; then
 		AC_MSG_ERROR(You need to install the GNU readline library or configure without --enable-readline)
 	fi
 fi
+if test "$READLINE" = yes; then
+	READLINE="-lreadline $rdllib"
+fi
+AC_SUBST(READLINE)
 
 dnl
 dnl Check for rl_completion_matches