Mercurial > emacs

comparison configure.in @ 15483:fb582ab686db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename lignux to linux-gnu in configuration names. Use gnu-linux as the opsys value (s/ file name). Allow i686 just like i386, i486, i586. (i*86-*-sco3.2v5): New alternative. (OVERRIDE_CPPFLAG): New variable. (CPPFLAGS): If OVERRIDE_CPPFLAG is set, use that. Specify vpath for .texi files.
author Richard M. Stallman <rms@gnu.org>
date Sat, 22 Jun 1996 03:44:21 +0000
parents 3ae004565765
children a6af1f88eec8
comparison
equal deleted inserted replaced
15482:b394c4c8b299 15483:fb582ab686db
107 vpath %.c $(srcdir)\ 107 vpath %.c $(srcdir)\
108 vpath %.h $(srcdir)\ 108 vpath %.h $(srcdir)\
109 vpath %.y $(srcdir)\ 109 vpath %.y $(srcdir)\
110 vpath %.l $(srcdir)\ 110 vpath %.l $(srcdir)\
111 vpath %.s $(srcdir)\ 111 vpath %.s $(srcdir)\
112 vpath %.in $(srcdir)' 112 vpath %.in $(srcdir)\
113 vpath %.texi $(srcdir)'
113 fi 114 fi
114 115
115 #### Given the configuration name, set machfile and opsysfile to the 116 #### Given the configuration name, set machfile and opsysfile to the
116 #### names of the m/*.h and s/*.h files we should use. 117 #### names of the m/*.h and s/*.h files we should use.
117 118
151 152
152 ## NetBSD ports 153 ## NetBSD ports
153 *-*-netbsd* ) 154 *-*-netbsd* )
154 opsys=netbsd 155 opsys=netbsd
155 case "${canonical}" in 156 case "${canonical}" in
156 i[345]86-*-netbsd*) machine=intel386 ;; 157 i[3456]86-*-netbsd*) machine=intel386 ;;
157 m68k-*-netbsd*) 158 m68k-*-netbsd*)
158 # This is somewhat bogus. 159 # This is somewhat bogus.
159 machine=hp9000s300 ;; 160 machine=hp9000s300 ;;
160 mips-*-netbsd*) machine=pmax ;; 161 mips-*-netbsd*) machine=pmax ;;
161 ns32k-*-netbsd*) machine=ns32000 ;; 162 ns32k-*-netbsd*) machine=ns32000 ;;
187 ## Alpha (DEC) machines. 188 ## Alpha (DEC) machines.
188 alpha-dec-osf* ) 189 alpha-dec-osf* )
189 machine=alpha opsys=osf1 190 machine=alpha opsys=osf1
190 ;; 191 ;;
191 192
192 alpha-*-linux* | alpha-*-lignux* ) 193 alpha-*-linux-gnu* )
193 machine=alpha opsys=lignux 194 machine=alpha opsys=gnu-linux
194 ;; 195 ;;
195 196
196 ## Altos 3068 197 ## Altos 3068
197 m68*-altos-sysv* ) 198 m68*-altos-sysv* )
198 machine=altos opsys=usg5-2 199 machine=altos opsys=usg5-2
258 ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov 259 ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov
259 NON_GNU_CPP="cc -E -P" 260 NON_GNU_CPP="cc -E -P"
260 ;; 261 ;;
261 262
262 ## Cubix QBx/386 263 ## Cubix QBx/386
263 i[345]86-cubix-sysv* ) 264 i[3456]86-cubix-sysv* )
264 machine=intel386 opsys=usg5-3 265 machine=intel386 opsys=usg5-3
265 ;; 266 ;;
266 267
267 ## Cydra 5 268 ## Cydra 5
268 cydra*-cydrome-sysv* ) 269 cydra*-cydrome-sysv* )
437 clipper-orion-bsd* ) 438 clipper-orion-bsd* )
438 machine=orion105 opsys=bsd4-2 439 machine=orion105 opsys=bsd4-2
439 ;; 440 ;;
440 441
441 ## IBM machines 442 ## IBM machines
442 i[345]86-ibm-aix1.1* ) 443 i[3456]86-ibm-aix1.1* )
443 machine=ibmps2-aix opsys=usg5-2-2 444 machine=ibmps2-aix opsys=usg5-2-2
444 ;; 445 ;;
445 i[345]86-ibm-aix1.[23]* | i[345]86-ibm-aix* ) 446 i[3456]86-ibm-aix1.[23]* | i[3456]86-ibm-aix* )
446 machine=ibmps2-aix opsys=usg5-3 447 machine=ibmps2-aix opsys=usg5-3
447 ;; 448 ;;
448 i370-ibm-aix*) 449 i370-ibm-aix*)
449 machine=ibm370aix opsys=usg5-3 450 machine=ibm370aix opsys=usg5-3
450 ;; 451 ;;
492 m68*-isi-bsd4.3* ) 493 m68*-isi-bsd4.3* )
493 machine=isi-ov opsys=bsd4-3 494 machine=isi-ov opsys=bsd4-3
494 ;; 495 ;;
495 496
496 ## Intel 386 machines where we do care about the manufacturer 497 ## Intel 386 machines where we do care about the manufacturer
497 i[345]86-intsys-sysv* ) 498 i[3456]86-intsys-sysv* )
498 machine=is386 opsys=usg5-2-2 499 machine=is386 opsys=usg5-2-2
499 ;; 500 ;;
500 501
501 ## Prime EXL 502 ## Prime EXL
502 i[345]86-prime-sysv* ) 503 i[3456]86-prime-sysv* )
503 machine=i386 opsys=usg5-3 504 machine=i386 opsys=usg5-3
504 ;; 505 ;;
505 506
506 ## Sequent Symmetry running Dynix 507 ## Sequent Symmetry running Dynix
507 i[345]86-sequent-bsd* ) 508 i[3456]86-sequent-bsd* )
508 machine=symmetry opsys=bsd4-3 509 machine=symmetry opsys=bsd4-3
509 ;; 510 ;;
510 511
511 ## Sequent Symmetry running DYNIX/ptx 512 ## Sequent Symmetry running DYNIX/ptx
512 ## Use the old cpp rather than the newer ANSI one. 513 ## Use the old cpp rather than the newer ANSI one.
513 i[345]86-sequent-ptx* ) 514 i[3456]86-sequent-ptx* )
514 machine=sequent-ptx opsys=ptx 515 machine=sequent-ptx opsys=ptx
515 NON_GNU_CPP="/lib/cpp" 516 NON_GNU_CPP="/lib/cpp"
516 ;; 517 ;;
517 518
518 ## Unspecified sysv on an ncr machine defaults to svr4.2. 519 ## Unspecified sysv on an ncr machine defaults to svr4.2.
519 ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.) 520 ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
520 i[345]86-ncr-sysv* ) 521 i[3456]86-ncr-sysv* )
521 machine=ncr386 opsys=usg5-4-2 522 machine=ncr386 opsys=usg5-4-2
522 ;; 523 ;;
523 524
524 ## Intel Paragon OSF/1 525 ## Intel Paragon OSF/1
525 i860-intel-osf1* ) 526 i860-intel-osf1* )
676 m68*-stride-sysv* ) 677 m68*-stride-sysv* )
677 machine=stride opsys=usg5-2 678 machine=stride opsys=usg5-2
678 ;; 679 ;;
679 680
680 ## Suns 681 ## Suns
681 sparc-*-linux* | sparc-*-lignux* ) 682 sparc-*-linux-gnu* )
682 machine=sparc opsys=lignux 683 machine=sparc opsys=gnu-linux
683 ;; 684 ;;
684 685
685 *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \ 686 *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \
686 | i[345]86-*-solaris2* | i[345]86-*-sunos5* | powerpc*-*-solaris2* \ 687 | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
687 | rs6000-*-solaris2*) 688 | rs6000-*-solaris2*)
688 case "${canonical}" in 689 case "${canonical}" in
689 m68*-sunos1* ) machine=sun1 ;; 690 m68*-sunos1* ) machine=sun1 ;;
690 m68*-sunos2* ) machine=sun2 ;; 691 m68*-sunos2* ) machine=sun2 ;;
691 m68* ) machine=sun3 ;; 692 m68* ) machine=sun3 ;;
692 i[345]86-sun-sunos[34]* ) machine=sun386 ;; 693 i[3456]86-sun-sunos[34]* ) machine=sun386 ;;
693 i[345]86-*-* ) machine=intel386 ;; 694 i[3456]86-*-* ) machine=intel386 ;;
694 powerpc* | rs6000* ) machine=ibmrs6000 ;; 695 powerpc* | rs6000* ) machine=ibmrs6000 ;;
695 sparc* ) machine=sparc ;; 696 sparc* ) machine=sparc ;;
696 * ) unported=yes ;; 697 * ) unported=yes ;;
697 esac 698 esac
698 case "${canonical}" in 699 case "${canonical}" in
699 ## The Sun386 didn't get past 4.0. 700 ## The Sun386 didn't get past 4.0.
700 i[345]86-*-sunos4 ) opsys=sunos4-0 ;; 701 i[3456]86-*-sunos4 ) opsys=sunos4-0 ;;
701 *-sunos4.0* ) opsys=sunos4-0 ;; 702 *-sunos4.0* ) opsys=sunos4-0 ;;
702 *-sunos4.1.[3-9]* | *-sunos4shr*) 703 *-sunos4.1.[3-9]* | *-sunos4shr*)
703 opsys=sunos4shr 704 opsys=sunos4shr
704 NON_GNU_CPP=/usr/lib/cpp 705 NON_GNU_CPP=/usr/lib/cpp
705 ;; 706 ;;
819 m68*-wicat-sysv* ) 820 m68*-wicat-sysv* )
820 machine=wicat opsys=usg5-2 821 machine=wicat opsys=usg5-2
821 ;; 822 ;;
822 823
823 ## Intel 386 machines where we don't care about the manufacturer 824 ## Intel 386 machines where we don't care about the manufacturer
824 i[345]86-*-* ) 825 i[3456]86-*-* )
825 machine=intel386 826 machine=intel386
826 case "${canonical}" in 827 case "${canonical}" in
827 *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;; 828 *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
828 *-isc2.2* ) opsys=isc2-2 ;; 829 *-isc2.2* ) opsys=isc2-2 ;;
829 *-isc4.0* ) opsys=isc4-0 ;; 830 *-isc4.0* ) opsys=isc4-0 ;;
833 ;; 834 ;;
834 *-isc* ) opsys=isc3-0 ;; 835 *-isc* ) opsys=isc3-0 ;;
835 *-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;; 836 *-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
836 *-esix* ) opsys=esix ;; 837 *-esix* ) opsys=esix ;;
837 *-xenix* ) opsys=xenix ;; 838 *-xenix* ) opsys=xenix ;;
838 *-linux* | *-lignux* ) opsys=lignux ;; 839 *-linux-gnu* ) opsys=gnu-linux ;;
839 *-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;; 840 *-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;;
841 *-sco3.2v5* ) opsys=sco5
842 NON_GNU_CPP=/lib/cpp
843 # Prevent -belf from being passed to $CPP.
844 # /lib/cpp does not accept it.
845 OVERRIDE_CPPFLAGS=
846 ;;
840 *-bsd386* | *-bsdi1* ) opsys=bsd386 ;; 847 *-bsd386* | *-bsdi1* ) opsys=bsd386 ;;
841 *-bsdi2* ) opsys=bsdos2 ;; 848 *-bsdi2* ) opsys=bsdos2 ;;
842 *-386bsd* ) opsys=386bsd ;; 849 *-386bsd* ) opsys=386bsd ;;
843 *-freebsd* ) opsys=freebsd ;; 850 *-freebsd* ) opsys=freebsd ;;
844 *-nextstep* ) opsys=nextstep ;; 851 *-nextstep* ) opsys=nextstep ;;
845 ## Otherwise, we'll fall through to the generic opsys code at the bottom. 852 ## Otherwise, we'll fall through to the generic opsys code at the bottom.
846 esac 853 esac
847 ;; 854 ;;
848 855
849 ## Lignux/68k 856 ## Linux/68k-based GNU system
850 m68k-*-linux* | m68k-*-lignux* ) 857 m68k-*-linux-gnu* )
851 machine=m68k opsys=lignux 858 machine=m68k opsys=gnu-linux
852 ;; 859 ;;
853 860
854 * ) 861 * )
855 unported=yes 862 unported=yes
856 ;; 863 ;;
1106 1113
1107 ### First figure out CFLAGS (which we use for running the compiler here) 1114 ### First figure out CFLAGS (which we use for running the compiler here)
1108 ### and REAL_CFLAGS (which we use for real compilation). 1115 ### and REAL_CFLAGS (which we use for real compilation).
1109 ### The two are the same except on a few systems, where they are made 1116 ### The two are the same except on a few systems, where they are made
1110 ### different to work around various lossages. For example, 1117 ### different to work around various lossages. For example,
1111 ### GCC 2.5 on Lignux needs them to be different because it treats -g 1118 ### GCC 2.5 on GNU/Linux needs them to be different because it treats -g
1112 ### as implying static linking. 1119 ### as implying static linking.
1113 1120
1114 ### If the CFLAGS env var is specified, we use that value 1121 ### If the CFLAGS env var is specified, we use that value
1115 ### instead of the default. 1122 ### instead of the default.
1116 1123
1226 LISP_FLOAT_TYPE=yes 1233 LISP_FLOAT_TYPE=yes
1227 1234
1228 1235
1229 #### Add the libraries to LIBS and check for some functions. 1236 #### Add the libraries to LIBS and check for some functions.
1230 1237
1231 CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS" 1238 if test x"${OVERRIDE_CPPFLAGS}" != x; then
1239 CPPFLAGS="$(OVERRIDE_CPPFLAGS)"
1240 else
1241 CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
1242 fi
1243
1232 LIBS="$libsrc_libs $LIBS" 1244 LIBS="$libsrc_libs $LIBS"
1233 1245
1234 dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks, 1246 dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
1235 dnl and also adds -ldnet to LIBS, which Autoconf uses for checks. 1247 dnl and also adds -ldnet to LIBS, which Autoconf uses for checks.
1236 AC_CHECK_LIB(dnet, dnet_ntoa) 1248 AC_CHECK_LIB(dnet, dnet_ntoa)
1268 if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then 1280 if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
1269 LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH 1281 LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH
1270 export LD_RUN_PATH 1282 export LD_RUN_PATH
1271 fi 1283 fi
1272 1284
1273 if test "${opsys}" = "lignux"; then 1285 if test "${opsys}" = "gnu-linux"; then
1274 AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link) 1286 AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link)
1275 AC_TRY_LINK([], 1287 AC_TRY_LINK([],
1276 [XOpenDisplay ("foo");], 1288 [XOpenDisplay ("foo");],
1277 [xlinux_first_failure=no], 1289 [xlinux_first_failure=no],
1278 [xlinux_first_failure=yes]) 1290 [xlinux_first_failure=yes])