m68*-hp-bsd* )
machine=hp9000s300 opsys=bsd4-3
;;
- ## HP/UX 7, 8 and 9 are supported on these machines.
+ ## HP/UX 7, 8, 9, and 10 are supported on these machines.
m68*-hp-hpux* )
case "`uname -r`" in
## Someone's system reports A.B8.05 for this.
*.B8.* ) machine=hp9000s300 opsys=hpux8 ;;
*.08.* ) machine=hp9000s300 opsys=hpux8 ;;
*.09.* ) machine=hp9000s300 opsys=hpux9 ;;
+ *.10.* ) machine=hp9000s300 opsys=hpux9shr ;;
*) machine=hp9000s300 opsys=hpux ;;
esac
;;
hppa*-hp-hpux9* )
machine=hp800 opsys=hpux9
;;
+ hppa*-hp-hpux10* )
+ machine=hp800 opsys=hpux9shr
+ ;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux* )
## The Sun386 didn't get past 4.0.
i[345]86-*-sunos4 ) opsys=sunos4-0 ;;
*-sunos4.0* ) opsys=sunos4-0 ;;
- *-sunos4.1.3* | *-sunos4shr* ) opsys=sunos4shr
+ *-sunos4.1.[3-9]* | *-sunos4shr* ) opsys=sunos4shr
NON_GNU_CPP=/usr/lib/cpp
;;
*-sunos4* | *-sunos ) opsys=sunos4-1
opsys=sol2-4
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
+ *-sunos5.5* | *-solaris2.5* )
+ opsys=sol2-5
+ NON_GNU_CPP=/usr/ccs/lib/cpp
+ ;;
*-sunos5* | *-solaris* )
opsys=sol2
NON_GNU_CPP=/usr/ccs/lib/cpp
fi
if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
- LD_SWITCH_X_SITE="-L${x_libraries}"
- LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
+ LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+ LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
fi
if test "${x_includes}" != NONE && test -n "${x_includes}"; then
- C_SWITCH_X_SITE="-I${x_includes}"
+ C_SWITCH_X_SITE=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`
fi
if test x"${x_includes}" = x; then
bitmapdir=/usr/include/X11/bitmaps
-elif test -d "${x_includes}/X11/bitmaps"; then
- bitmapdir="${x_includes}/X11/bitmaps"
else
- bitmapdir="${x_includes}/bitmaps"
+ # accumulate include directories that have X11 bitmap sudirectories
+ bmd_acc="dummyval"
+ for bmd in `echo ${x_includes} | sed -e "s/:/ /g"`; do
+ if test -d "${bmd}/X11/bitmaps"; then
+ bmd_acc="${bmd_acc}:${bmd}/X11/bitmaps"
+ elif test -d "${bmd}/bitmaps"; then
+ bmd_acc="${bmd_acc}:${bmd}/bitmaps"
+ fi
+ done
+ if test ${bmd_acc} != "dummyval"; then
+ bitmapdir=`echo ${bmd_acc} | sed -e "s/^dummyval://"`
+ fi
fi
case "${window_system}" in
dnl FIXME replace main with a function we actually want from this library.
AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
+AC_CHECK_LIB(pthreads, cma_open)
+
AC_MSG_CHECKING(for XFree86)
if test -d /usr/X386/include; then
HAVE_XFREE386=yes
fi
AC_MSG_RESULT($HAVE_XFREE386)
-# We change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
-# for the tests that follow.
+# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
+# for the tests that follow. We set it back to REAL_CFLAGS later on.
if test "${HAVE_X11}" = "yes"; then
DEFS="$C_SWITCH_X_SITE $DEFS"
LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS"
CFLAGS="$C_SWITCH_X_SITE $CFLAGS"
+
+ if test "${HAVE_XFREE386}" = "yes" && test "${opsys}" = "linux"; then
+ AC_MSG_CHECKING(whether XFree86 needs -b to link)
+ AC_TRY_LINK([],
+ [XOpenDisplay ("foo");],
+ [xfree86_first_failure=no],
+ [xfree86_first_failure=yes])
+ if test "${xfree86_first_failure}" = "yes"; then
+ OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
+ OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
+ OLD_CPPFLAGS="$CPPFLAGS"
+ OLD_LIBS="$LIBS"
+ LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
+ C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
+ CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
+ LIBS="$LIBS -b i486-linuxaout"
+ AC_TRY_LINK([],
+ [XOpenDisplay ("foo");],
+ [xfree86_second_failure=no],
+ [xfree86_second_failure=yes])
+ if test "${xfree86_second_failure}" = "yes"; then
+ # If we get the same failure with -b, there is no use adding -b.
+ # So take it out. This plays safe.
+ LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"
+ C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
+ CPPFLAGS="$OLD_CPPFLAGS"
+ LIBS="$OLD_LIBS"
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(yes)
+ fi
+ else
+ AC_MSG_RESULT(no)
+ fi
+ fi
+
AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
XScreenNumberOfScreen XSetWMProtocols)
fi
fi
# If netdb.h doesn't declare h_errno, we must declare it by hand.
-AC_MSG_CHECKING(whether netdb declarares h_errno)
+AC_MSG_CHECKING(whether netdb declares h_errno)
AC_TRY_LINK([#include <netdb.h>],
[return h_errno;],
[AC_MSG_RESULT(yes)
#### Report on what we decided to do.
echo "
-
Configured for \`${canonical}'.
Where should the build process find the source code? ${srcdir}
Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
Should Emacs use the relocating allocator for buffers? ${REL_ALLOC}
What window system should Emacs use? ${window_system}
- What toolkit should Emacs use? ${USE_X_TOOLKIT}${x_includes+
- Where do we find X Windows header files? }${x_includes}${x_libraries+
- Where do we find X Windows libraries? }${x_libraries}
+ What toolkit should Emacs use? ${USE_X_TOOLKIT}"
+
+if test -n "${x_includes}"; then
+echo " Where do we find X Windows header files? ${x_includes}"
+else
+echo " Where do we find X Windows header files? Standard dirs"
+fi
+if test -n "${x_libraries}"; then
+echo " Where do we find X Windows libraries? ${x_libraries}"
+else
+echo " Where do we find X Windows libraries? Standard dirs"
+fi
-"
+echo
# Remove any trailing slashes in these variables.
changequote(, )dnl