Mercurial > emacs
changeset 2333:47e301d9868b
* configure: Add special code to detect XFree386, and tell
config.h about it.
* configure: Properly handle extracting values of LIBS_MACHINE and
LIBS_SYSTEM that contain spaces.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Tue, 23 Mar 1993 06:54:37 +0000 |
| parents | bc2f7dc78412 |
| children | ec4ffd67483d |
| files | configure1.in |
| diffstat | 1 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure1.in Tue Mar 23 06:26:18 1993 +0000 +++ b/configure1.in Tue Mar 23 06:54:37 1993 +0000 @@ -96,7 +96,7 @@ config_h_opts=" \ HAVE_X_WINDOWS HAVE_X11 HAVE_X_MENU \ SIGTYPE GNU_MALLOC REL_ALLOC LISP_FLOAT_TYPE HAVE_CONST\ -LD_SWITCH_X_SITE C_SWITCH_X_SITE" +LD_SWITCH_X_SITE C_SWITCH_X_SITE HAVE_XFREE386" ### Record all the arguments, so we can save them in config.status. arguments="$@" @@ -792,7 +792,9 @@ "" ) echo " No window system specifed. Looking for X Windows." window_system=none - if [ -r /usr/lib/libX11.a -o -d /usr/include/X11 ]; then + if [ -r /usr/lib/libX11.a \ + -o -d /usr/include/X11 \ + -o -d /usr/X386/include]; then window_system=x11 fi ;; @@ -828,6 +830,17 @@ ;; esac +### Check for XFree386. It needs special hacks. +case ${window_system} in + x11 ) + if [ -d /usr/X386/include ]; then + HAVE_XFREE386=yes + if [ "${C_SWITCH_X_SITE}" = "" ]; then + C_SWITCH_X_SITE="-I/usr/X386/include + fi + fi + ;; +esac #### Choose a compiler. echo "Checking compilers." @@ -936,8 +949,8 @@ #endif ' > ${tempcname} eval `${default_cc} -E ${tempcname} \ - | grep '@configure@' \ - | sed -e 's/^@configure@//'` + | grep '@configure@' \ + | sed -e 's/^@configure@ \([^=]*=\)\(.*\)$/\1"\2"/'` rm ${tempcname} # Do the opsystem or machine files prohibit the use of the GNU malloc?