comparison configure @ 83562:5a45becb5728

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-702 Update from CVS * [e-mail]/emacs--devo--0--patch-703 Update from CVS * [e-mail]/emacs--devo--0--patch-704 Update from CVS * [e-mail]/emacs--devo--0--patch-705 Update from CVS * [e-mail]/emacs--devo--0--patch-706 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-707 Update from CVS * [e-mail]/gnus--rel--5.10--patch-216 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-602

83561:dc002877ce12

		NON_GNU_CPP=/usr/ccs/lib/cpp
		RANLIB="ar -ts"
		;;
      *-sunos5* | *-solaris* )
		opsys=sol2-6
		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

      LIBS="$OLD_LIBS"
    fi
  fi
fi

if test x"${USE_X_TOOLKIT}" = xmaybe; then
  if test x"${HAVE_X11R5}" = xyes; then
    { echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5
echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; }
    if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6

    if test $emacs_cv_x11_version_5_with_xaw = yes; then
      { echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5
echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; }
      USE_X_TOOLKIT=LUCID
    else
      { echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5
echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; }
      USE_X_TOOLKIT=none
    fi
  else
    USE_X_TOOLKIT=none
  fi
fi

83562:5a45becb5728

		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,
## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now?
		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

      LIBS="$OLD_LIBS"
    fi
  fi
fi

if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
  if test x"${HAVE_X11R5}" = xyes; then
    { echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5
echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; }
    if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6

    if test $emacs_cv_x11_version_5_with_xaw = yes; then
      { echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5
echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; }
      USE_X_TOOLKIT=LUCID
    else
      if test x"${USE_X_TOOLKIT}" = xLUCID; then
        { { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw include files" >&5
echo "$as_me: error: Lucid toolkit requires X11/Xaw include files" >&2;}
   { (exit 1); exit 1; }; }
      else
        { echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5
echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; }
        USE_X_TOOLKIT=none
      fi
    fi
  else
    USE_X_TOOLKIT=none
  fi
fi