[Surfraw-commits] [surfraw] 02/02: Mark Meyer's patch to select Perl version at build

jason ryan jasonwryan-guest at moszumanska.debian.org
Sat Jan 27 03:45:05 UTC 2018


This is an automated email from the git hooks/post-receive script.

jasonwryan-guest pushed a commit to branch master
in repository surfraw.

commit 6dc162632dfcf7dd7d8a876c51bbddeae1b36955
Author: Jason Ryan <jasonwryan at gmail.com>
Date:   Fri Jan 5 17:14:44 2018 +1300

    Mark Meyer's patch to select Perl version at build
---
 Makefile.am  | 1 +
 configure.in | 2 ++
 surfraw.IN   | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index a364cea..ed47175 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ surfraw: surfraw.IN
 	sed -e 's, at VERSION\@,${VERSION},g; '\
 	    -e 's, at ELVIDIR\@,${ELVIDIR},g; '\
 	    -e 's, at AWK\@,${AWK},g; '\
+	    -e 's, at PERL\@,${PERL},g; '\
 	    -e 's, at sysconfdir\@,${sysconfdir},g ' $? > $@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
diff --git a/configure.in b/configure.in
index f14454b..9dd99ce 100644
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,8 @@ AC_SUBST(ISODATE)
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_AWK
+AC_PATH_PROG([PERL], [perl], [perl])
+AC_SUBST(PERL)
 
 AC_CONFIG_FILES([Makefile surfraw.lsm surfraw.spec elvi/Makefile test/Makefile examples/Makefile])
 AC_OUTPUT
diff --git a/surfraw.IN b/surfraw.IN
index 7630bff..01130c0 100755
--- a/surfraw.IN
+++ b/surfraw.IN
@@ -160,7 +160,8 @@ setoptyn () {
 
 quote_ifs () {
 	 if [ -z "$1" ];   then return;  fi
-     perl -e '$ifs=$ENV{IFS} || " "; $arg=shift;if($arg =~/[$ifs]/) { $arg="\"$arg\""; } print "$arg\n"; ' -- "$1"
+     @PERL@ -e '$ifs=$ENV{IFS} || " "; $arg=shift;if($arg =~/[$ifs]/) { $arg="\"$arg\""; } print "$arg\n"; ' -- "$1"
+
 }
 
 bookmark_file_search () {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/surfraw/surfraw.git



More information about the Surfraw-commits mailing list