X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=configure.in;h=23abf0fe90d6299aa7e831b708bbb35279525e10;hp=a99ea2f26a1f90bac4716c9aeffac7131084e6e6;hb=dbb649e870428cffea2583ed34233d0239b80992;hpb=e4a8bde40a6d8319d1b28e054e1a419ba3df2363

diff --git a/configure.in b/configure.in
index a99ea2f..23abf0f 100644
--- a/configure.in
+++ b/configure.in
@@ -202,9 +202,10 @@ dnl
 AC_ARG_WITH([ldopts],
 [  --with-ldopts=LDOPTS       select linker command line options],
 AC_MSG_RESULT(LDFLAGS is $withval)
-LDFLAGS=$withval,
-LDFLAGS=)dnl
-AC_SUBST(LDFLAGS)
+LDOPTS=$withval
+LDFLAGS="$LDFLAGS $withval",
+LDOPTS=)dnl
+AC_SUBST(LDOPTS)
 
 dnl
 dnl set $(BINOWNER) from --with-binowner
@@ -340,7 +341,7 @@ dnl
 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 libraries first)
+		AC_MSG_ERROR(You need to install the GNU termcap library or configure without --enable-readline)
 	fi
 fi
 
@@ -351,10 +352,26 @@ AC_CHECK_HEADER(readline/readline.h, [readline_h=yes], [readline_h=no])
 AC_CHECK_LIB(readline, readline, [readline_lib=yes], [readline_lib=no], "-ltermcap")
 if test "$readline_h" = no -o "$readline_lib" = no; then
 	if test "$READLINE" = "-lreadline -ltermcap"; then
-		AC_MSG_ERROR(You need to install the GNU readline libraries first)
+		AC_MSG_ERROR(You need to install the GNU readline library or configure without --enable-readline)
 	fi
 fi
 
+dnl
+dnl Check for rl_completion_matches
+dnl
+AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "-ltermcap")
+if test "$rlcm" = yes; then
+	AC_DEFINE(HAVE_READLINE_RLCM)
+fi
+
+dnl
+dnl Check for rl_completion_append_character
+dnl
+AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "-ltermcap")
+if test "$rcac" = yes; then
+	AC_DEFINE(HAVE_READLINE_CAC)
+fi
+
 dnl
 dnl Check for zlib headers and libraries
 dnl
@@ -368,6 +385,19 @@ else
 fi
 AC_SUBST(ZLIB)
 
+dnl
+dnl Check for bzlib headers and libraries
+dnl
+AC_CHECK_HEADER(bzlib.h, [bzlib_h=yes], [bzlib_h=no])
+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [bzlib_lib=yes], [bzlib_lib=no])
+if test "$bzlib_h" = yes -a "$bzlib_lib" = yes; then
+	BZLIB="-lbz2"
+	AC_DEFINE(HAVE_BZLIB)
+else
+	BZLIB=""
+fi
+AC_SUBST(BZLIB)
+
 dnl
 dnl Check for library functions
 dnl
@@ -399,8 +429,8 @@ fi
 dnl
 dnl Check for types
 dnl
-AC_CHECK_TYPE(quad_t, __s64)
-AC_CHECK_TYPE(u_quad_t, __u64)
+AC_CHECK_TYPE(quad_t, int64_t)
+AC_CHECK_TYPE(u_quad_t, uint64_t)
 
 dnl
 dnl Compute top_buildir