projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'unicase/tocasefold'.
[gnulib.git]
/
lib
/
javaversion.c
diff --git
a/lib/javaversion.c
b/lib/javaversion.c
index
a0dea95
..
94a353a
100644
(file)
--- a/
lib/javaversion.c
+++ b/
lib/javaversion.c
@@
-1,11
+1,11
@@
/* Determine the Java version supported by javaexec.
/* Determine the Java version supported by javaexec.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
-2008
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
Written by Bruno Haible <bruno@clisp.org>, 2006.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,12
+13,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "javaversion.h"
/* Specification. */
#include "javaversion.h"
@@
-37,11
+34,13
@@
#include "pipe.h"
#include "wait-process.h"
#include "error.h"
#include "pipe.h"
#include "wait-process.h"
#include "error.h"
-#include "getline.h"
#include "gettext.h"
#define _(str) gettext (str)
#include "gettext.h"
#define _(str) gettext (str)
+/* Get PKGDATADIR. */
+#include "configmake.h"
+
struct locals
{
struct locals
{
@@
-91,7
+90,8
@@
execute_and_read_line (const char *progname,
fclose (fp);
/* Remove zombie process from process list, and retrieve exit status. */
fclose (fp);
/* Remove zombie process from process list, and retrieve exit status. */
- exitstatus = wait_subprocess (child, progname, true, false, true, false);
+ exitstatus =
+ wait_subprocess (child, progname, true, false, true, false, NULL);
if (exitstatus != 0)
{
free (line);
if (exitstatus != 0)
{
free (line);