Rename iconv_.h to iconv.in.h.

[gnulib.git] / lib / javaversion.c

diff --git a/lib/javaversion.c b/lib/javaversion.c
index a0dea95..3f2a79c 100644 (file)
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -1,5 +1,5 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "javaversion.h"
@@ -33,11 +31,13 @@
 # define relocate(pathname) (pathname)
 #endif
 
+/* Get PKGDATADIR.  */
+#include "configmake.h"
+
 #include "javaexec.h"
 #include "pipe.h"
 #include "wait-process.h"
 #include "error.h"
-#include "getline.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)