emacs: configure.in comparison

comparison configure.in @ 90918:e9f94688a064

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219

author	Miles Bader <miles@gnu.org>
date	Mon, 11 Jun 2007 00:58:11 +0000
parents	31beec9ee600 425fdad2ce24
children	3619e7770f2e

comparison

equal deleted inserted replaced

-:9f1c3e957d3e
+:e9f94688a064
 dnl keep them together visually.
 AC_ARG_WITH(x-toolkit,
 [  --with-x-toolkit=KIT    use an X toolkit
 (KIT = yes/lucid/athena/motif/gtk/no)],
 [	  case "${withval}" in
-	    y | ye | yes )	val=athena ;;
+	    y | ye | yes )	val=gtk ;;
 	    n | no )		val=no  ;;
 	    l | lu | luc | luci | lucid )	val=lucid ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    m | mo | mot | moti | motif )	val=motif ;;
 	    g | gt | gtk  )	val=gtk ;;
 	    * )
 dnl AC_MSG_ERROR([the `--with-x-toolkit' option is supposed to have a value
 dnl which is `yes', `no', `lucid', `athena', `motif' or `open-look'.])
 AC_MSG_ERROR([`--with-x-toolkit=$withval' is invalid\;
 this option's value should be `yes', `no', `lucid', `athena', `motif' or `gtk'.
-Currently, `yes', `athena' and `lucid' are synonyms.])
+Currently, `yes' and `gtk', and `athena' and `lucid' are synonyms.])
 	    ;;
 	  esac
 	  with_x_toolkit=$val
 ])
 AC_ARG_WITH(xpm,
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		RANLIB="ar -ts"
 		;;
 *-sunos5* | *-solaris* )
 		opsys=sol2-6
-## FIXME: make this into a proper fix that checks the compiler type,
+		emacs_check_sunpro_c=yes
-## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now?
+		NON_GNU_CPP=/usr/ccs/lib/cpp
-		if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then
-		  ## -Xs prevents spurious whitespace.
-		  NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs"
-		else
-		  NON_GNU_CPP=/usr/ccs/lib/cpp
-		fi
 		;;
 *			  ) opsys=bsd4-2   ;;
 esac
 ## Watch out for a compiler that we know will not work.
 case "${canonical}" in
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 CPP=
 fi
+## If not using gcc, and on Solaris, and no CPP specified, see if
+## using a Sun compiler, which needs -Xs to prevent whitespace.
+if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \
+test x"$CPP" = x; then
+AC_MSG_CHECKING([whether we are using a Sun C compiler])
+AC_CACHE_VAL(emacs_cv_sunpro_c,
+[AC_TRY_LINK([],
+[#ifndef __SUNPRO_C
+fail;
+#endif
+], emacs_cv_sunpro_c=yes, emacs_cv_sunpro_c=no)])
+AC_MSG_RESULT($emacs_cv_sunpro_c)
+if test x"$emacs_cv_sunpro_c" = xyes; then
+NON_GNU_CPP="$CC -E -Xs"
+fi
+fi
 #### Some systems specify a CPP to use unless we are using GCC.
 #### Now that we know whether we are using GCC, we can decide whether
 #### to use that one.
 if test "x$NON_GNU_CPP" != x && test x$GCC != xyes && test "x$CPP" = x
 then
 gtk ) with_gtk=yes
 dnl Dont set this for GTK.  A lot of tests below assumes Xt when
 dnl USE_X_TOOLKIT is set.
 USE_X_TOOLKIT=none ;;
 no ) USE_X_TOOLKIT=none ;;
-dnl If user did not say whether to use a toolkit,
+dnl If user did not say whether to use a toolkit, make this decision later:
-dnl make this decision later: use the toolkit if we have X11R5 or newer.
+dnl use the toolkit if we have gtk, or X11R5 or newer.
-* ) USE_X_TOOLKIT=maybe ;;
+* )
+if test x"$with_gtk" = xyes; then
+USE_X_TOOLKIT=none
+else
+USE_X_TOOLKIT=maybe
+fi
+;;
 esac
 ;;
 mac | none )
 HAVE_X_WINDOWS=no
 HAVE_X11=no
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
 USE_X_TOOLKIT=none
 fi
-if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
+if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \
+test "$USE_X_TOOLKIT" = "maybe"; 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.4
 GTK_REQUIRED=2.4
 dnl Check if --with-pkg-config-prog has been given.
 if test "X${with_pkg_config_prog}" != X; then
 PKG_CONFIG="${with_pkg_config_prog}"
 fi
 dnl Checks for libraries.
-PKG_CHECK_MODULES(GTK, $GTK_MODULES)
+PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no)
+if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
+AC_MSG_ERROR($GTK_PKG_ERRORS)
+fi
+fi
+if test x"$pkg_check_gtk" = xyes; then
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
 CFLAGS="$CFLAGS $GTK_CFLAGS"
 LIBS="$GTK_LIBS $LIBS"
 dnl Try to compile a simple GTK program.
 GTK_COMPILES=no
 AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes)
 if test "${GTK_COMPILES}" != "yes"; then
-AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
+if test "$USE_X_TOOLKIT" != "maybe"; then
-fi
+AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
+fi
-HAVE_GTK=yes
+else
-AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
+HAVE_GTK=yes
-USE_X_TOOLKIT=none
+AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
+USE_X_TOOLKIT=none
+fi
+fi
+if test "${HAVE_GTK}" = "yes"; then
 dnl  GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
 dnl  a lot if #ifdef:s, say we have toolkit scrollbars.
 if test "$with_toolkit_scroll_bars" != no; then
 with_toolkit_scroll_bars=yes

Mercurial > emacs

comparison configure.in @ 90918:e9f94688a064