comparison configure1.in @ 2345:91711632f474

* configure: Doc fix. * configure: Fix corrupted config_h_opts. * configure: Properly report option names in error messages. * configure: Properly recognize --x-includes and --x-libraries options. * configure: Fix syntax errors in code handling XFree386.

2344:d21c82eba8ab

The --with-x, --with-x11 and --with-x10 options specify what window
	system to use; if all are omitted, use X11 if present.  If you
	don't want X, specify \`--with-x=no'.

The --x-includes=DIR option tells the build process where to search for
	the X Windows header files.  If this option is omitted, the
	build process assumes they exist in a directory the compiler
	checks by default.

The --x-libraries=DIR option tells the build process where to look for
	the X windows libraries.  If this option is omitted, the build
	process assumes they are in a directory the compiler checks by
	default.

### These are the names of CPP symbols we want to define or leave undefined
### in src/config.h; their values are given by the shell variables of the same
### names.
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 HAVE_XFREE386"

### Record all the arguments, so we can save them in config.status.
arguments="$@"

          valomitted=yes
        ;;
      esac

      ## Change `-' in the option name to `_'.
      opt="`echo ${opt} | tr - _`"

      ## Process the option.
      case "${opt}" in

	  ## Make sure the value given was either "yes" or "no".
	  case "${val}" in
	    y | ye | yes )	val=yes ;;
	    n | no )		val=no  ;;
	    * )
	      (echo "${progname}: the \`--${opt}' option is supposed to have a boolean value.
Set it to either \`yes' or \`no'."
	       echo "${short_usage}") >&2
	      exit 1
	    ;;
	  esac

	  ## Make sure the value given was either "yes" or "no".
	  case "${val}" in
	    y | ye | yes )	val=yes ;;
	    n | no )		val=no  ;;
	    * )
	      (echo "${progname}: the \`--${opt}' option is supposed to have a boolean value.
Set it to either \`yes' or \`no'."
	       echo "${short_usage}") >&2
	      exit 1
	    ;;
	  esac

	"srcdir" )
	  ## If the value was omitted, get it from the next argument.
	  if [ "${valomitted}" = "yes" ]; then
	    ## Get the next argument from the argument list, if there is one.
            if [ $# = 1 ]; then
	      (echo "${progname}: You must give a value for the \`--${opt}' option, as in
    \`--${opt}=FOO'."
	       echo "${short_usage}") >&2
	      exit 1
	    fi
	    shift; val="$1"
	  fi

	## Has the user tried to tell us where the X files are?
	## I think these are dopey, but no less than three alpha
	## testers, at large sites, have said they have their X files
	## installed in odd places.
	"x-includes" )
	  ## If the value was omitted, get it from the next argument.
	  if [ "${valomitted}" = "yes" ]; then
	    ## Get the next argument from the argument list, if there is one.
            if [ $# = 1 ]; then
	      (echo "${progname}: You must give a value for the \`--${opt}' option, as in
    \`--${opt}=FOO'."
	       echo "${short_usage}") >&2
	      exit 1
	    fi
	    shift; val="$1"
	  fi
	  x_includes="${val}"
	  C_SWITCH_X_SITE="-I${x_includes}"
        ;;
	"x-libraries" )
	  ## If the value was omitted, get it from the next argument.
	  if [ "${valomitted}" = "yes" ]; then
	    ## Get the next argument from the argument list, if there is one.
            if [ $# = 1 ]; then
	      (echo "${progname}: You must give a value for the \`--${opt}' option, as in
    \`--${opt}=FOO'."
	       echo "${short_usage}") >&2
	      exit 1
	    fi
	    shift; val="$1"
	  fi

  "" )
    echo "  No window system specifed.  Looking for X Windows."
    window_system=none
    if [ -r /usr/lib/libX11.a \
	 -o -d /usr/include/X11 \
         -o -d /usr/X386/include]; then
      window_system=x11
    fi
  ;;
  * )
    echo "Don\'t specify the window system more than once." >&2

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

2345:91711632f474

The --with-x, --with-x11 and --with-x10 options specify what window
	system to use; if all are omitted, use X11 if present.  If you
	don't want X, specify \`--with-x=no'.

The --x-includes=DIR option tells the build process where to search
	for the X Windows header files.  DIR should have a
	subdirectory called \`X11' which contains \`X.h', \`Xlib.h', and
	the rest of the header files; DIR should not contain \`X11'
	itself.  If this option is omitted, the build process assumes
	they exist in a directory the compiler checks by default.

The --x-libraries=DIR option tells the build process where to look for
	the X windows libraries.  If this option is omitted, the build
	process assumes they are in a directory the compiler checks by
	default.

### These are the names of CPP symbols we want to define or leave undefined
### in src/config.h; their values are given by the shell variables of the same
### names.
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 HAVE_XFREE386"

### Record all the arguments, so we can save them in config.status.
arguments="$@"

          valomitted=yes
        ;;
      esac

      ## Change `-' in the option name to `_'.
      optname="${opt}"
      opt="`echo ${opt} | tr - _`"

      ## Process the option.
      case "${opt}" in

	  ## Make sure the value given was either "yes" or "no".
	  case "${val}" in
	    y | ye | yes )	val=yes ;;
	    n | no )		val=no  ;;
	    * )
	      (echo "${progname}: the \`--${optname}' option is supposed to have a boolean value.
Set it to either \`yes' or \`no'."
	       echo "${short_usage}") >&2
	      exit 1
	    ;;
	  esac

	  ## Make sure the value given was either "yes" or "no".
	  case "${val}" in
	    y | ye | yes )	val=yes ;;
	    n | no )		val=no  ;;
	    * )
	      (echo "${progname}: the \`--${optname}' option is supposed to have a boolean value.
Set it to either \`yes' or \`no'."
	       echo "${short_usage}") >&2
	      exit 1
	    ;;
	  esac

	"srcdir" )
	  ## If the value was omitted, get it from the next argument.
	  if [ "${valomitted}" = "yes" ]; then
	    ## Get the next argument from the argument list, if there is one.
            if [ $# = 1 ]; then
	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
    \`--${optname}=FOO'."
	       echo "${short_usage}") >&2
	      exit 1
	    fi
	    shift; val="$1"
	  fi

	## Has the user tried to tell us where the X files are?
	## I think these are dopey, but no less than three alpha
	## testers, at large sites, have said they have their X files
	## installed in odd places.
	"x_includes" )
	  ## If the value was omitted, get it from the next argument.
	  if [ "${valomitted}" = "yes" ]; then
	    ## Get the next argument from the argument list, if there is one.
            if [ $# = 1 ]; then
	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
    \`--${optname}=FOO'."
	       echo "${short_usage}") >&2
	      exit 1
	    fi
	    shift; val="$1"
	  fi
	  x_includes="${val}"
	  C_SWITCH_X_SITE="-I${x_includes}"
        ;;
	"x_libraries" )
	  ## If the value was omitted, get it from the next argument.
	  if [ "${valomitted}" = "yes" ]; then
	    ## Get the next argument from the argument list, if there is one.
            if [ $# = 1 ]; then
	      (echo "${progname}: You must give a value for the \`--${optname}' option, as in
    \`--${optname}=FOO'."
	       echo "${short_usage}") >&2
	      exit 1
	    fi
	    shift; val="$1"
	  fi

  "" )
    echo "  No window system specifed.  Looking for X Windows."
    window_system=none
    if [ -r /usr/lib/libX11.a \
	 -o -d /usr/include/X11 \
         -o -d /usr/X386/include ]; then
      window_system=x11
    fi
  ;;
  * )
    echo "Don\'t specify the window system more than once." >&2

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