diff options
| author | Roland McGrath <roland@gnu.org> | 1993-09-10 06:08:27 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1993-09-10 06:08:27 +0000 |
| commit | dbf6ad3d3effbdd1d84aa9dd2d69b2515c7deb8a (patch) | |
| tree | 662cd347f05a95787e543dd3fc02a35b539a9747 | |
| parent | eab5f4fd961ed79c025541ad28c3412ce70fc72c (diff) | |
| download | emacs-dbf6ad3d3effbdd1d84aa9dd2d69b2515c7deb8a.tar.gz | |
Remove check for $srcdir being configured. This pretty much works now.
Grok {m68*-hp,i[34]86-*}-netbsd* and set opsys=netbsd.
Check for XFree86 (/usr/X386/include) independent of whether -lXbsd exists.
| -rwxr-xr-x | configure1.in | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/configure1.in b/configure1.in index ce47cd058e2..24e93b66b97 100755 --- a/configure1.in +++ b/configure1.in @@ -362,16 +362,6 @@ case "${srcdir}" in * ) srcdir="`(cd ${srcdir}; pwd)`" ;; esac -#### Make sure that the source directory doesn't already have a -#### configured system in it. -if [ `pwd` != `(cd ${srcdir} && pwd)` ] \ - && [ -f "${srcdir}/src/config.h" ] ; then - (echo "${progname}: the directory tree \`${srcdir}' is being used" - echo " as a build directory right now; it has been configured in its own" - echo " right. You can't use srcdir in this situation.") >&2 - exit 1 -fi - ### Make the necessary directories, if they don't exist. for dir in ./src ./lib-src ./cpp ./oldXMenu ./etc ; do if [ ! -d ${dir} ]; then @@ -563,6 +553,9 @@ case "${canonical}" in m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;; + m68*-hp-netbsd* ) + machine=hp9000s300 opsys=netbsd + ;; ## HP/UX 7, 8 and 9 are supported on these machines. m68*-hp-hpux* ) case "`uname -r`" in @@ -900,6 +893,7 @@ case "${canonical}" in *-sco3.2v4* ) opsys=sco4 ;; *-bsd386* ) opsys=bsd386 ;; *-386bsd* ) opsys=386bsd ;; + *-netbsd* ) opsys=netbsd ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. esac ;; @@ -1182,11 +1176,13 @@ dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks, dnl and also adds -ldnet to LIBS, which Autoconf uses for checks. AC_HAVE_LIBRARY(-ldnet) -AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" - if test -d /usr/X386/include; then - HAVE_XFREE386=yes - test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" - fi) +AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd") + +echo checking for XFree86 +if test -d /usr/X386/include; then + HAVE_XFREE386=yes + test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" +fi if test "${HAVE_X11}" = "yes"; then DEFS="$C_SWITCH_X_SITE $DEFS" |