diff options
| author | Dan McGee <dan@archlinux.org> | 2008-04-19 19:36:18 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-04-19 23:18:17 +0200 |
| commit | 7a873a8f1284058c968c5d8026fbde7867913cb5 (patch) | |
| tree | bcb53ded41e969fc17955cbc459d632a832415f0 /configure.ac | |
| parent | 64e1dd64a4512a5faa34e6007e64314569593522 (diff) | |
| download | pacman-7a873a8f1284058c968c5d8026fbde7867913cb5.tar.gz pacman-7a873a8f1284058c968c5d8026fbde7867913cb5.tar.xz | |
Give libalpm native support for both libdownload and libfetch
This should remove the need for any additional patching to run on platforms
that have libfetch available but not libdownload. It isn't the prettiest,
but we have kept our libdownload impact down to just a few files, so it can
be easily done.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index aeec3f15..27efd170 100644 --- a/configure.ac +++ b/configure.ac @@ -145,20 +145,23 @@ AC_CHECK_LIB([archive], [archive_read_data], , AC_MSG_ERROR([libarchive is needed to compile pacman!])) # Enable or disable usage of libdownload/libfetch +# - this is a nested check- first see if we need a library, if we do then +# check for libdownload first, then fallback to libfetch, then die AC_MSG_CHECKING(whether to link with download library) if test "x$internaldownload" = "xyes" ; then AC_MSG_RESULT(yes) AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library]) - # Check for libdownload if it was actually requested + # Check for a download library if it was actually requested AC_CHECK_LIB([download], [downloadParseURL], , - AC_MSG_ERROR([libdownload is needed to compile pacman!])) + AC_CHECK_LIB([fetch], [fetchParseURL], , + AC_MSG_ERROR([libdownload or libfetch are needed to compile with internal download support])) ) else AC_MSG_RESULT(no) fi AM_CONDITIONAL(INTERNAL_DOWNLOAD, test "x$internaldownload" = "xyes") # Checks for header files. -AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/statvfs.h sys/time.h syslog.h wchar.h]) +AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h sys/time.h syslog.h wchar.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE |