[gjs/wip/ptomato/autotools: 5/7] build: Check for programs



commit 52ca45299b2e9d4d7a1c6a7b44a80a2ebfcc6653
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Sep 29 13:00:46 2016 -0700

    build: Check for programs
    
    This adds Autoconf's sanity checks to ln -s and sed.

 Makefile-insttest.am |    4 ++--
 Makefile.am          |    6 +++---
 configure.ac         |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/Makefile-insttest.am b/Makefile-insttest.am
index 5bd3035..4184f96 100644
--- a/Makefile-insttest.am
+++ b/Makefile-insttest.am
@@ -13,7 +13,7 @@ endif
 
 jsunit.test: installed-tests/jsunit.test.in Makefile
        $(AM_V_GEN)$(MKDIR_P) $(@D) && \
-       sed -e s,@pkglibexecdir\@,$(pkglibexecdir), < $< > $@.tmp && mv $@.tmp $@
+       $(SED) -e s,@pkglibexecdir\@,$(pkglibexecdir), < $< > $@.tmp && mv $@.tmp $@
 
 gjsinsttestdir = $(pkglibexecdir)/installed-tests
 gjsinsttest_PROGRAMS = 
@@ -186,7 +186,7 @@ endif
 
 %.test: installed-tests/scripts/%.js installed-tests/script.test.in Makefile
        $(AM_V_GEN)$(MKDIR_P) $(@D) && \
-       sed -e s,@pkglibexecdir\@,$(pkglibexecdir), \
+       $(SED) -e s,@pkglibexecdir\@,$(pkglibexecdir), \
                -e s,@name\@,$(notdir $<), \
                < $(srcdir)/installed-tests/script.test.in > $@.tmp && \
        mv $@.tmp $@
diff --git a/Makefile.am b/Makefile.am
index 9f58d38..becdafd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,7 +199,7 @@ EXTRA_DIST += $(tapset_in_files)
 if ENABLE_SYSTEMTAP
 gjs/gjs.stp: gjs/gjs.stp.in Makefile
        $(AM_V_GEN)$(MKDIR_P) $(@D) && \
-       sed -e s,@EXPANDED_LIBDIR@,$(libdir), < $< > $@.tmp && mv $@.tmp $@
+       $(SED) -e s,@EXPANDED_LIBDIR@,$(libdir), < $< > $@.tmp && mv $@.tmp $@
 tapsetdir   = $(DESTDIR)$(datadir)/systemtap/tapset
 tapset_DATA = $(tapset_in_files:.stp.in=.stp)
 endif
@@ -225,7 +225,7 @@ gjs_console_LDFLAGS = -rdynamic
 gjs_console_SOURCES = gjs/console.cpp
 
 install-exec-hook:
-       (cd $(DESTDIR)$(bindir) && ln -sf gjs-console$(EXEEXT) gjs$(EXEEXT))
+       (cd $(DESTDIR)$(bindir) && $(LN_S) -f gjs-console$(EXEEXT) gjs$(EXEEXT))
 
 include Makefile-test.am
 include Makefile-insttest.am
@@ -250,7 +250,7 @@ COMPRESSION=.bz2
 PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 DISTNAME=$(PACKAGE)-$(VERSION).tar$(COMPRESSION)
-TAG_VERSION := $(shell echo $(VERSION) |sed s/\\\./_/g)
+TAG_VERSION := $(shell echo $(VERSION) | $(SED) s/\\\./_/g)
 
 prepare-release-tag: Makefile
        git tag -m "Tag $(TAG_VERSION)" -a $(TAG_PREFIX)$(TAG_VERSION)
diff --git a/configure.ac b/configure.ac
index aa34e10..a13bc89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,8 @@ LT_INIT([disable-static])
 
 # Other programs
 AC_PROG_MKDIR_P
+AC_PROG_LN_S
+AC_PROG_SED
 
 GNOME_CXX_WARNINGS([maximum])
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]