From 065a1afc0492b6d06eb1e890c8c27d04dfc42639 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Wed, 19 Jan 2005 22:04:37 +0000 Subject: [PATCH] * configure.tgt: Set build_rdi_share to "yes" on those targets that use that debugging protocol. Set build_nlm to yes to build NLM stub for Netware targets. * configure.ac: If build_rdi_share is "yes", then configure the rdi-share subdirectory. If build_nlm is "yes", the configure the "nlm" subdirectory. * configure: Regenerated. --- gdb/ChangeLog | 8 +++++ gdb/configure | 86 +++++++++++++++++++++++++++++++++++++++++++++-- gdb/configure.ac | 11 ++++++ gdb/configure.tgt | 15 ++------- 4 files changed, 106 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3637c4e9020..7a83a29ae89 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2005-01-19 Jim Blandy + * configure.tgt: Set build_rdi_share to "yes" on those targets + that use that debugging protocol. + Set build_nlm to yes to build NLM stub for Netware targets. + * configure.ac: If build_rdi_share is "yes", then configure the + rdi-share subdirectory. + If build_nlm is "yes", the configure the "nlm" subdirectory. + * configure: Regenerated. + * rdi-share/configure, rdi-share/aclocal.m4: Regenerated using autoconf 2.59 and automake 1.9.3. diff --git a/gdb/configure b/gdb/configure index b4637e0e355..efb0a2cba48 100755 --- a/gdb/configure +++ b/gdb/configure @@ -313,6 +313,8 @@ ac_subdirs_all="$ac_subdirs_all doc testsuite" ac_subdirs_all="$ac_subdirs_all gdbtk" ac_subdirs_all="$ac_subdirs_all multi-ice" ac_subdirs_all="$ac_subdirs_all gdbserver" +ac_subdirs_all="$ac_subdirs_all rdi-share" +ac_subdirs_all="$ac_subdirs_all nlm" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os RANLIB ac_ct_RANLIB SET_MAKE ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l localedir PACKAGE subdirs AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_CC TCL_DEFS TCL_SHLIB_CFLAGS TCL_SHLIB_LD TCL_SHLIB_LD_LIBS TCL_SHLIB_SUFFIX TCL_DL_LIBS TCL_LD_FLAGS TCL_LD_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS TCL_COMPAT_OBJS TCL_RANLIB TCL_BUILD_LIB_SPEC TCL_LIB_SPEC TCL_LIB_VERSIONS_OK TK_VERSION TK_DEFS TK_BUILD_INCLUDES TK_XINCLUDES TK_XLIBSW TK_BUILD_LIB_SPEC TK_LIB_SPEC TCLHDIR TKHDIR ITCLHDIR ITKHDIR ITCL_VERSION ITCL_DEFS ITCL_BUILD_INCLUDES ITCL_BUILD_LIB_SPEC ITCL_LIB_SPEC ITK_VERSION ITK_DEFS ITK_BUILD_INCLUDES ITK_BUILD_LIB_SPEC ITK_LIB_SPEC X_CFLAGS X_LDFLAGS X_LIBS TCL_DEPS TK_DEPS ITCLLIB ITCL_DEPS ITKLIB ITK_DEPS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR IGNORE_SIM IGNORE_SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags xm_h tm_h nm_h LIBICONV LIBOBJS LTLIBOBJS' ac_subst_files='host_makefile_frag target_makefile_frag' @@ -12640,8 +12642,7 @@ fi done - -for ac_header in ncurses/term.h term.h +for ac_header in ncurses/term.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -12791,6 +12792,70 @@ fi done +for ac_header in term.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#if HAVE_CURSES_H +# include +#endif + + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + # FIXME: kettenis/20030102: In most cases we include these # unconditionally, so what's the point in checking these? @@ -21360,6 +21425,23 @@ echo "${ECHO_T}no" >&6 fi fi +# We build rdi-share on ARM-based targets, as instructed by configure.tgt. +if test "x$build_rdi_share" = xyes; then + + +subdirs="$subdirs rdi-share" + +fi + +# We configure the nlm subdirectory on netware targets, as instructed +# by configure.tgt. +if test "x$build_nlm" = xyes; then + + +subdirs="$subdirs nlm" + +fi + # If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or # nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link # to an empty version. diff --git a/gdb/configure.ac b/gdb/configure.ac index 7794d3b9a1a..c3e16cc7200 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1508,6 +1508,17 @@ if test "x$target" = "x$host"; then fi fi +# We build rdi-share on ARM-based targets, as instructed by configure.tgt. +if test "x$build_rdi_share" = xyes; then + AC_CONFIG_SUBDIRS(rdi-share) +fi + +# We configure the nlm subdirectory on netware targets, as instructed +# by configure.tgt. +if test "x$build_nlm" = xyes; then + AC_CONFIG_SUBDIRS(nlm) +fi + # If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or # nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link # to an empty version. diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 8541c0d22fe..ee4330431e3 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -56,16 +56,10 @@ arm*-*-netbsd* | arm*-*-knetbsd*-gnu) arm-*-nto*) gdb_target=nto ;; arm*-*-* | thumb*-*-* | strongarm*-*-*) gdb_target=embed - # FIXME: cagney/2005-01-07: The configdirs - # variable doesn't work with autoconf 2.59. - # Disabled. - # configdirs="$configdirs rdi-share" + build_rdi_share=yes ;; xscale-*-*) gdb_target=embed - # FIXME: cagney/2005-01-07: The configdirs - # variable doesn't work with autoconf 2.59. - # Disabled. - # configdirs="$configdirs rdi-share" + build_rdi_share=yes ;; avr-*-*) gdb_target=avr ;; @@ -96,10 +90,7 @@ i[34567]86-*-linux*) gdb_target=linux ;; i[34567]86-*-gnu*) gdb_target=i386gnu ;; i[34567]86-*-netware*) gdb_target=i386 - # FIXME: cagney/2005-01-07: The configdirs - # variable doesn't work with autoconf 2.59. - # Disabled. - # configdirs="${configdirs} nlm" + build_nlm=yes ;; i[34567]86-*-cygwin*) gdb_target=cygwin ;; i[34567]86-*-*) gdb_target=i386 ;; -- 2.30.2