summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-08-24 01:37:39 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-08-24 01:37:39 -0700
commita157e2b6ba030b586e92b22a0a0053a71a3e3a84 (patch)
tree7822886766299e6e43aed72888624e3f41720585
parentdd5b303250b55a730273447e09801c699882da6b (diff)
downloadconnman-a157e2b6ba030b586e92b22a0a0053a71a3e3a84.tar.gz
connman-a157e2b6ba030b586e92b22a0a0053a71a3e3a84.tar.bz2
connman-a157e2b6ba030b586e92b22a0a0053a71a3e3a84.zip
Add checks for sed, awk and nm executables
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 086de010..05578d9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,12 +169,12 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
src/connman.exp: $(src_connmand_OBJECTS)
- $(AM_V_GEN)nm -B $^ | awk '{ print $$3 }' | sort -u | \
+ $(AM_V_GEN)$(NM) -B $^ | $(AWK) '{ print $$3 }' | sort -u | \
grep -E -e '^connman_' -e '^g_dbus_' > $@
src/connman.ver: src/connman.exp
$(AM_V_at)echo "{ global:" > $@
- $(AM_V_GEN)cat $< | sed -e "s/\(.*\)/\1;/" >> $@
+ $(AM_V_GEN)cat $< | $(SED) -e "s/\(.*\)/\1;/" >> $@
$(AM_V_at)echo "local: *; };" >> $@
src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf
diff --git a/configure.ac b/configure.ac
index f0883528..e452e3a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,12 +23,15 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CC_PIE
AC_PROG_INSTALL
+AC_PROG_SED
+AC_PROG_AWK
m4_define([_LT_AC_TAGCONFIG], [])
m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+AC_PROG_NM
AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
[disable code optimization through compiler]), [