comparison configure @ 90813:e6fdae9180d4

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 698-710) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 216) - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-196

90812:6137cc8ddf90

		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

    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

echo "${ECHO_T}yes" >&6; }
            succeeded=yes

            { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; }
            FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"`
            { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; }

            { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; }
            FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"`
            { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
echo "${ECHO_T}$FREETYPE_LIBS" >&6; }
        else
            { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }

echo "${ECHO_T}yes" >&6; }
            succeeded=yes

            { echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5
echo $ECHO_N "checking FONTCONFIG_CFLAGS... $ECHO_C" >&6; }
            FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"`
            { echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5
echo "${ECHO_T}$FONTCONFIG_CFLAGS" >&6; }

            { echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5
echo $ECHO_N "checking FONTCONFIG_LIBS... $ECHO_C" >&6; }
            FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig"`
            { echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5
echo "${ECHO_T}$FONTCONFIG_LIBS" >&6; }
        else
            { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }

90813:e6fdae9180d4

		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

    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

echo "${ECHO_T}yes" >&6; }
            succeeded=yes

            { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5
echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; }
            FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"|sed -e 's,///*,/,g'`
            { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5
echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; }

            { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5
echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; }
            FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"|sed -e 's,///*,/,g'`
            { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5
echo "${ECHO_T}$FREETYPE_LIBS" >&6; }
        else
            { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }

echo "${ECHO_T}yes" >&6; }
            succeeded=yes

            { echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5
echo $ECHO_N "checking FONTCONFIG_CFLAGS... $ECHO_C" >&6; }
            FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"|sed -e 's,///*,/,g'`
            { echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5
echo "${ECHO_T}$FONTCONFIG_CFLAGS" >&6; }

            { echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5
echo $ECHO_N "checking FONTCONFIG_LIBS... $ECHO_C" >&6; }
            FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig"|sed -e 's,///*,/,g'`
            { echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5
echo "${ECHO_T}$FONTCONFIG_LIBS" >&6; }
        else
            { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }