X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure;h=3d6be6e085c34cd399d45fae3fba52f597079597;hb=f255b19d70e74ccc74063ee0f8795ad5348fc1ba;hp=ee6880e552d8a53bd2ac9d83c2e5af1acad9b4c3;hpb=7fc36fdab48317bb4467e5c338c6104f47e52e5c;p=deliverable%2Fbinutils-gdb.git

diff --git a/configure b/configure
index ee6880e552..3d6be6e085 100755
--- a/configure
+++ b/configure
@@ -141,11 +141,14 @@ do
 		;;
 # These options have mandatory values.  Since we didn't find an = sign,
 # the value must be in the next argument
-	--b* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-*)
+	--bu* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-* | --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
 		optarg=$1
 		shift
 		arguments="$arguments $option=$optarg"
 		;;
+	--v)
+		arguments="$arguments -v"
+		;;
 	--*)
 		arguments="$arguments $option"
 		;;
@@ -154,7 +157,7 @@ do
 # Now, process the options
 	case $option in
 
-	--build* | --b*)
+	--build* | --bu*)
 		case "$build_alias" in
 		"") build_alias=$optarg ;;
 		*) echo '***' Can only configure for one build machine at a time.  1>&2
@@ -282,6 +285,9 @@ do
 		;;
 	--x-i* | --x-l*) other_options="$other_options $orig_option"
 		;;
+	--bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
+		# These options were added to autoconf for emacs.
+		;;
 	--*)
 		echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
 		exit 1
@@ -688,7 +694,8 @@ if [ "${build}" != "${host}" ]; then
   # are not the same, we set reasonable default values for the tools.
 
   tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
-  tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET HOST_PREFIX"
+  tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET"
+  tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET HOST_PREFIX"
   tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
   tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
 
@@ -717,6 +724,8 @@ s/\\\n//g
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
   CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-gcc}
+  DLLTOOL=${DLLTOOL-${host_alias}-dlltool}
+  DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool}
   HOST_PREFIX=${build_alias}-
   HOST_PREFIX_1=${build_alias}-
   LD=${LD-${host_alias}-ld}
@@ -769,6 +778,7 @@ s/\\\n//g
   export AS
   export AR
   export CC_FOR_BUILD
+  export DLLTOOL
   export LD
   export NM
   export RANLIB
@@ -793,6 +803,18 @@ fi
 export CC
 export CXX
 
+case "$host" in
+	*go32*)
+	    enable_gdbtk=no ;;
+esac
+
+# Determine whether gdb needs tk/tcl or not.
+if [ "$enable_gdbtk" != "no" ]; then
+	GDB_TK="all-tcl all-tk"
+else
+	GDB_TK=""
+fi
+
 for subdir in . ${subdirs} ; do
 
     # ${subdir} is relative path from . to the directory we're currently
@@ -1057,6 +1079,7 @@ EOF
 			s%^CXX[ 	]*=.*$%CXX = ${CXX}%
 			}" \
 		    -e "s:^SHELL[	 ]*=.*$:SHELL = ${config_shell}:" \
+		    -e "s:^GDB_TK[	 ]*=.*$:GDB_TK = ${GDB_TK}:" \
                     -e "s:^srcdir[ 	]*=.*$:srcdir = ${makesrcdir}:" \
                     -e "s///" \
                     -e "s:^program_prefix[ 	]*=.*$:program_prefix = ${program_prefix}:" \