[HarfBuzz] harfbuzz: Branch 'master'

Behdad Esfahbod behdad at kemper.freedesktop.org
Tue Mar 4 13:08:48 PST 2014


 Makefile.am     |    4 ++--
 configure.ac    |    2 ++
 src/Makefile.am |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit bb8ffb581b89cf27fb8e0743b81bbda21654233e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Mar 4 13:03:51 2014 -0800

    Use AM_MISSING_PROG for ragel and git

diff --git a/Makefile.am b/Makefile.am
index 15ccbf8..fa87114 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,8 @@ CHANGELOG_RANGE =
 ChangeLog: $(srcdir)/ChangeLog
 $(srcdir)/ChangeLog:
 	$(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run \
-	   git log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \
+	  (GIT_DIR=$(top_srcdir)/.git \
+	   $(GIT) log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp "$(srcdir)/ChangeLog" \
 	  || ($(RM) $@.tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
diff --git a/configure.ac b/configure.ac
index 3d18f7a..e2be463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,8 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 PKG_PROG_PKG_CONFIG([0.20])
+AM_MISSING_PROG([RAGEL], [ragel])
+AM_MISSING_PROG([GIT], [git])
 
 # Version
 m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]]))
diff --git a/src/Makefile.am b/src/Makefile.am
index e2790a0..87d9890 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -302,7 +302,7 @@ EXTRA_DIST += \
 	hb-ot-shape-complex-sea-machine.rl \
 	$(NULL)
 .rl.hh:
-	$(AM_V_GEN)$(top_srcdir)/missing --run ragel -e -F1 -o "$@.tmp" "$<" && \
+	$(AM_V_GEN)$(RAGEL) -e -F1 -o "$@.tmp" "$<" && \
 	mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false )
 
 noinst_PROGRAMS = \


More information about the HarfBuzz mailing list