From a157e2b6ba030b586e92b22a0a0053a71a3e3a84 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 24 Aug 2009 01:37:39 -0700 Subject: [PATCH] Add checks for sed, awk and nm executables --- Makefile.am | 4 ++-- configure.ac | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 086de01..05578d9 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 f088352..e452e3a 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]), [ -- 2.7.4