From: simon75j Date: Wed, 25 Mar 2009 09:09:52 +0000 (+0000) Subject: Work with libtool 2.2.x. X-Git-Tag: yubikey-personalisation_0.97-1~114 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edbb7a13d396efae6e7af811ae03562c8fc276c5;p=yubikey-personalization Work with libtool 2.2.x. git-svn-id: https://yubikey-personalization.googlecode.com/svn/trunk@49 b62f149e-849f-11dd-9899-c7ba65f7c4c7 --- diff --git a/Makefile.am b/Makefile.am index 678091d..7a324a8 100644 --- 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 ce462fd..283e933 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Written by Richard Levitte . -# 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.