From: Richard Levitte Date: Thu, 25 Sep 2008 12:01:59 +0000 (+0000) Subject: Handle the presence of yubikey-core, and make sure it gets configured as well X-Git-Tag: yubikey-personalisation_1.3.5-1~4^2~212 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2474780888300b5ff73199bb01bf4ecaa264d49;p=yubikey-personalization Handle the presence of yubikey-core, and make sure it gets configured as well --- diff --git a/Makefile.am b/Makefile.am index eb73676..e2a1dd2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,23 +29,25 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# The library. +# Subdirectories + +SUBDIRS=@subdirs@ -COMMON_SOURCES = common/ykutil.c common/yubikey.c common/aes128.c +# The library. lib_LTLIBRARIES = libykpers.la libykpers_la_SOURCES = ykpers.h ykpers.c $(COMMON_SOURCES) -libykpers_la_CFLAGS = -Icommon +libykpers_la_CFLAGS = -I./yubikey-core libykpers_la_LDFLAGS = -no-undefined \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -noinst_HEADERS = common/ykdef.h common/ykutil.h common/yubikey.h common/aes128.h - # The command line tools. bin_PROGRAMS = ykpersonalize ykpersonalize_SOURCES = ykpersonalize.c +ykpersonalize_CFLAGS = -I./yubikey-core +ykpersonalize_LDFLAGS = -lusb ./yubikey-core/libykcore.a ykpersonalize_LDADD = ./libykpers.la # Self tests. diff --git a/configure.ac b/configure.ac index 7ff9e4d..ea6fe2a 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,16 @@ AC_PROG_CC AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL +# This really checks a directory +AC_CHECK_FILE(yubikey-core/configure.ac,,AC_MSG_FAILURE(yubikey-core directory not found. + +************************************ +Please provide by checking out http://yubikey-core.googlecode.com/svn/trunk +with svn and creating a symbolic link `yubikey-core' to that checkout +************************************ +)) #AC_SEARCH_LIBS([yubikey_parse],[yubikey],,AC_MSG_FAILURE(libyubikey not found)) +AC_CONFIG_SUBDIRS(yubikey-core) AC_CONFIG_FILES(Makefile) AC_OUTPUT