From 5f2a83b83a0f842aacc3ead589504afacad97004 Mon Sep 17 00:00:00 2001
From: frankmorgner <frankmorgner@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Wed, 13 Oct 2010 20:10:13 +0000
Subject: [PATCH] switched from automake to sed for substitution of automake
 variables

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@330 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 ccid/Makefile.am  | 22 ++++++++++++++++++----
 ccid/configure.ac | 31 ++++++++-----------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/ccid/Makefile.am b/ccid/Makefile.am
index 2c1f848..31aa3d7 100644
--- a/ccid/Makefile.am
+++ b/ccid/Makefile.am
@@ -1,16 +1,28 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src m4 patches
 
-MOSTLYCLEANFILES = $(DX_CLEANFILES)
+DISTCLEANFILES = Doxyfile libpace.pc
 
-EXTRA_DIST = README.dox
+EXTRA_DIST = README.dox libpace.pc.in Doxyfile.in
+
+do_subst = sed \
+	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
+	   -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
+	   -e 's,[@]builddir[@],$(builddir),g' \
+	   -e 's,[@]prefix[@],$(prefix),g' \
+	   -e 's,[@]exec_prefix[@],$(exec_prefix),g' \
+	   -e 's,[@]libdir[@],$(libdir),g' \
+	   -e 's,[@]includedir[@],$(includedir),g' \
+	   -e 's,[@]VERSION[@],$(VERSION),g' \
+	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 if DOC_ENABLED
 clean-local:
 	rm -rf doc
 
-doc : Doxyfile
-	@DOXYGEN@ $(builddir)/Doxyfile
+doc :
+	$(do_subst) < $(srcdir)/Doxyfile.in > Doxyfile
+	$(DOXYGEN) Doxyfile
 
 .PHONY: doc
 endif
@@ -18,4 +30,6 @@ endif
 if WITH_PACE
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpace.pc
+libpace.pc :
+	$(do_subst) < $(srcdir)/libpace.pc.in > libpace.pc
 endif
diff --git a/ccid/configure.ac b/ccid/configure.ac
index 1652daf..70d0659 100644
--- a/ccid/configure.ac
+++ b/ccid/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([ccid-emulator], [0.3], [morgner@informatik.hu-berlin.de])
+AC_INIT([ccid-emulator], [0.3], [http://sourceforge.net/projects/vsmartcard/support])
 AC_CONFIG_SRCDIR([src/ccid.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -133,29 +133,15 @@ fi
 AM_CONDITIONAL(WITH_CATS, test "${enable_ccid}" != "no")
 
 
-#DX_HTML_FEATURE(ON)
-#DX_CHM_FEATURE(OFF)
-#DX_CHI_FEATURE(OFF)
-#DX_MAN_FEATURE(ON)
-#DX_RTF_FEATURE(OFF)
-#DX_XML_FEATURE(OFF)
-#DX_PDF_FEATURE(OFF)
-#DX_PS_FEATURE(OFF)
-#DX_INIT_DOXYGEN(ccid-emulator, Doxyfile, doc)
-
 # Documentation (default: no)
 AC_ARG_ENABLE([doc],AS_HELP_STRING([--enable-doc],[Enable documentation generation.]),[enable_doc=$enableval],[enable_doc="no"])
-
-AC_MSG_CHECKING(for documentation request)
-AC_MSG_RESULT($enable_doc)
-
 if test x"$enable_doc" = "xyes"
 then
-  AC_PATH_PROG([DOXYGEN], [doxygen])
-  if test x$DOXYGEN = x
-  then
-    AC_MSG_ERROR([doxygen is mandatory.])
-  fi
+    AC_PATH_PROG([DOXYGEN], [doxygen])
+    if test x$DOXYGEN = x
+    then
+        AC_MSG_ERROR([doxygen is mandatory.])
+    fi
 fi
 AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
 
@@ -178,7 +164,7 @@ AC_CHECK_FUNCS([memmove memset strerror])
 
 cat << EOF
 
-ccid-emulator has been configured with following options:
+${PACKAGE} has been configured with following options:
 
 Version:              ${PACKAGE_VERSION}
 User binaries:        $(eval eval eval echo "${bindir}")
@@ -205,6 +191,7 @@ PCSC_LIBS:            ${PCSC_LIBS}
 CCID emulator:        ${enable_ccid}
 PACE support:         ${enable_pace}
 CAT-S/CAT-C Tool:     ${enable_cats}
+Documentation:        ${enable_doc}
 
 EOF
 
@@ -213,7 +200,5 @@ AC_CONFIG_FILES([
                  m4/Makefile
                  patches/Makefile
                  src/Makefile
-                 libpace.pc
-                 Doxyfile
                  ])
 AC_OUTPUT