diff options
| author | unknown <lenz@mysql.com> | 2002-10-01 21:57:10 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2002-10-01 21:57:10 +0200 |
| commit | 9311345eccbd3c7526e2c17e6902a286a890a72f (patch) | |
| tree | 1498636efd6a0835df79c54a9044e3f8215d61cb /merge | |
| parent | c506c395b23979d7b8e9cbac24e3a0cc31bf1116 (diff) | |
| download | mariadb-git-9311345eccbd3c7526e2c17e6902a286a890a72f.tar.gz | |
- Applied required modifications for automake 1.5
- some additional small fixes
- added "depcomp" for automake 1.5
acinclude.m4:
- Removed AC_SYS_LARGEFILE (is in autoconf since v2.50)
config.guess:
- applied diffs from config.guess of automake 1.5
config.sub:
- applied diffs from config.sub of automake 1.5
configure.in:
- adapted for automake 1.5
- added AM_PROG_AS
- replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in
autoconf since v2.50)
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
include/my_global.h:
- fix for PPC64
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
libmysqld/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
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
tools/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
vio/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
Diffstat (limited to 'merge')
| -rw-r--r-- | merge/Makefile.am | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/merge/Makefile.am b/merge/Makefile.am index 94de6d65391..78441e84fac 100644 --- a/merge/Makefile.am +++ b/merge/Makefile.am @@ -21,14 +21,5 @@ libmerge_a_SOURCES = mrg_open.c mrg_extra.c mrg_info.c mrg_locking.c \ mrg_rrnd.c mrg_update.c mrg_delete.c mrg_rsame.c \ mrg_panic.c mrg_close.c mrg_create.c mrg_static.c -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ - __math.h time.h __time.h unistd.h __unistd.h types.h \ - xtypes.h ac-types.h posix.h string.h __string.h \ - errno.h socket.h inet.h dirent.h netdb.h \ - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ - prio_queue.h pthread_attr.h pthread_once.h queue.h\ - sleep.h specific.h version.h pwd.h timers.h uio.h \ - cdefs.h machdep.h signal.h __signal.h util.h - # Don't update the files from bitkeeper %::SCCS/s.% |