2006-10-30 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac (PACKAGE, VERSION): Define these variables.
	* src/Makefile.am (libscute_la_CPPFLAGS): Fix include path for
	VPATH builds.

ChangeLog

@@ -1,5 +1,9 @@
 2006-10-30  Marcus Brinkmann  <marcus@g10code.de>
 
+	* configure.ac (PACKAGE, VERSION): Define these variables.
+	* src/Makefile.am (libscute_la_CPPFLAGS): Fix include path for
+	VPATH builds.
+
 	* configure.ac (VERSION_MAJOR, VERSION_MINOR): New variable
 	definitions.
 	* src/gpgsm.h: Fix syntax error.

configure.ac

@@ -45,6 +45,9 @@ NEED_GPGSM_VERSION=1.9.6
 have_gpg_error=no
 have_libassuan=no
 
+PACKAGE=$PACKAGE_NAME
+VERSION=$PACKAGE_VERSION
+
 AC_CONFIG_SRCDIR([src/cryptoki.h])
 AC_CONFIG_HEADER([config.h])
 

src/Makefile.am

@@ -45,7 +45,8 @@ endif
 libscute_la_LDFLAGS = $(scute_version_script_cmd) -version-info \
   @LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
 
-libscute_la_CPPFLAGS = -I../include @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
+libscute_la_CPPFLAGS = -I$(srcdir)/../include \
+	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
 libscute_la_LIBADD = @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
 libscute_la_SOURCES = cryptoki.h debug.h settings.h support.h		\
 	locking.h locking.c error-mapping.h error-mapping.c		\