Merge lp:~dobey/intltool/m4esyscmd-support into lp:intltool

Proposed by dobey
Status: Superseded
Proposed branch: lp:~dobey/intltool/m4esyscmd-support
Merge into: lp:intltool
Diff against target: None lines
To merge this branch: bzr merge lp:~dobey/intltool/m4esyscmd-support
Reviewer Review Type Date Requested Status
intltool Developers Pending
Review via email: mp+8649@code.launchpad.net

This proposal has been superseded by a proposal from 2009-07-12.

To post a comment you must log in.
lp:~dobey/intltool/m4esyscmd-support updated
697. By dobey

 Move the m4_esyscmd handling into the AC_INIT handler

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'intltool-update.in'
--- intltool-update.in 2009-04-21 01:58:31 +0000
+++ intltool-update.in 2009-07-12 19:32:45 +0000
@@ -1156,6 +1156,16 @@
1156 $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);1156 $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
1157 }1157 }
11581158
1159 # Handle m4_esyscmd
1160 # FIXME: We should do this in a more generic way that works for all vars
1161 if ($version =~ /\s*m4_esyscmd\([\[]?([^\)\]]+)/m)
1162 {
1163 my $cwd = getcwd ();
1164 chdir ("$SRCDIR/..");
1165 $version = qx($1);
1166 chdir ($cwd);
1167 }
1168
1159 # \s makes this not work, why?1169 # \s makes this not work, why?
1160 $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;1170 $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
1161 1171

Subscribers

People subscribed via source and target branches

to all changes: