diff options
| author | Adam Megacz <megacz@cs.berkeley.edu> | 2006-12-18 15:00:00 +0000 |
|---|---|---|
| committer | Adam Megacz <megacz@gcc.gnu.org> | 2006-12-18 15:00:00 +0000 |
| commit | 85bf4c61f4de13ab1e6019c4c3883336f5054cdd (patch) | |
| tree | 53578926e7d26f68e7545c743563c4e7c36712cf /libjava/classpath | |
| parent | 2284bd2b66727ad3d1390ed16cd80760a012aa8a (diff) | |
| download | gcc-85bf4c61f4de13ab1e6019c4c3883336f5054cdd.zip gcc-85bf4c61f4de13ab1e6019c4c3883336f5054cdd.tar.gz gcc-85bf4c61f4de13ab1e6019c4c3883336f5054cdd.tar.bz2 | |
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
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/Makefile.in | 7 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in index 6c85278..9ed7b6d 100644 --- a/libjava/classpath/Makefile.in +++ b/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 \ diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 2fc2486..cbfa0d8 100755 --- a/libjava/classpath/configure +++ b/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; } |