[pacman-dev] [PATCH 1/2] configure.ac: Use POSIX compatible equality checks
--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 63f87d1..10e4415 100644 --- a/configure.ac +++ b/configure.ac @@ -222,13 +222,13 @@ PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , # Check for OpenSSL have_openssl=no have_nettle=no -if test "x$with_crypto" == "xnettle"; then +if test "x$with_crypto" = "xnettle"; then PKG_CHECK_MODULES(NETTLE, [nettle], [AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no) if test "x$have_nettle" = xno -a "x$with_crypto" = xnettle; then AC_MSG_ERROR([*** nettle support requested but libraries not found]) fi -else if test "x$with_crypto" == "xopenssl"; then +else if test "x$with_crypto" = "xopenssl"; then PKG_CHECK_MODULES(LIBSSL, [libcrypto], [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no) if test "x$have_openssl" = xno; then -- 2.10.2
Fixes build on ubuntu/debian platforms. --- src/pacman/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 14572cd..8999f2b 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -47,6 +47,9 @@ pacman_SOURCES = \ util.h util.c \ util-common.h util-common.c -LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la +pacman_LDADD = \ + $(LTLIBINTL) \ + $(top_builddir)/lib/libalpm/.libs/libalpm.la \ + $(LIBARCHIVE_LIBS) # vim:set noet: -- 2.10.2
On 11/12/16 11:12, Dave Reisner wrote:
Fixes build on ubuntu/debian platforms. ---
OK. I wonder what is different across platforms that breaks this...
src/pacman/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 14572cd..8999f2b 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -47,6 +47,9 @@ pacman_SOURCES = \ util.h util.c \ util-common.h util-common.c
-LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la +pacman_LDADD = \ + $(LTLIBINTL) \ + $(top_builddir)/lib/libalpm/.libs/libalpm.la \ + $(LIBARCHIVE_LIBS)
# vim:set noet:
On 11/12/16 11:12, Dave Reisner wrote:
--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
OK.
participants (2)
-
Allan McRae
-
Dave Reisner