Integrate javacomp.c.diff into gnulib.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 11a437262cf4638da61bdd90bc8e99da2559a768..84be300baab9d7a3bdd5bccb6bc8c5d9fb5fea77 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-26  Bruno Haible  <bruno@clisp.org>
+
+       Move a patch to gnulib.
+       * lib/javacomp.c.diff: Remove file.
+       * Makefile.am (EXTRA_DIST): Remove it.
+
 2007-01-26  Bruno Haible  <bruno@clisp.org>
 
        * lib/propername.c: Don't include strstr.h, use <string.h> instead.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index cb3ad963d04ea5de7890fb1d7260c54a07b2d86f..c21fb6cdeded9ed0717026720efceae47edd3d87 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006 Free Software Foundation, Inc.
+## Copyright (C) 2006-2007 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -72,7 +72,6 @@ lib/html-styled-ostream.oo.c \
 lib/html-styled-ostream.oo.h \
 lib/iconv-ostream.oo.c \
 lib/iconv-ostream.oo.h \
-lib/javacomp.c.diff \
 lib/libcroco/cr-additional-sel.c \
 lib/libcroco/cr-additional-sel.h \
 lib/libcroco/cr-attr-sel.c \

diff --git a/gnulib-local/lib/javacomp.c.diff b/gnulib-local/lib/javacomp.c.diff
deleted file mode 100644 (file)
index b0ef815..0000000
--- a/gnulib-local/lib/javacomp.c.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-*** gnulib/lib/javacomp.c      2006-07-11 14:08:16.000000000 +0200
---- gettext-tools/lib/javacomp.c       2006-07-30 13:39:06.000000000 +0200
-***************
-*** 50,56 ****
-  #include "clean-temp.h"
-  #include "error.h"
-  #include "xvasprintf.h"
-! #include "strstr.h"
-  #include "gettext.h"
-  
-  #define _(str) gettext (str)
---- 50,56 ----
-  #include "clean-temp.h"
-  #include "error.h"
-  #include "xvasprintf.h"
-! #include "c-strstr.h"
-  #include "gettext.h"
-  
-  #define _(str) gettext (str)
-***************
-*** 570,576 ****
-         fclose (fp);
-         goto failed;
-       }
-!       envjavac_gcj = (strstr (line, "gcj") != NULL);
-  
-        fclose (fp);
-  
---- 570,576 ----
-         fclose (fp);
-         goto failed;
-       }
-!       envjavac_gcj = (c_strstr (line, "gcj") != NULL);
-  
-        fclose (fp);
-