diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/tools/text/recode/recode-3.6-as-if.patch | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/tools/text/recode/recode-3.6-as-if.patch')
| -rw-r--r-- | pkgs/tools/text/recode/recode-3.6-as-if.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/tools/text/recode/recode-3.6-as-if.patch b/pkgs/tools/text/recode/recode-3.6-as-if.patch new file mode 100644 index 000000000000..c7bcc27c8750 --- /dev/null +++ b/pkgs/tools/text/recode/recode-3.6-as-if.patch @@ -0,0 +1,19 @@ +http://bugs.gentoo.org/283029 + +--- a/m4/flex.m4 ++++ b/m4/flex.m4 +@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX + dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT + AC_DEFUN(ad_AC_PROG_FLEX, + [AC_CHECK_PROGS(LEX, flex, missing) +-if test "$LEX" = missing; then ++AS_IF([test "$LEX" = missing], [dnl + LEX="\$(top_srcdir)/$ac_aux_dir/missing flex" + LEX_OUTPUT_ROOT=lex.yy + AC_SUBST(LEX_OUTPUT_ROOT)dnl +-else ++], [: + AC_PROG_LEX + AC_DECL_YYTEXT +-fi]) ++])]) |