diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-31 11:58:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-31 11:58:37 +1100 |
| commit | 631e688c821b78d09d77f5940074800525c554aa (patch) | |
| tree | 74473f1727ea0afa27d9c15e50e4638c4d8faf28 /source4/build | |
| parent | 13be4d7ff42bd2b8bf5702a499c482404e5cd164 (diff) | |
| parent | 4b8e4ea7286f045effb6feb4c7bf8c5ef4ed2f9b (diff) | |
| download | samba-631e688c821b78d09d77f5940074800525c554aa.tar.gz samba-631e688c821b78d09d77f5940074800525c554aa.tar.bz2 samba-631e688c821b78d09d77f5940074800525c554aa.zip | |
Merge branch 'master' into wspp-schema
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/public.m4 | 4 | ||||
| -rw-r--r-- | source4/build/make/rules.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index bd98a400be..2bf63f0ca6 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -102,10 +102,12 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`" LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other) + ac_cv_$1_includedir_only="`$PKG_CONFIG --cflags-only-I '$2'`" + CFLAGS_REMOVE_USR_INCLUDE(ac_cv_$1_includedir_only) SMB_EXT_LIB($1, [`$PKG_CONFIG --libs-only-l '$2'`], [`$PKG_CONFIG --cflags-only-other '$2'`], - [`$PKG_CONFIG --cflags-only-I '$2'`], + [$ac_cv_$1_includedir_only], [$ac_cv_$1_libs_only_other]) ac_cv_$1_found=yes diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk index 55ecf8968b..e9f4786d34 100644 --- a/source4/build/make/rules.mk +++ b/source4/build/make/rules.mk @@ -185,7 +185,8 @@ showflags:: base_srcdirs = $(srcdir) ../librpc/ ../lib/ ../libcli etags: - etags `find $(base_srcdirs) -name "*.[ch]"` + etags $(ETAGS_OPTIONS) `find $(base_srcdirs) -name "*.[ch]"` ctags: - ctags `find $(base_srcdirs) -name "*.[ch]"` + ctags $(CTAGS_OPTIONS) `find $(base_srcdirs) -name "*.[ch]"` + |