make the path to perl configurable and add addressbook/tools/csv2vcard to

2007-06-20  Laszlo (Laca) Peter  <laca@sun.com>

	* configure.in: make the path to perl configurable
	  and add addressbook/tools/csv2vcard to AC_OUTPUT.
	  Part of the fix for bug #433732

2007-06-20  Laszlo (Laca) Peter  <laca@sun.com>

	** Fix for bug #433732

	* tools/Makefile.am: expand @PERL@ in evolution-addressbook-clean.in
	* tools/csv2vcard: rename to csv2vcard.in
	* tools/csv2vcard.in: make the path to perl configurable
	* tools/evolution-addressbook-clean.in: make the path to perl
	  configurable

svn path=/trunk/; revision=33711

6 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c1455580d..d23d90655a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-20  Laszlo (Laca) Peter  <laca@sun.com>
+
+	* configure.in: make the path to perl configurable
+	  and add addressbook/tools/csv2vcard to AC_OUTPUT.
+	  Part of the fix for bug #433732
+
 2007-06-18  Srinivasa Ragavan <sragavan@novell.com>
 
 	** Evolution 2.11.4 release
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4a9891d8d4..27d77d494b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-20  Laszlo (Laca) Peter  <laca@sun.com>
+
+	** Fix for bug #433732
+
+	* tools/Makefile.am: expand @PERL@ in evolution-addressbook-clean.in
+	* tools/csv2vcard: rename to csv2vcard.in
+	* tools/csv2vcard.in: make the path to perl configurable
+	* tools/evolution-addressbook-clean.in: make the path to perl
+	  configurable
+
 2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #445793 from Gilles Dartiguelongue  
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index c925cb5e05..f7df1cb753 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -35,5 +35,6 @@ CLEANFILES= evolution-addressbook-clean
 evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
 	sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \
+	    -e 's?\@PERL\@?@PERL@?g' \
            < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
           && mv evolution-addressbook-clean.tmp evolution-addressbook-clean
diff --git a/addressbook/tools/csv2vcard b/addressbook/tools/csv2vcard.in
index b968fbd9c3..3141e6d2f9 100755
--- a/addressbook/tools/csv2vcard
+++ b/addressbook/tools/csv2vcard.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 #
 # cvs2vcard - Script to convert Outlook CSV files into VCard files
 # suitable to be imported into Evolution.
diff --git a/addressbook/tools/evolution-addressbook-clean.in b/addressbook/tools/evolution-addressbook-clean.in
index ce29e55af4..49a5c3b665 100644
--- a/addressbook/tools/evolution-addressbook-clean.in
+++ b/addressbook/tools/evolution-addressbook-clean.in
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!@PERL@ -w
 
 sub do_system
 {
diff --git a/configure.in b/configure.in
index 5c6890f21b..ded8dccd93 100644
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,9 @@ AC_C_INLINE
 AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_AWK
+AC_PATH_PROG([PERL], [perl])
+AC_SUBST(PERL)
+
 case $YACC in
 *yacc*)
 	AC_MSG_ERROR(You need bison to build Evolution)
@@ -1748,6 +1751,7 @@ addressbook/gui/widgets/Makefile
 addressbook/importers/Makefile
 addressbook/printing/Makefile
 addressbook/tools/Makefile
+addressbook/tools/csv2vcard
 addressbook/util/Makefile
 art/Makefile
 data/Makefile