|
|
|
@ -634,7 +634,6 @@ LIBOBJS |
|
|
|
sim_default_model |
|
|
|
sim_scache |
|
|
|
cgen_breaks |
|
|
|
XMKMF |
|
|
|
sim_multi_obj |
|
|
|
sim_multi_src |
|
|
|
sim_multi_igen_configs |
|
|
|
@ -779,7 +778,6 @@ enable_sim_reserved_bits |
|
|
|
enable_sim_bitsize |
|
|
|
enable_sim_float |
|
|
|
enable_sim_hardware |
|
|
|
with_x |
|
|
|
' |
|
|
|
ac_precious_vars='build_alias |
|
|
|
host_alias |
|
|
|
@ -789,8 +787,7 @@ CFLAGS |
|
|
|
LDFLAGS |
|
|
|
LIBS |
|
|
|
CPPFLAGS |
|
|
|
CPP |
|
|
|
XMKMF' |
|
|
|
CPP' |
|
|
|
|
|
|
|
|
|
|
|
# Initialize some variables set by options. |
|
|
|
@ -1393,10 +1390,6 @@ Program names: |
|
|
|
--program-suffix=SUFFIX append SUFFIX to installed program names |
|
|
|
--program-transform-name=PROGRAM run sed PROGRAM on installed program names |
|
|
|
|
|
|
|
X features: |
|
|
|
--x-includes=DIR X include files are in DIR |
|
|
|
--x-libraries=DIR X library files are in DIR |
|
|
|
|
|
|
|
System types: |
|
|
|
--build=BUILD configure for building on BUILD [guessed] |
|
|
|
--host=HOST cross-compile to build programs to run on HOST [BUILD] |
|
|
|
@ -1439,7 +1432,6 @@ Optional Packages: |
|
|
|
--with-pic try to use only PIC/non-PIC objects [default=use |
|
|
|
both] |
|
|
|
--with-gnu-ld assume the C compiler uses GNU ld [default=no] |
|
|
|
--with-x use the X Window System |
|
|
|
|
|
|
|
Some influential environment variables: |
|
|
|
CC C compiler command |
|
|
|
@ -1450,7 +1442,6 @@ Some influential environment variables: |
|
|
|
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
|
|
|
you have headers in a nonstandard directory <include dir> |
|
|
|
CPP C preprocessor |
|
|
|
XMKMF Path to xmkmf, Makefile generator for X Window System |
|
|
|
|
|
|
|
Use these variables to override the choices made by `configure' or to help |
|
|
|
it to find libraries and programs with nonstandard names/locations. |
|
|
|
@ -10663,7 +10654,7 @@ else |
|
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
|
|
|
lt_status=$lt_dlunknown |
|
|
|
cat > conftest.$ac_ext <<_LT_EOF |
|
|
|
#line 10666 "configure" |
|
|
|
#line 10657 "configure" |
|
|
|
#include "confdefs.h" |
|
|
|
|
|
|
|
#if HAVE_DLFCN_H |
|
|
|
@ -10769,7 +10760,7 @@ else |
|
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
|
|
|
lt_status=$lt_dlunknown |
|
|
|
cat > conftest.$ac_ext <<_LT_EOF |
|
|
|
#line 10772 "configure" |
|
|
|
#line 10763 "configure" |
|
|
|
#include "confdefs.h" |
|
|
|
|
|
|
|
#if HAVE_DLFCN_H |
|
|
|
@ -11615,201 +11606,6 @@ fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 |
|
|
|
$as_echo_n "checking for X... " >&6; } |
|
|
|
|
|
|
|
|
|
|
|
# Check whether --with-x was given. |
|
|
|
if test "${with_x+set}" = set; then : |
|
|
|
withval=$with_x; |
|
|
|
fi |
|
|
|
|
|
|
|
# $have_x is `yes', `no', `disabled', or empty when we do not yet know. |
|
|
|
if test "x$with_x" = xno; then |
|
|
|
# The user explicitly disabled X. |
|
|
|
have_x=disabled |
|
|
|
else |
|
|
|
case $x_includes,$x_libraries in #( |
|
|
|
*\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( |
|
|
|
*,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : |
|
|
|
$as_echo_n "(cached) " >&6 |
|
|
|
else |
|
|
|
# One or both of the vars are not set, and there is no cached value. |
|
|
|
ac_x_includes=no ac_x_libraries=no |
|
|
|
rm -f -r conftest.dir |
|
|
|
if mkdir conftest.dir; then |
|
|
|
cd conftest.dir |
|
|
|
cat >Imakefile <<'_ACEOF' |
|
|
|
incroot: |
|
|
|
@echo incroot='${INCROOT}' |
|
|
|
usrlibdir: |
|
|
|
@echo usrlibdir='${USRLIBDIR}' |
|
|
|
libdir: |
|
|
|
@echo libdir='${LIBDIR}' |
|
|
|
_ACEOF |
|
|
|
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then |
|
|
|
# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
|
|
|
for ac_var in incroot usrlibdir libdir; do |
|
|
|
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" |
|
|
|
done |
|
|
|
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. |
|
|
|
for ac_extension in a so sl dylib la dll; do |
|
|
|
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && |
|
|
|
test -f "$ac_im_libdir/libX11.$ac_extension"; then |
|
|
|
ac_im_usrlibdir=$ac_im_libdir; break |
|
|
|
fi |
|
|
|
done |
|
|
|
# Screen out bogus values from the imake configuration. They are |
|
|
|
# bogus both because they are the default anyway, and because |
|
|
|
# using them would break gcc on systems where it needs fixed includes. |
|
|
|
case $ac_im_incroot in |
|
|
|
/usr/include) ac_x_includes= ;; |
|
|
|
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; |
|
|
|
esac |
|
|
|
case $ac_im_usrlibdir in |
|
|
|
/usr/lib | /usr/lib64 | /lib | /lib64) ;; |
|
|
|
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; |
|
|
|
esac |
|
|
|
fi |
|
|
|
cd .. |
|
|
|
rm -f -r conftest.dir |
|
|
|
fi |
|
|
|
|
|
|
|
# Standard set of common directories for X headers. |
|
|
|
# Check X11 before X11Rn because it is often a symlink to the current release. |
|
|
|
ac_x_header_dirs=' |
|
|
|
/usr/X11/include |
|
|
|
/usr/X11R7/include |
|
|
|
/usr/X11R6/include |
|
|
|
/usr/X11R5/include |
|
|
|
/usr/X11R4/include |
|
|
|
|
|
|
|
/usr/include/X11 |
|
|
|
/usr/include/X11R7 |
|
|
|
/usr/include/X11R6 |
|
|
|
/usr/include/X11R5 |
|
|
|
/usr/include/X11R4 |
|
|
|
|
|
|
|
/usr/local/X11/include |
|
|
|
/usr/local/X11R7/include |
|
|
|
/usr/local/X11R6/include |
|
|
|
/usr/local/X11R5/include |
|
|
|
/usr/local/X11R4/include |
|
|
|
|
|
|
|
/usr/local/include/X11 |
|
|
|
/usr/local/include/X11R7 |
|
|
|
/usr/local/include/X11R6 |
|
|
|
/usr/local/include/X11R5 |
|
|
|
/usr/local/include/X11R4 |
|
|
|
|
|
|
|
/usr/X386/include |
|
|
|
/usr/x386/include |
|
|
|
/usr/XFree86/include/X11 |
|
|
|
|
|
|
|
/usr/include |
|
|
|
/usr/local/include |
|
|
|
/usr/unsupported/include |
|
|
|
/usr/athena/include |
|
|
|
/usr/local/x11r5/include |
|
|
|
/usr/lpp/Xamples/include |
|
|
|
|
|
|
|
/usr/openwin/include |
|
|
|
/usr/openwin/share/include' |
|
|
|
|
|
|
|
if test "$ac_x_includes" = no; then |
|
|
|
# Guess where to find include files, by looking for Xlib.h. |
|
|
|
# First, try using that file with no special directory specified. |
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
|
|
/* end confdefs.h. */ |
|
|
|
#include <X11/Xlib.h> |
|
|
|
_ACEOF |
|
|
|
if ac_fn_c_try_cpp "$LINENO"; then : |
|
|
|
# We can compile using X headers with no special include directory. |
|
|
|
ac_x_includes= |
|
|
|
else |
|
|
|
for ac_dir in $ac_x_header_dirs; do |
|
|
|
if test -r "$ac_dir/X11/Xlib.h"; then |
|
|
|
ac_x_includes=$ac_dir |
|
|
|
break |
|
|
|
fi |
|
|
|
done |
|
|
|
fi |
|
|
|
rm -f conftest.err conftest.i conftest.$ac_ext |
|
|
|
fi # $ac_x_includes = no |
|
|
|
|
|
|
|
if test "$ac_x_libraries" = no; then |
|
|
|
# Check for the libraries. |
|
|
|
# See if we find them without any special options. |
|
|
|
# Don't add to $LIBS permanently. |
|
|
|
ac_save_LIBS=$LIBS |
|
|
|
LIBS="-lX11 $LIBS" |
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
|
|
/* end confdefs.h. */ |
|
|
|
#include <X11/Xlib.h> |
|
|
|
int |
|
|
|
main () |
|
|
|
{ |
|
|
|
XrmInitialize () |
|
|
|
; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
_ACEOF |
|
|
|
if ac_fn_c_try_link "$LINENO"; then : |
|
|
|
LIBS=$ac_save_LIBS |
|
|
|
# We can link X programs with no special library path. |
|
|
|
ac_x_libraries= |
|
|
|
else |
|
|
|
LIBS=$ac_save_LIBS |
|
|
|
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` |
|
|
|
do |
|
|
|
# Don't even attempt the hair of trying to link an X program! |
|
|
|
for ac_extension in a so sl dylib la dll; do |
|
|
|
if test -r "$ac_dir/libX11.$ac_extension"; then |
|
|
|
ac_x_libraries=$ac_dir |
|
|
|
break 2 |
|
|
|
fi |
|
|
|
done |
|
|
|
done |
|
|
|
fi |
|
|
|
rm -f core conftest.err conftest.$ac_objext \ |
|
|
|
conftest$ac_exeext conftest.$ac_ext |
|
|
|
fi # $ac_x_libraries = no |
|
|
|
|
|
|
|
case $ac_x_includes,$ac_x_libraries in #( |
|
|
|
no,* | *,no | *\'*) |
|
|
|
# Didn't find X, or a directory has "'" in its name. |
|
|
|
ac_cv_have_x="have_x=no";; #( |
|
|
|
*) |
|
|
|
# Record where we found X for the cache. |
|
|
|
ac_cv_have_x="have_x=yes\ |
|
|
|
ac_x_includes='$ac_x_includes'\ |
|
|
|
ac_x_libraries='$ac_x_libraries'" |
|
|
|
esac |
|
|
|
fi |
|
|
|
;; #( |
|
|
|
*) have_x=yes;; |
|
|
|
esac |
|
|
|
eval "$ac_cv_have_x" |
|
|
|
fi # $with_x != no |
|
|
|
|
|
|
|
if test "$have_x" != yes; then |
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 |
|
|
|
$as_echo "$have_x" >&6; } |
|
|
|
no_x=yes |
|
|
|
else |
|
|
|
# If each of the values was on the command line, it overrides each guess. |
|
|
|
test "x$x_includes" = xNONE && x_includes=$ac_x_includes |
|
|
|
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries |
|
|
|
# Update the cache value to reflect the command line values. |
|
|
|
ac_cv_have_x="have_x=yes\ |
|
|
|
ac_x_includes='$x_includes'\ |
|
|
|
ac_x_libraries='$x_libraries'" |
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 |
|
|
|
$as_echo "libraries $x_libraries, headers $x_includes" >&6; } |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cgen_breaks="" |
|
|
|
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then |
|
|
|
cgen_breaks="break cgen_rtx_error"; |
|
|
|
|
Mike Frysinger
5 years ago