diff options
| author | kent@kent-amd64.(none) <> | 2007-10-31 10:52:18 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2007-10-31 10:52:18 +0100 |
| commit | b5e97b4b04d9eea86bf9a426fcfb3324376cf530 (patch) | |
| tree | cb6d3ae89525d80f58a4ac964cdba65a5ea36e58 /cmd-line-utils | |
| parent | 37e47a080acca7c87673856887f8c56c4fb14fdf (diff) | |
| parent | 2f88dce6ff191e001f4de1a0521143bf48692fb6 (diff) | |
| download | mariadb-git-b5e97b4b04d9eea86bf9a426fcfb3324376cf530.tar.gz | |
Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build
into mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index b87f11a8de2..23ee20894ec 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -5,8 +5,7 @@ ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c AHDR = vi.h emacs.h common.h -# Make sure to include stuff from this directory first, to get right "config.h" -INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_LIBRARIES = libedit.a @@ -31,7 +30,14 @@ EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c -DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR +# Make sure to include stuff from this directory first, to get right "config.h" +# Automake puts into DEFAULT_INCLUDES this source and corresponding +# build directory together with ../../include to let all make files +# find the central "config.h". This variable is used before INCLUDES +# above. But in automake 1.10 the order of these are changed. Put the +# includes of this directory into DEFS to always be sure it is first +# before DEFAULT_INCLUDES on the compile line. +DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR -I. -I$(srcdir) SUFFIXES = .sh |