From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 20 Jan 2003 05:35:31 +0000 (+0000)
Subject: Fixed --with-gtk
X-Git-Tag: ttn-vms-21-2-B4~11579
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cd8907963a3c626137711f88b3c34d1b198c0411;p=emacs.git

Fixed --with-gtk
---

diff --git a/ChangeLog b/ChangeLog
index 98fb59e3356..ca6d9c0b5dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-20  Jan D.  <jan.h.d@swipnet.se>
+
+	* configure.in: Fix --with-gtk.
+
 2003-01-19  Jan D.  <jan.h.d@swipnet.se>
 
 	* configure.in: Add --with-gtk, --with-x-toolkit=gtk
diff --git a/configure b/configure
index 58c410a7c22..d6a030904b9 100755
--- a/configure
+++ b/configure
@@ -1890,7 +1890,22 @@ case "${canonical}" in
     machine=pmax opsys=mach-bsd4-3
   ;;
 
-  ## Motorola Delta m88k
+  ## Motorola Delta machines
+  m68k-motorola-sysv* | m68000-motorola-sysv* )
+    machine=delta opsys=usg5-3
+    if test -z "`type gnucc | grep 'not found'`"
+    then
+      if test -s /etc/167config
+      then CC="gnucc -m68040"
+      else CC="gnucc -m68881"
+      fi
+    else
+      if test -z "`type gcc | grep 'not found'`"
+      then CC=gcc
+      else CC=cc
+      fi
+    fi
+  ;;
   m88k-motorola-sysv4* )
     # jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
     # needs POSIX_SIGNALS and therefore needs usg5-4-2.
@@ -8080,7 +8095,7 @@ fi
 
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
-  if test "$USE_X_TOOLKIT" != "none"; then
+  if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
     { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
    { (exit 1); exit 1; }; };
diff --git a/configure.in b/configure.in
index e73ce2e3717..b3c517fc8be 100644
--- a/configure.in
+++ b/configure.in
@@ -1849,7 +1849,7 @@ AC_DEFUN(PKG_CHECK_MODULES, [
 
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
-  if test "$USE_X_TOOLKIT" != "none"; then
+  if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
     AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
   fi
   GLIB_REQUIRED=2.0.1