From 44009cd4d48fd16caee4fb00f0106153a4a4a194 Mon Sep 17 00:00:00 2001 From: kanoi Date: Fri, 5 Dec 2014 17:30:54 +1100 Subject: [PATCH] remove ckdb bzip2 build requirement --- configure.ac | 8 +------- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 32de3b12..65d311c0 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,6 @@ AC_CHECK_HEADERS(alloca.h pthread.h stdio.h math.h signal.h sys/prctl.h) AC_CHECK_HEADERS(sys/types.h sys/socket.h sys/stat.h linux/un.h netdb.h) AC_CHECK_HEADERS(stdint.h netinet/in.h netinet/tcp.h sys/ioctl.h getopt.h) AC_CHECK_HEADERS(sys/epoll.h libpq-fe.h postgresql/libpq-fe.h grp.h) -AC_CHECK_HEADERS(bzlib.h) PTHREAD_LIBS="-lpthread" MATH_LIBS="-lm" @@ -60,18 +59,13 @@ AC_ARG_WITH([ckdb], if test "x$ckdb" != "xno"; then AC_CHECK_LIB([pq], [main],[PQ=-lpq],echo "Error: Required library libpq-dev not found. Install it or disable postgresql support with --without-ckdb" && exit 1) - AC_CHECK_LIB([bz2], [main],[BZ2=-lbz],echo "Error: Required library libbz - not found. Install it or disable libbz2 support with --without-ckdb" && exit 1) AC_DEFINE([USE_CKDB], [1], [Defined to 1 if ckdb support required]) PQ_LIBS="-lpq" - BZ2_LIBS="-lbz2" else PQ_LIBS="" - BZ2_LIBS="" fi AM_CONDITIONAL([WANT_CKDB], [test "x$ckdb" != "xno"]) AC_SUBST(PQ_LIBS) -AC_SUBST(BZ2_LIBS) AC_OUTPUT([Makefile] [src/Makefile]) @@ -81,7 +75,7 @@ echo " CPPFLAGS.............: $CPPFLAGS" echo " CFLAGS...............: $CFLAGS" echo " LDFLAGS..............: $LDFLAGS" echo " LDADD................: $PTHREAD_LIBS $MATH_LIBS $RT_LIBS $JANSSON_LIBS" -echo " db LDADD.............: $PQ_LIBS $BZ2_LIBS" +echo " db LDADD.............: $PQ_LIBS" echo echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" echo " prefix...............: $prefix" diff --git a/src/Makefile.am b/src/Makefile.am index 0dd0d50c..5e032e62 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,5 +23,5 @@ if WANT_CKDB bin_PROGRAMS += ckdb ckdb_SOURCES = ckdb.c ckdb_cmd.c ckdb_data.c ckdb_dbio.c ckdb_btc.c \ ckdb.h klist.c ktree.c klist.h ktree.h -ckdb_LDADD = libckpool.la @JANSSON_LIBS@ @PQ_LIBS@ @BZ2_LIBS@ +ckdb_LDADD = libckpool.la @JANSSON_LIBS@ @PQ_LIBS@ endif