comparison configure1.in @ 5320:ada749d7f88c

(*-sun-solaris*): Add special case for Solaris 2.3. (i860-*-sysv4): Renamed from i860-*-sysvr4. (LIBS): Add test for existence of XSetWMProtocols. (solaris): Set NON_GNU_CPP instead of CPP. Set it for all solaris versions. (mips-mips-riscos4*): Set NON_GNU_CC, not CC. (after checking for GCC): If not GCC, and NON_GNU_CPP is set, set CPP. Likewise for NON_GNU_CC and CC. (mips-mips-riscos4*): Assign variable CC. (checking ${with_gcc}): If "no", don't override CC if already set. (CC): Initialize it as empty. (Suns): Set CPP if *-solaris2.3*.
author Richard M. Stallman <rms@gnu.org>
date Fri, 24 Dec 1993 02:26:57 +0000
parents 51d2f91b2ce1
children 80332dac0573
comparison
equal deleted inserted replaced
5319:55ef6a6dc4c2 5320:ada749d7f88c
77 locallisppath='${datadir}/emacs/site-lisp' 77 locallisppath='${datadir}/emacs/site-lisp'
78 lisppath='${locallisppath}:${lispdir}' 78 lisppath='${locallisppath}:${lispdir}'
79 etcdir='${datadir}/emacs/${version}/etc' 79 etcdir='${datadir}/emacs/${version}/etc'
80 lockdir='${statedir}/emacs/lock' 80 lockdir='${statedir}/emacs/lock'
81 archlibdir='${libdir}/emacs/${version}/${configuration}' 81 archlibdir='${libdir}/emacs/${version}/${configuration}'
82 CC=
82 83
83 # We cannot use this variable in the case statement below, because many 84 # We cannot use this variable in the case statement below, because many
84 # /bin/sh's have broken semantics for "case". Unfortunately, you must 85 # /bin/sh's have broken semantics for "case". Unfortunately, you must
85 # actually edit the clause itself. 86 # actually edit the clause itself.
86 # path_options="prefix | exec_prefix | bindir | libdir | etcdir | datadir" 87 # path_options="prefix | exec_prefix | bindir | libdir | etcdir | datadir"
708 i[34]86-ncr-sysv* ) 709 i[34]86-ncr-sysv* )
709 machine=intel386 opsys=usg5-4 710 machine=intel386 opsys=usg5-4
710 ;; 711 ;;
711 712
712 ## Intel 860 713 ## Intel 860
713 i860-*-sysvr4* ) 714 i860-*-sysv4* )
714 machine=i860 opsys=usg5-4 715 machine=i860 opsys=usg5-4
715 ;; 716 ;;
716 717
717 ## Silicon Graphics machines 718 ## Silicon Graphics machines
718 ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030) 719 ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
758 machine=mips4 759 machine=mips4
759 ## Fall through to the general code at the bottom to decide on the OS. 760 ## Fall through to the general code at the bottom to decide on the OS.
760 ;; 761 ;;
761 mips-mips-riscos4* ) 762 mips-mips-riscos4* )
762 machine=mips4 opsys=bsd4-3 763 machine=mips4 opsys=bsd4-3
764 NON_GNU_CC="cc -systype bsd43"
763 ;; 765 ;;
764 mips-mips-bsd* ) 766 mips-mips-bsd* )
765 machine=mips opsys=bsd4-3 767 machine=mips opsys=bsd4-3
766 ;; 768 ;;
767 mips-mips-* ) 769 mips-mips-* )
849 ## The Sun386 didn't get past 4.0. 851 ## The Sun386 didn't get past 4.0.
850 i386-*-sunos4 ) opsys=sunos4-0 ;; 852 i386-*-sunos4 ) opsys=sunos4-0 ;;
851 *-sunos4.0* ) opsys=sunos4-0 ;; 853 *-sunos4.0* ) opsys=sunos4-0 ;;
852 *-sunos4.1.3* ) opsys=sunos4-1-3 ;; 854 *-sunos4.1.3* ) opsys=sunos4-1-3 ;;
853 *-sunos4* | *-sunos ) opsys=sunos4-1 ;; 855 *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
854 *-sunos5* | *-solaris* ) opsys=sol2 ;; 856 *-sunos5.3* | *-solaris2.3* )
857 opsys=sol2-3
858 NON_GNU_CPP=/usr/ccs/lib/cpp
859 ;;
860 *-sunos5* | *-solaris* )
861 opsys=sol2
862 NON_GNU_CPP=/usr/ccs/lib/cpp
863 ;;
855 * ) opsys=bsd4-2 ;; 864 * ) opsys=bsd4-2 ;;
856 esac 865 esac
857 ;; 866 ;;
858 867
859 ## Tadpole 68k 868 ## Tadpole 68k
990 [ 999 [
991 1000
992 #### Choose a compiler. 1001 #### Choose a compiler.
993 case ${with_gcc} in 1002 case ${with_gcc} in
994 "yes" ) CC="gcc" GCC=1 ;; 1003 "yes" ) CC="gcc" GCC=1 ;;
995 "no" ) CC="cc" ;; 1004 "no" ) CC=${CC:-"cc"} ;;
996 * ) 1005 * )
997 ] AC_PROG_CC [ 1006 ] AC_PROG_CC [
998 esac 1007 esac
1008
1009 #### Some systems specify a CPP to use unless we are using GCC.
1010 #### Now that we know whether we are using GCC, we can decide whether
1011 #### to use that one.
1012 if [ x$NON_GNU_CPP = x ] || [ x$GCC = x1 ]
1013 then true
1014 else
1015 CPP=$NON_GNU_CPP
1016 fi
1017
1018 #### Some systems specify a CC to use unless we are using GCC.
1019 #### Now that we know whether we are using GCC, we can decide whether
1020 #### to use that one.
1021 if [ x$NON_GNU_CC = x ] || [ x$GCC = x1 ]
1022 then true
1023 else
1024 CC=$NON_GNU_CC
1025 fi
999 1026
1000 #### Some other nice autoconf tests. If you add a test here which 1027 #### Some other nice autoconf tests. If you add a test here which
1001 #### should make an entry in src/config.h, don't forget to add an 1028 #### should make an entry in src/config.h, don't forget to add an
1002 #### #undef clause to src/config.h.in for autoconf to modify. 1029 #### #undef clause to src/config.h.in for autoconf to modify.
1003 ] 1030 ]
1237 fi 1264 fi
1238 1265
1239 if test "${HAVE_X11}" = "yes"; then 1266 if test "${HAVE_X11}" = "yes"; then
1240 DEFS="$C_SWITCH_X_SITE $DEFS" 1267 DEFS="$C_SWITCH_X_SITE $DEFS"
1241 LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS" 1268 LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS"
1242 AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString XScreenNumberOfScreen) 1269 AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString XScreenNumberOfScreen XSetWMProtocols)
1243 fi 1270 fi
1244 1271
1245 AC_ALLOCA 1272 AC_ALLOCA
1246 1273
1247 # logb and frexp are found in -lm on most systems. 1274 # logb and frexp are found in -lm on most systems.