aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2007-05-29 14:30:42 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2007-05-29 07:30:42 -0700
commitb7616c4045535a8eb987dfc0f2fed84c3efbc675 (patch)
treecb888b5f83507f8b1176fa3dc2283d29c9dccaa8 /libjava/configure
parentf5062a66be2784d7b43608a9151b2cfa756f0dd6 (diff)
downloadgcc-b7616c4045535a8eb987dfc0f2fed84c3efbc675.zip
gcc-b7616c4045535a8eb987dfc0f2fed84c3efbc675.tar.gz
gcc-b7616c4045535a8eb987dfc0f2fed84c3efbc675.tar.bz2
configure.ac: Don't include ../config/confsubdir.m4.
2007-05-29 H.J. Lu <hongjiu.lu@intel.com> * configure.ac: Don't include ../config/confsubdir.m4. * aclocal.m4: Regenerated. * configure: Likewise. From-SVN: r125164
Diffstat (limited to 'libjava/configure')
-rwxr-xr-xlibjava/configure27
1 files changed, 7 insertions, 20 deletions
diff --git a/libjava/configure b/libjava/configure
index 698babe..b32854c 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -18291,19 +18291,6 @@ fi
-
-
-
-
-# _AC_OUTPUT_SUBDIRS
-# ------------------
-# This is a subroutine of AC_OUTPUT, but it does not go into
-# config.status, rather, it is called after running config.status.
-# _AC_OUTPUT_SUBDIRS
-
-
-
-
subdirs="$subdirs classpath libltdl"
@@ -18510,7 +18497,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
:
else
cat > conftest.$ac_ext << EOF
-#line 18513 "configure"
+#line 18500 "configure"
struct S { ~S(); };
void bar();
void foo()
@@ -18994,7 +18981,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 Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -19002,7 +18989,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -19029,7 +19016,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -19043,7 +19030,7 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
if test x$gcc_no_link = xyes; then
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
@@ -19055,11 +19042,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}