diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
| commit | efbb23837761bda6c526baca1b5ea72d227e2ae3 (patch) | |
| tree | 728199c73595103d7561dd9d441bdbe1845c6331 /configure.ac | |
| parent | a58b023443b7a2ec089c45bf35bde2b0108aa19b (diff) | |
| parent | 17454dfea9f3c4d47fcf0b5370a6155f639c8aeb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 226648dcb..a365a5354 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,12 @@ AC_CONFIG_FILES([Makefile extras/hook-scripts/add-brick/Makefile extras/hook-scripts/add-brick/pre/Makefile extras/hook-scripts/add-brick/post/Makefile + extras/hook-scripts/start/Makefile + extras/hook-scripts/start/post/Makefile + extras/hook-scripts/set/Makefile + extras/hook-scripts/set/post/Makefile + extras/hook-scripts/stop/Makefile + extras/hook-scripts/stop/pre/Makefile contrib/fuse-util/Makefile contrib/uuid/uuid_types.h glusterfs-api.pc @@ -919,7 +925,7 @@ CONTRIBDIR='$(top_srcdir)/contrib' AC_SUBST(CONTRIBDIR) GF_CPPDEFINES='-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)' -GF_CPPINCLUDES='-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/uuid' +GF_CPPINCLUDES='-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/uuid $(UNITTEST_CPPFLAGS)' GF_CPPFLAGS="$GF_CPPDEFINES $GF_CPPINCLUDES" AC_SUBST([GF_CPPFLAGS]) |