aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Marino2013-04-18 10:12:21 -0700
committerGlenn Morris2013-04-18 10:12:21 -0700
commit7e00831f518cf4c9ca505ec3e8767bf0787766b4 (patch)
tree12a177e18b10aeb12556a95bcfdce48e759dd1a0
parentcdca825560c4f97fba5ccd6ba87df5c881d1ffce (diff)
downloademacs-7e00831f518cf4c9ca505ec3e8767bf0787766b4.tar.gz
emacs-7e00831f518cf4c9ca505ec3e8767bf0787766b4.zip
* configure.ac: Add DragonFly BSD, mostly same as FreeBSD (tiny change)
Fixes: debbugs:14068
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac25
2 files changed, 19 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 573a8021eeb..dc6c0bfc3ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-04-18 John Marino <gnugcc@marino.st> (tiny change)
2
3 * configure.ac: Add DragonFly BSD, mostly same as FreeBSD. (Bug#14068)
4
12013-04-18 Glenn Morris <rgm@gnu.org> 52013-04-18 Glenn Morris <rgm@gnu.org>
2 6
3 * configure.ac (AC_PROG_LN_S): Remove, too restrictive. 7 * configure.ac (AC_PROG_LN_S): Remove, too restrictive.
diff --git a/configure.ac b/configure.ac
index 39a0477a693..2b3afc1fb80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,6 +439,11 @@ case "${canonical}" in
439 opsys=freebsd 439 opsys=freebsd
440 ;; 440 ;;
441 441
442 ## DragonFly ports
443 *-*-dragonfly* )
444 opsys=dragonfly
445 ;;
446
442 ## FreeBSD kernel + glibc based userland 447 ## FreeBSD kernel + glibc based userland
443 *-*-kfreebsd*gnu* ) 448 *-*-kfreebsd*gnu* )
444 opsys=gnu-kfreebsd 449 opsys=gnu-kfreebsd
@@ -968,7 +973,7 @@ esac
968 973
969LD_SWITCH_SYSTEM= 974LD_SWITCH_SYSTEM=
970case "$opsys" in 975case "$opsys" in
971 freebsd) 976 freebsd|dragonfly)
972 ## Let `ld' find image libs and similar things in /usr/local/lib. 977 ## Let `ld' find image libs and similar things in /usr/local/lib.
973 ## The system compiler, GCC, has apparently been modified to not 978 ## The system compiler, GCC, has apparently been modified to not
974 ## look there, contrary to what a stock GCC would do. 979 ## look there, contrary to what a stock GCC would do.
@@ -1054,7 +1059,7 @@ case "$opsys" in
1054 ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. 1059 ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
1055 aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; 1060 aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
1056 1061
1057 freebsd) LIBS_SYSTEM="-lutil" ;; 1062 freebsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
1058 1063
1059 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; 1064 hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
1060 1065
@@ -1095,7 +1100,7 @@ case $opsys in
1095 ## Adding -lm confuses the dynamic linker, so omit it. 1100 ## Adding -lm confuses the dynamic linker, so omit it.
1096 LIB_MATH= 1101 LIB_MATH=
1097 ;; 1102 ;;
1098 freebsd ) 1103 freebsd | dragonfly )
1099 SYSTEM_TYPE=berkeley-unix 1104 SYSTEM_TYPE=berkeley-unix
1100 ;; 1105 ;;
1101 gnu-linux | gnu-kfreebsd ) 1106 gnu-linux | gnu-kfreebsd )
@@ -2866,7 +2871,7 @@ mail_lock=no
2866case "$opsys" in 2871case "$opsys" in
2867 aix4-2) mail_lock="lockf" ;; 2872 aix4-2) mail_lock="lockf" ;;
2868 2873
2869 gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; 2874 gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
2870 2875
2871 ## On GNU/Linux systems, both methods are used by various mail programs. 2876 ## On GNU/Linux systems, both methods are used by various mail programs.
2872 ## I assume most people are using newer mailers that have heard of flock. 2877 ## I assume most people are using newer mailers that have heard of flock.
@@ -3038,7 +3043,7 @@ fail;
3038 fi 3043 fi
3039 ;; 3044 ;;
3040 3045
3041 openbsd) LIBS_TERMCAP="-lncurses" ;; 3046 openbsd | dragonfly) LIBS_TERMCAP="-lncurses" ;;
3042 3047
3043 ## hpux: Make sure we get select from libc rather than from libcurses 3048 ## hpux: Make sure we get select from libc rather than from libcurses
3044 ## because libcurses on HPUX 10.10 has a broken version of select. 3049 ## because libcurses on HPUX 10.10 has a broken version of select.
@@ -3461,7 +3466,7 @@ case $opsys in
3461esac 3466esac
3462 3467
3463case $opsys in 3468case $opsys in
3464 darwin | freebsd | netbsd | openbsd ) 3469 darwin | dragonfly | freebsd | netbsd | openbsd )
3465 AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to 3470 AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
3466 close a pty to make it a controlling terminal (it is already a 3471 close a pty to make it a controlling terminal (it is already a
3467 controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).]) 3472 controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
@@ -3567,7 +3572,7 @@ case $opsys in
3567 AC_DEFINE(FIRST_PTY_LETTER, ['p']) 3572 AC_DEFINE(FIRST_PTY_LETTER, ['p'])
3568 ;; 3573 ;;
3569 3574
3570 gnu-linux | gnu-kfreebsd | freebsd | netbsd ) 3575 gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
3571 dnl if HAVE_GRANTPT 3576 dnl if HAVE_GRANTPT
3572 if test "x$ac_cv_func_grantpt" = xyes; then 3577 if test "x$ac_cv_func_grantpt" = xyes; then
3573 AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) 3578 AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
@@ -3650,7 +3655,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
3650case $opsys in 3655case $opsys in
3651 dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX. 3656 dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
3652 dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX. 3657 dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
3653 aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin ) 3658 aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
3654 AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1) 3659 AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
3655 ;; 3660 ;;
3656 3661
@@ -3699,7 +3704,7 @@ AH_TEMPLATE(TAB3, [Undocumented.])
3699case $opsys in 3704case $opsys in
3700 darwin) AC_DEFINE(TAB3, OXTABS) ;; 3705 darwin) AC_DEFINE(TAB3, OXTABS) ;;
3701 3706
3702 gnu | freebsd | netbsd | openbsd ) 3707 gnu | dragonfly | freebsd | netbsd | openbsd )
3703 AC_DEFINE(TABDLY, OXTABS, [Undocumented.]) 3708 AC_DEFINE(TABDLY, OXTABS, [Undocumented.])
3704 AC_DEFINE(TAB3, OXTABS) 3709 AC_DEFINE(TAB3, OXTABS)
3705 ;; 3710 ;;
@@ -3753,7 +3758,7 @@ if test x$GCC = xyes; then
3753else 3758else
3754 case $opsys in 3759 case $opsys in
3755 dnl irix: Tested on Irix 6.5. SCM worked on earlier versions. 3760 dnl irix: Tested on Irix 6.5. SCM worked on earlier versions.
3756 freebsd | netbsd | openbsd | irix6-5 | sol2* ) 3761 dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
3757 AC_DEFINE(GC_SETJMP_WORKS, 1) 3762 AC_DEFINE(GC_SETJMP_WORKS, 1)
3758 ;; 3763 ;;
3759 esac 3764 esac