From 2546a35cd5d8671054b8ab99d760824fc5fc7b9d Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 28 Dec 2006 16:54:35 +0000 Subject: Configuration changes: * Added libdownload check in configure.ac * Added generation for mirrorlists in pacman.d NOTE: autoconf sucks for things like this, so gen-mirrorlist is required MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dan McGee : * mirrorlist.in file Roman Kyrylych : * ukrainian mirror Jürgen Hötzel : * conditional build for pacman.static --- configure.ac | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index af741d1d..44627fd2 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ AC_HEADER_STDC AC_PROG_INSTALL AC_CHECK_FUNCS([strverscmp]) AM_PROG_LIBTOOL +AM_CONDITIONAL(LINKSTATIC, test "$enable_static" = "yes") dnl Humor lowers blood pressure AC_MSG_CHECKING(your blood pressure) @@ -314,6 +315,14 @@ else AC_MSG_ERROR("libarchive is needed to compile pacman!"); fi +dnl Check for libdownload +AC_CHECK_LIB([download], [downloadParseURL], [AC_CHECK_HEADER([download.h], [LIBDOWNLOAD='-ldownload'])]) +if test -n "$LIBDOWNLOAD"; then + LDFLAGS="$LDFLAGS $LIBDOWNLOAD" +else + AC_MSG_ERROR("libdownload is needed to compile pacman!"); +fi + dnl Set config location AC_MSG_CHECKING(for configuration file name) if test -n "$configfile"; then @@ -363,33 +372,38 @@ etc/Makefile etc/makepkg.conf etc/pacman.conf etc/pacman.d/Makefile +etc/pacman.d/mirrorlist etc/abs/Makefile bindings/perl/Makefile bindings/python/Makefile bindings/java/Makefile Makefile +], +[ + cd etc/pacman.d/ + ./gen-mirrorlist.sh ]) echo " pacman-$VERSION: - prefix : ${prefix} - source code location : ${srcdir} - compiler : ${CC} - compiler flags : ${CFLAGS} + prefix : ${prefix} + source code location : ${srcdir} + compiler : ${CC} + compiler flags : ${CFLAGS} - libalpm version : ${PM_VERSION} - pacman.conf location : ${configfile} + libalpm version : ${PM_VERSION} + pacman.conf location : ${configfile} - Architecture CARCH : ${CARCH} - Architecture used cflag : ${CARCHFLAGS} - Architecture CHOST : ${CHOST} + Architecture CARCH : ${CARCH} + Architecture used cflag : ${CARCHFLAGS} + Architecture CHOST : ${CHOST} - Doxygen support : ${DOXYSTATUS} - Manpage localization : ${POSTATUS} - Perl bindings : ${PERLSTATUS} - Python bindings : ${PYTHONSTATUS} - Java bindings : ${JAVASTATUS} + Doxygen support : ${DOXYSTATUS} + Manpage localization : ${POSTATUS} + Perl bindings : ${PERLSTATUS} + Python bindings : ${PYTHONSTATUS} + Java bindings : ${JAVASTATUS} - debug support : ${debug} + debug support : ${debug} " -- cgit v1.2.3-24-g4f1b