[Pcsclite-cvs-commit] PCSC Makefile.am,1.10,1.11 bootstrap,1.8,1.9 configure.in,1.33,1.34 reconf,1.4,NONE

[aet-guest@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC
In directory quantz:/tmp/cvs-serv18090

Modified Files:
	Makefile.am bootstrap configure.in 
Removed Files:
	reconf 
Log Message:
- Simplify the bootstrapping mechanism
- Remove reconf


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	7 Sep 2003 20:28:53 -0000	1.10
+++ Makefile.am	11 Sep 2003 10:00:05 -0000	1.11
@@ -1,39 +1,10 @@
 # Process this file with automake to create Makefile.in.
 
-SUBDIRS = src etc doc
-
-AUX_DIST = \
-	$(ac_aux_dir)/aclocal.m4 \
-	$(ac_aux_dir)/config.guess \
-	$(ac_aux_dir)/config.sub \
-	$(ac_aux_dir)/depcomp \
-	$(ac_aux_dir)/install-sh \
-	$(ac_aux_dir)/ltmain.sh \
-	$(ac_aux_dir)/missing \
-	$(ac_aux_dir)/mkinstalldirs \
-	$(ac_aux_dir)/ylwrap
-
-WIN32 = \
-	win32/PCSC.cpp \
-	win32/PCSC.dsp \
-	win32/PCSC.h \
-	win32/pthread.h \
-	win32/sched.h \
-	win32/StdAfx.cpp \
-	win32/StdAfx.h \
-	win32/win32_config.h \
-	win32/win32_pcsclite.h
+SUBDIRS = aclocal win32 src etc doc
 
-EXTRA_DIST = DRIVERS SECURITY reconf bootstrap HELP ChangeLog.cvs \
-	$(AUX_DIST) $(ac_aux_dir)/acx_pthread.m4 $(WIN32)
+EXTRA_DIST = DRIVERS SECURITY bootstrap HELP ChangeLog.cvs
 
-MAINTAINERCLEANFILES = $(AUX_DIST)
 DISTCLEANFILES = ChangeLog.cvs
-
-# Automatically update the libtool script if it becomes out-of-date.
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
 
 ChangeLog.cvs:
 	rcs2log | perl -e 'while (<>) { s/corcoran /David Corcoran /; \

Index: bootstrap
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/bootstrap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bootstrap	14 Aug 2003 16:35:41 -0000	1.8
+++ bootstrap	11 Sep 2003 10:00:05 -0000	1.9
@@ -1,40 +1,11 @@
-#! /bin/sh
-
-# $Id$
-
-# I use
-# - autoconf (GNU Autoconf) 2.57
-# - automake (GNU automake) 1.7.3
-# - ltmain.sh (GNU libtool) 1.4.3 (1.922.2.111 2002/10/23 02:54:36)
-
-ac_aux_dir=build
+#!/bin/sh
 
 set -e
 set -x
-
-# some cleanup
-if [ -e Makefile ]
-then
+if test -f Makefile; then
   make distclean
 fi
-rm -f $ac_aux_dir/aclocal.m4 aclocal.m4
-rm -f config.h.in
-rm -rf autom4te.cache
-
-aclocal -I $ac_aux_dir --output=$ac_aux_dir/aclocal.m4
-
-libtoolize --copy --force
-# cp -f ~/cvs/config/config.guess ~/cvs/config/config.sub build/
-
-autoheader --include=$ac_aux_dir
-
-# needed otherwise automake says
-# no proper implementation of AM_INIT_AUTOMAKE was found,
-ln $ac_aux_dir/aclocal.m4
-
-autoconf --include=$ac_aux_dir #--warnings=all #--verbose
-automake --add-missing --copy #--verbose
-
-# remove now useless file
-#rm $ac_aux_dir/aclocal.m4
-
+rm -rf *.cache *.m4 config.guess config.log \
+config.status config.sub depcomp ltmain.sh
+(cat aclocal/*.m4 > acinclude.m4 2> /dev/null)
+autoreconf --verbose --install

Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- configure.in	8 Sep 2003 12:05:08 -0000	1.33
+++ configure.in	11 Sep 2003 10:00:05 -0000	1.34
@@ -5,11 +5,10 @@
 AC_PREREQ(2.52)
 
 AC_INIT(COPYING)
+AM_INIT_AUTOMAKE(pcsc-lite, 1.2.0-cvs)
 AM_CONFIG_HEADER(config.h)
 
 AC_CONFIG_SRCDIR(src/pcscdaemon.c)
-AC_CONFIG_AUX_DIR(build)
-AM_INIT_AUTOMAKE(pcsc-lite, 1.2.0-cvs)
 
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -304,7 +303,6 @@
 CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"
 
 dnl Setup dist stuff
-AC_SUBST(ac_aux_dir)
 AC_SUBST(muscledropdir)
 AC_SUBST(usbdropdir)
 AC_SUBST(confdir)
@@ -313,6 +311,7 @@
 dnl Write Makefiles
 AC_OUTPUT([
 Makefile
+aclocal/Makefile
 doc/Makefile
 doc/bundleTool.8
 doc/pcscd.8
@@ -322,4 +321,5 @@
 src/Makefile
 src/libpcsclite.pc
 src/utils/Makefile
+win32/Makefile
 ])

--- reconf DELETED ---