diff options
| author | Guillem Jover <guillem@debian.org> | 2016-06-26 02:12:32 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2016-07-03 21:02:26 +0200 |
| commit | 067295e958dcc9af87d2adfd0c697e9f87ef7b73 (patch) | |
| tree | 13b31e952fbde6386a8e25de46c649b5bc13cb35 /lib | |
| parent | 785c8a5f78ef757836884ed1acbf6e9171822a53 (diff) | |
| download | dpkg-067295e958dcc9af87d2adfd0c697e9f87ef7b73.tar.gz | |
build: Uniformize library build options
Make all of them consistently follow the pattern --with-lib<name>.
Rename the m4 macros, preprocessor defines, and automake _LIBS flags.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compat/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/dpkg/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/dpkg/compress.c | 10 | ||||
| -rw-r--r-- | lib/dpkg/libdpkg.pc.in | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am index 981dc8128..3cb1e0b0d 100644 --- a/lib/compat/Makefile.am +++ b/lib/compat/Makefile.am @@ -23,7 +23,7 @@ if HAVE_SYS_ERRLIST libcompat_test_la_SOURCES += strerror.c endif -if WITH_SELINUX +if WITH_LIBSELINUX libcompat_test_la_SOURCES += selinux.c endif @@ -64,7 +64,7 @@ if !HAVE_STRSIGNAL libcompat_la_SOURCES += strsignal.c endif -if WITH_SELINUX +if WITH_LIBSELINUX if !HAVE_SETEXECFILECON libcompat_la_SOURCES += selinux.c endif diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index a031b5617..b8d049ce0 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -34,8 +34,8 @@ libdpkg_la_LIBADD = \ if BUILD_SHARED libdpkg_la_LIBADD += \ $(LIBINTL) \ - $(ZLIB_LIBS) \ - $(LIBLZMA_LIBS) \ + $(Z_LIBS) \ + $(LZMA_LIBS) \ $(BZ2_LIBS) endif libdpkg_la_DEPENDENCIES = \ diff --git a/lib/dpkg/compress.c b/lib/dpkg/compress.c index 9386bab9c..2eda658fa 100644 --- a/lib/dpkg/compress.c +++ b/lib/dpkg/compress.c @@ -29,13 +29,13 @@ #include <stdbool.h> #include <stdlib.h> -#ifdef WITH_ZLIB +#ifdef WITH_LIBZ #include <zlib.h> #endif #ifdef WITH_LIBLZMA #include <lzma.h> #endif -#ifdef WITH_BZ2 +#ifdef WITH_LIBBZ2 #include <bzlib.h> #endif @@ -47,7 +47,7 @@ #include <dpkg/buffer.h> #include <dpkg/command.h> #include <dpkg/compress.h> -#if !defined(WITH_ZLIB) || !defined(WITH_LIBLZMA) || !defined(WITH_BZ2) +#if !defined(WITH_LIBZ) || !defined(WITH_LIBLZMA) || !defined(WITH_LIBBZ2) #include <dpkg/subproc.h> static void DPKG_ATTR_SENTINEL @@ -145,7 +145,7 @@ fixup_gzip_params(struct compress_params *params) params->type = COMPRESSOR_TYPE_NONE; } -#ifdef WITH_ZLIB +#ifdef WITH_LIBZ static void decompress_gzip(int fd_in, int fd_out, const char *desc) { @@ -278,7 +278,7 @@ fixup_bzip2_params(struct compress_params *params) params->level = 1; } -#ifdef WITH_BZ2 +#ifdef WITH_LIBBZ2 static void decompress_bzip2(int fd_in, int fd_out, const char *desc) { diff --git a/lib/dpkg/libdpkg.pc.in b/lib/dpkg/libdpkg.pc.in index 4409521a8..4bf1b72be 100644 --- a/lib/dpkg/libdpkg.pc.in +++ b/lib/dpkg/libdpkg.pc.in @@ -7,5 +7,5 @@ Name: libdpkg Description: Debian package management system library Version: @VERSION@ Libs: -L${libdir} -ldpkg -Libs.private: @MD_LIBS@ @ZLIB_LIBS@ @LIBLZMA_LIBS@ @BZ2_LIBS@ +Libs.private: @MD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @BZ2_LIBS@ Cflags: -I${includedir} |