Show
Ignore:
Timestamp:
05/01/07 18:04:59 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs_22_BASE.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.in

    r4200 r4204  
    10311031      *-sunos5* | *-solaris* ) 
    10321032                opsys=sol2-6 
     1033## FIXME: make this into a proper fix that checks the compiler type, 
     1034## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now? 
    10331035                if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then 
    10341036                  ## -Xs prevents spurious whitespace. 
    …… 
    22052207dnl Do not put whitespace before the #include statements below. 
    22062208dnl Older compilers (eg sunos4 cc) choke on it. 
    2207 if test x"${USE_X_TOOLKIT}" = xmaybe; then 
     2209if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then 
    22082210  if test x"${HAVE_X11R5}" = xyes; then 
    22092211    AC_MSG_CHECKING(X11 version 5 with Xaw) 
    …… 
    22192221      USE_X_TOOLKIT=LUCID 
    22202222    else 
    2221       AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default) 
    2222       USE_X_TOOLKIT=none 
     2223      if test x"${USE_X_TOOLKIT}" = xLUCID; then 
     2224        AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files]) 
     2225      else 
     2226        AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default) 
     2227        USE_X_TOOLKIT=none 
     2228      fi 
    22232229    fi 
    22242230  else