comparison configure.ac @ 2680:b26d8b5d0d30

[xemacs-hg @ 2005-03-24 00:27:37 by aidan] Update some usage & error messages to use the --with-* syntax.
author aidan
date Thu, 24 Mar 2005 00:27:40 +0000
parents 4f72b178ae35
children 7be4146ed65e
comparison
equal deleted inserted replaced
2679:137460151b27 2680:b26d8b5d0d30
490 dnl --pdump --enable-pdump 490 dnl --pdump --enable-pdump
491 dnl --use-kkcc --enable-kkcc 491 dnl --use-kkcc --enable-kkcc
492 492
493 dnl parse flags 493 dnl parse flags
494 AC_ARG_WITH([prefix], 494 AC_ARG_WITH([prefix],
495 AC_HELP_STRING([--with-prefix=no],[Don't compile the value of --prefix into the executable.]), 495 AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]),
496 [true], [with_prefix=yes]) 496 [true], [with_prefix=yes])
497 AC_ARG_WITH([site-lisp], 497 AC_ARG_WITH([site-lisp],
498 AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]), 498 AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]),
499 [true], [with_site_lisp=no]) 499 [true], [with_site_lisp=no])
500 AC_ARG_WITH([site-modules], 500 AC_ARG_WITH([site-modules],
749 [], []) 749 [], [])
750 750
751 AC_ARG_WITH([xemacs-compiler], 751 AC_ARG_WITH([xemacs-compiler],
752 AC_HELP_STRING([--with-xemacs-compiler],[compiler to use to compile just the xemacs executable and C modules. 752 AC_HELP_STRING([--with-xemacs-compiler],[compiler to use to compile just the xemacs executable and C modules.
753 If you want to compile XEmacs as C++, use e.g. 753 If you want to compile XEmacs as C++, use e.g.
754 `--xemacs-compiler=g++'. This turns on a lot of 754 `--with-xemacs-compiler=g++'. This turns on a lot of
755 additional error-checking.]), 755 additional error-checking.]),
756 [], []) 756 [], [])
757 757
758 AC_ARG_WITH([cflags], 758 AC_ARG_WITH([cflags],
759 AC_HELP_STRING([--with-cflags],[Compiler flags (such as -O); setting this overrides 759 AC_HELP_STRING([--with-cflags],[Compiler flags (such as -O); setting this overrides
816 `no' or a comma-separated list of one or more 816 `no' or a comma-separated list of one or more
817 of `berkdb' and either `dbm' or `gnudbm'.]), 817 of `berkdb' and either `dbm' or `gnudbm'.]),
818 [ 818 [
819 if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then 819 if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
820 USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified 820 USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified
821 with the \`--$optname' option.") 821 with the \`--enable-database' option.")
822 fi 822 fi
823 ], 823 ],
824 [], 824 [],
825 [XE_COMPLEX_OPTION([berkdb],[""]), 825 [XE_COMPLEX_OPTION([berkdb],[""]),
826 XE_COMPLEX_OPTION([dbm],[""]), 826 XE_COMPLEX_OPTION([dbm],[""]),
1683 if test "$enable_clash_detection" != "no"; then 1683 if test "$enable_clash_detection" != "no"; then
1684 AC_DEFINE(CLASH_DETECTION) 1684 AC_DEFINE(CLASH_DETECTION)
1685 fi 1685 fi
1686 1686
1687 dnl Choose a compiler from (in order) 1687 dnl Choose a compiler from (in order)
1688 dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC 1688 dnl --with-compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
1689 test -n "$with_compiler" && CC="$with_compiler" 1689 test -n "$with_compiler" && CC="$with_compiler"
1690 if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler 1690 if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler
1691 case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac 1691 case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac
1692 fi 1692 fi
1693 1693
1751 dnl For example, `configure --compiler=gcc --xemacs-compiler=g++ 1751 dnl For example, `configure --compiler=gcc --xemacs-compiler=g++
1752 1752
1753 dnl The compiler used to build xemacs, as opposed to the compiler 1753 dnl The compiler used to build xemacs, as opposed to the compiler
1754 dnl used by configure and lib-src, is determined from the following 1754 dnl used by configure and lib-src, is determined from the following
1755 dnl sources, in order of priority: 1755 dnl sources, in order of priority:
1756 dnl o --xemacs-compiler configure flag 1756 dnl o --with-xemacs-compiler configure flag
1757 dnl o XEMACS_CC environment variable 1757 dnl o XEMACS_CC environment variable
1758 dnl o same as the regular compiler, (determined previously) 1758 dnl o same as the regular compiler, (determined previously)
1759 1759
1760 dnl We don't do AC_PROG_CC for XEMACS_CC; if we can't trust these people.... 1760 dnl We don't do AC_PROG_CC for XEMACS_CC; if we can't trust these people....
1761 test -n "$with_xemacs_compiler" && XEMACS_CC="$with_xemacs_compiler" 1761 test -n "$with_xemacs_compiler" && XEMACS_CC="$with_xemacs_compiler"