diff options
| author | Andreas Volz <andreas@er00923n.(none)> | 2010-08-04 00:05:55 +0200 |
|---|---|---|
| committer | Andreas Volz <andreas@er00923n.(none)> | 2010-08-04 00:05:55 +0200 |
| commit | 398da16b4757576f5409e1baaf1be4fe3a4bfc1f (patch) | |
| tree | 52c29ccd108c5f1b73a2dd5448c7572abb53a0bd | |
| parent | 4e6b136fe07ec539c439416ab58375e1a3edb195 (diff) | |
| download | dbus-c++-398da16b4757576f5409e1baaf1be4fe3a4bfc1f.tar.gz | |
preserve m4 warning
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/acx_pthread.m4 (renamed from config/acx_pthread.m4) | 0 |
4 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5df2cc8..912f64b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = src tools data doc examples EXTRA_DIST = autogen.sh bootstrap libdbus-c++.spec libdbus-c++.spec.in +ACLOCAL_AMFLAGS = -I m4 + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dbus-c++-1.pc @@ -58,7 +58,7 @@ fi echo "Running libtoolize..." libtoolize --force --copy -aclocalinclude="$ACLOCAL_FLAGS -I config" +aclocalinclude="$ACLOCAL_FLAGS -I m4" echo "Running aclocal $aclocalinclude ..." aclocal $aclocalinclude diff --git a/configure.ac b/configure.ac index 2054a07..16042db 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,7 @@ AC_INIT([libdbus-c++], 0.5.0, [shackan@gmail.com]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST diff --git a/config/acx_pthread.m4 b/m4/acx_pthread.m4 index eb09f5a..eb09f5a 100644 --- a/config/acx_pthread.m4 +++ b/m4/acx_pthread.m4 |