[Pcsclite-cvs-commit] CVS PCSC

[CVS User rousseau]

Update of /cvsroot/pcsclite/PCSC
In directory haydn:/tmp/cvs-serv32392

Modified Files:
	Makefile.am configure.in 
Log Message:
move *.m4 files from aclocal/ to m4/


--- /cvsroot/pcsclite/PCSC/Makefile.am	2004/06/11 08:05:52	1.14
+++ /cvsroot/pcsclite/PCSC/Makefile.am	2005/01/16 17:36:48	1.15
@@ -1,6 +1,8 @@
 # Process this file with automake to create Makefile.in.
 
-SUBDIRS = aclocal win32 src etc doc
+SUBDIRS = m4 win32 src etc doc
+
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = DRIVERS SECURITY bootstrap HELP ChangeLog.cvs
 
--- /cvsroot/pcsclite/PCSC/configure.in	2004/10/06 07:10:07	1.65
+++ /cvsroot/pcsclite/PCSC/configure.in	2005/01/16 17:36:49	1.66
@@ -1,14 +1,15 @@
 dnl -*- mode: m4; -*-
 dnl Process this file with autoconf to produce a configure script
 
-# Require autoconf 2.52
-AC_PREREQ(2.52)
+AC_PREREQ(2.58)
 
 AC_INIT(pcsc-lite, 1.2.9-beta7)
 AC_CONFIG_SRCDIR(src/pcscdaemon.c)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(1.8)
 AM_CONFIG_HEADER(config.h)
 
+AC_CONFIG_MACRO_DIR(m4)
+
 AC_CANONICAL_HOST
 AC_PROG_CC
 AC_C_BIGENDIAN
@@ -331,9 +332,9 @@
 AS_AC_EXPAND(localstatedir_exp,$localstatedir)
 
 dnl Write Makefiles
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
-aclocal/Makefile
+m4/Makefile
 doc/Makefile
 doc/pcscd.8
 doc/reader.conf.5
@@ -348,3 +349,5 @@
 src/utils/Makefile
 win32/Makefile
 ])
+AC_OUTPUT
+