diff options
| author | unknown <lenz@mysql.com> | 2002-11-17 16:45:21 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2002-11-17 16:45:21 +0100 |
| commit | 2ef5ec316c2e7a34c6db6060f4869f0fd7026e03 (patch) | |
| tree | 0d2ca3bfdea2572bf2873e151c96820765460fa1 /configure.in | |
| parent | 638d4619ad6551c903f6c4ffbad58973f0af034a (diff) | |
| download | mariadb-git-2ef5ec316c2e7a34c6db6060f4869f0fd7026e03.tar.gz | |
- Applied required modifications for automake 1.5
- "make distcheck" needs to be fixed
BitKeeper/etc/ignore:
Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list
acinclude.m4:
- removed libtool.m4 (is part of libtool 1.4)
config.guess:
- applied diffs from config.guess of automake 1.5
config.sub:
- applied diffs from config.sub of automake 1.5
configure.in:
- renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL"
- added "AM_PROG_AS" for automake 1.5
dbug/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
install-sh:
- applied diffs from install.sh of automake 1.5
isam/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
- small correction for new libtool
ltmain.sh:
- applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
- applied diffs from missing of automake 1.5
myisam/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
- added $(EXEEXT) to test_charset
regex/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
- removed @CHARSET_SRCS@
vio/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 0fc85479db5..97b934b1420 100644 --- a/configure.in +++ b/configure.in @@ -161,7 +161,7 @@ fi AC_PROG_RANLIB # We use libtool #AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL #AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC @@ -446,6 +446,9 @@ AC_MSG_RESULT("$CHECK_PID") # We need a ANSI C compiler AM_PROG_CC_STDC +# We need an assembler, too +AM_PROG_AS + if test "$am_cv_prog_cc_stdc" = "no" then AC_MSG_ERROR([MySQL requires a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) |