Makefile.am: remove @X_CFLAGS@ from AM_CXXFLAGS...

2006-12-18  Adam Megacz <megacz@cs.berkeley.edu>

        * Makefile.am: remove @X_CFLAGS@ from AM_CXXFLAGS; it causes
        -I/usr/include to wind up in cross-builds
        * configure: Regenerate.

From-SVN: r120006

libjava/ChangeLog

+2006-12-18  Adam Megacz <megacz@cs.berkeley.edu>
+
+        * Makefile.am: remove @X_CFLAGS@ from AM_CXXFLAGS; it causes
+        -I/usr/include to wind up in cross-builds
+        * configure: Regenerate.
+
 2006-12-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* configure: Regenerate.

libjava/Makefile.am

@@ -114,7 +114,6 @@ AM_CXXFLAGS = \
 	-Wswitch-enum \
 	-D_FILE_OFFSET_BITS=64 \
 	@LIBGCJ_CXXFLAGS@ \
-	@X_CFLAGS@ \
 	$(WARNINGS) \
 	-D_GNU_SOURCE \
 	-DPREFIX="\"$(prefix)\"" \

libjava/Makefile.in

@@ -741,7 +741,6 @@ AM_CXXFLAGS = \
 	-Wswitch-enum \
 	-D_FILE_OFFSET_BITS=64 \
 	@LIBGCJ_CXXFLAGS@ \
-	@X_CFLAGS@ \
 	$(WARNINGS) \
 	-D_GNU_SOURCE \
 	-DPREFIX="\"$(prefix)\"" \

libjava/classpath/Makefile.in

@@ -41,10 +41,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(top_srcdir)/gnu/classpath/Configuration.java.in \
 	$(top_srcdir)/gnu/java/security/Configuration.java.in \
 	$(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
-	config.guess config.sub depcomp install-sh ltcf-c.sh \
-	ltcf-cxx.sh ltcf-gcj.sh ltconfig ltmain.sh missing \
-	mkinstalldirs
+	AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
+	config.sub depcomp install-sh ltcf-c.sh ltcf-cxx.sh \
+	ltcf-gcj.sh ltconfig ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \

libjava/classpath/configure

@@ -10062,7 +10062,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10070,7 +10070,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -10097,7 +10097,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -10118,11 +10118,11 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 int
 main ()
 {
-XrmInitialize ()
+XtMalloc (0)
   ;
   return 0;
 }

libjava/libltdl/Makefile.in

-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
 @SET_MAKE@
 
 
-SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@