autoconf macros for sed, ln and mkdir

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@651 96b47cad-a561-4643-ad3b-153ac7d7599c

npa/Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = src m4 doc
 
 EXTRA_DIST = libnpa.pc.in apdus
 
-do_subst = sed \
+do_subst = $(SED) \
 	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
 	   -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
 	   -e 's,[@]builddir[@],$(builddir),g' \
@@ -25,13 +25,13 @@ opensc_img = $(abs_srcdir)/src/opensc/win32/build/image
 opensc_root = $(opensc_img)/opensc
 
 fixup_la = find "$(opensc_img)" -name '*.la' | while read f; do \
-		   top="$$(dirname "$$(dirname "$$(echo "$${f}")")" | sed 's\#//\#/\#g')" \
-		   sed 's\#//\#'"$${top}"'/\#g' "$${f}" > "$${f}.tmp"; \
+		   top="$$(dirname "$$(dirname "$$(echo "$${f}")")" | $(SED) 's\#//\#/\#g')" \
+		   $(SED) 's\#//\#'"$${top}"'/\#g' "$${f}" > "$${f}.tmp"; \
 		   mv "$${f}.tmp" "$${f}"; \
 		   done
 restore_la = find "$(opensc_img)" -name '*.la' | while read f; do \
-			 x="$$(echo "$(opensc_img)" | sed 's\#/$$\#\#')" \
-			 sed 's\#'"$${x}"'/[^/]*/lib\#//lib\#g' "$${f}" > "$${f}.tmp"; \
+			 x="$$(echo "$(opensc_img)" | $(SED) 's\#/$$\#\#')" \
+			 $(SED) 's\#'"$${x}"'/[^/]*/lib\#//lib\#g' "$${f}" > "$${f}.tmp"; \
 			 mv "$${f}.tmp" "$${f}"; \
 			 done
 

npa/configure.ac

@@ -21,10 +21,10 @@ ifdef(
 )
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_LN_S
+AC_PROG_SED
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 

virtualsmartcard/configure.ac

@@ -23,10 +23,11 @@ ifdef(
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LN_S
 AC_PROG_LIBTOOL
-AM_PROG_CC_C_O
+AC_PROG_LN_S
+AC_PROG_SED
 AM_PATH_PYTHON
+AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 
 # If you need to see the details, just run make V=1.

virtualsmartcard/src/vpcd/Makefile.am

@@ -11,7 +11,7 @@ noinst_HEADERS = vpcd.h
 EXTRA_DIST = reader.conf.in
 
 
-do_subst = sed -e 's,[@]TARGET[@],$(serialdropdir)/$(VPCD_LIB),g'
+do_subst = $(SED) -e 's,[@]TARGET[@],$(serialdropdir)/$(VPCD_LIB),g'
 
 
 install: install_libvpcd
@@ -19,7 +19,8 @@ install: install_libvpcd
 install_libvpcd: libvpcd.la reader.conf.in
 	$(mkinstalldirs) $(DESTDIR)$(serialdropdir)
 	$(LIBTOOL) --mode=install cp .libs/$(VPCD_LIB) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION)
-	ln -fs $(VPCD_LIB).$(VERSION) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB)
+	(cd $(DESTDIR)$(serialdropdir) && \
+		$(LN_S) -f $(VPCD_LIB).$(VERSION) $(VPCD_LIB)
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/reader.conf.d
 	$(do_subst) < $(srcdir)/reader.conf.in > $(DESTDIR)$(sysconfdir)/reader.conf.d/vpcd
 

virtualsmartcard/src/vpicc/Makefile.am

@@ -22,7 +22,7 @@ vpicccards_PYTHON = virtualsmartcard/cards/__init__.py \
            virtualsmartcard/cards/nPA.py \
            virtualsmartcard/cards/cryptoflex.py
 
-do_subst = sed -e 's,[@]PYTHON[@],$(PYTHON),g'
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 vicc: vicc.in Makefile
 	$(do_subst) < $(srcdir)/vicc.in > vicc