Work with libtool 2.2.x.

diff --git a/Makefile.am b/Makefile.am
index 678091d4159d98980c82fac617d6356901a70ad2..7a324a88925f1233a2f85581e7ea69c9c41d6775 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,8 @@
 
 SUBDIRS=@subdirs@
 
+ACLOCAL_AMFLAGS = -I m4
+
 AM_CPPFLAGS = -I./yubikey-core -I./rfc4634
 
 # The library.

diff --git a/configure.ac b/configure.ac
index ce462fd21a0dc357cf7b7c5283159df4e1d8e43f..283e93307c1dfd3375a26c330d1a3acf397a5f4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Written by Richard Levitte <richard@levitte.org>.
-# Copyright (c) 2008, Yubico AB
+# Copyright (c) 2008, 2009, Yubico AB
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_PROG_CC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
+AC_CONFIG_MACRO_DIR([m4])
 
 # This really checks a directory
 AC_CHECK_FILES([yubikey-core/configure.ac yubikey-core/ykcore.h],,AC_MSG_FAILURE(yubikey-core directory not found.