X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1c7a4f723f3d5a07cd7381a345681c5afb341130..5180cc015e2cca6f8cb635044ac4643cf83276cb:/configure.in

diff --git a/configure.in b/configure.in
index 952e117fcf..1ac6f55741 100644
--- a/configure.in
+++ b/configure.in
@@ -23,10 +23,14 @@ dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
 dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 dnl  Boston, MA 02111-1307, USA.
 
-AC_PREREQ(2.50)dnl
+AC_PREREQ(2.51)dnl
 AC_INIT(src/lisp.h)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 
+dnl Support for --program-prefix, --program-suffix and
+dnl --program-transform-name options
+AC_ARG_PROGRAM
+
 lispdir='${datadir}/emacs/${version}/lisp'
 locallisppath='${datadir}/emacs/${version}/site-lisp:'\
 '${datadir}/emacs/site-lisp:${datadir}/emacs/${version}/leim'
@@ -179,6 +183,15 @@ changequote(, )dnl
 machine='' opsys='' unported=no
 case "${canonical}" in
 
+  ## FreeBSD ports
+  *-*-freebsd* )
+    opsys=freebsd
+    case "${canonical}" in
+      alpha*-*-freebsd*)	machine=alpha ;;
+      i[3456]86-*-freebsd*)	machine=intel386 ;;
+    esac
+  ;;
+
   ## NetBSD ports
   *-*-netbsd* )
     opsys=netbsd
@@ -1023,7 +1036,6 @@ case "${canonical}" in
 				;;
       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
       *-386bsd* )	        opsys=386bsd ;;
-      *-freebsd* )	        opsys=freebsd ;;
       *-nextstep* )             opsys=nextstep ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
     esac
@@ -1330,7 +1342,7 @@ AC_SUBST(LIBSOUND)
 dnl checks for header files
 AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
-  termcap.h stdio_ext.h fcntl.h term.h strings.h)
+  termcap.h stdio_ext.h fcntl.h term.h strings.h coff.h)
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_DECL_SYS_SIGLIST
@@ -2002,11 +2014,11 @@ if test "${with_kerberos+set}" = set; then
     AC_CHECK_HEADERS(krb5.h)
   else
     AC_CHECK_HEADERS(des.h,,
-		     AC_CHECK_HEADERS(kerberosIV/des.h,,
-				      AC_CHECK_HEADERS(kerberos/des.h)))
+		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
+				       [AC_CHECK_HEADERS(kerberos/des.h)])])
     AC_CHECK_HEADERS(krb.h,,
-		     AC_CHECK_HEADERS(kerberosIV/krb.h,,
-				      AC_CHECK_HEADERS(kerberos/krb.h)))
+		     [AC_CHECK_HEADERS(kerberosIV/krb.h,,
+				       [AC_CHECK_HEADERS(kerberos/krb.h)])])
   fi
   AC_CHECK_HEADERS(com_err.h)
 fi
@@ -2136,7 +2148,7 @@ else
   AC_MSG_RESULT(no)
 fi
 
-AC_FUNC_VFORK
+AC_FUNC_FORK
 
 # Fixme: This should be replaced when we have autoconf 2.14.
 AC_SIZE_T
@@ -2218,6 +2230,9 @@ if test "${REL_ALLOC}" = "yes" ; then
   AC_DEFINE(REL_ALLOC)
 fi
 
+AC_CHECK_HEADERS(nlist.h, [AC_DEFINE(NLIST_STRUCT, 1,
+                 [Define if you have <nlist.h>.])])
+
 #### Report on what we decided to do.
 echo "
 Configured for \`${canonical}'.
@@ -2272,7 +2287,7 @@ AC_EGREP_CPP(yes..yes,
 
 AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
 	man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \
-	lisp/Makefile leim/Makefile, [
+	lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile, [
 
 ### Make the necessary directories, if they don't exist.
 for dir in etc lisp ; do