Make it build with new automake

Change-Id: I43776536ede739798dea1b85a10e9d7f255697c0

diff --git a/Makefile.am b/Makefile.am
index 063cbb3..8b241f6 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ pcfiles = uw-imap-toolkit.pc
 all: 
 all-local: $(pcfiles)
 
-%.pc: %.pc
+SUFFIXES: .pc
        cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/configure.ac b/configure.ac
index 30f1dc2..e1f6b2e 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
+ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL

diff --git a/uw-imap-toolkit.pc.in b/uw-imap-toolkit.pc.in
index 428b978..9ed78c6 100755 (executable)
--- a/uw-imap-toolkit.pc.in
+++ b/uw-imap-toolkit.pc.in
@@ -1,5 +1,5 @@
 prefix=@prefix@\r
-libdir=@prefix@/lib\r
+libdir=@libdir@\r
 includedir=@prefix@/include\r
  \r
 Name: IMAP Toolkit Library \r