Commit 1eed08da authored by Colomban Wendling's avatar Colomban Wendling

Properly detect the system sed

parent d51fb050
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
# ------------------------------------ # ------------------------------------
AC_DEFUN([OVCC_VALADOC_CHECK], AC_DEFUN([OVCC_VALADOC_CHECK],
[ [
AC_REQUIRE([AC_PROG_SED])
AC_ARG_ENABLE([valadoc], AC_ARG_ENABLE([valadoc],
[AS_HELP_STRING([--enable-valadoc], [AS_HELP_STRING([--enable-valadoc],
[Whether to build the documentation @<:@default=auto@:>@])], [Whether to build the documentation @<:@default=auto@:>@])],
...@@ -16,7 +18,7 @@ AC_DEFUN([OVCC_VALADOC_CHECK], ...@@ -16,7 +18,7 @@ AC_DEFUN([OVCC_VALADOC_CHECK],
[AC_PATH_PROG([VALADOC], [valadoc], [NONE]) [AC_PATH_PROG([VALADOC], [valadoc], [NONE])
AS_IF([test "x$VALADOC" != xNONE], AS_IF([test "x$VALADOC" != xNONE],
[AC_MSG_CHECKING([whether $VALADOC is at least version $1]) [AC_MSG_CHECKING([whether $VALADOC is at least version $1])
ovcc__valadoc_version=`$VALADOC --version | sed 's/Valadoc *//'` ovcc__valadoc_version=`$VALADOC --version | $SED 's/Valadoc *//'`
AS_VERSION_COMPARE([$1], ["$ovcc__valadoc_version"], AS_VERSION_COMPARE([$1], ["$ovcc__valadoc_version"],
[have_valadoc=yes], [have_valadoc=yes],
[have_valadoc=yes], [have_valadoc=yes],
......
...@@ -50,12 +50,12 @@ $(lib_LTLIBRARIES): stamp-hack ...@@ -50,12 +50,12 @@ $(lib_LTLIBRARIES): stamp-hack
stamp-hack: ovcc.h ovcc.vapi stamp-hack: ovcc.h ovcc.vapi
(f=`mktemp $@.XXXXXXXXXX`; trap -- "rm -f '$$f'" EXIT QUIT TERM; \ (f=`mktemp $@.XXXXXXXXXX`; trap -- "rm -f '$$f'" EXIT QUIT TERM; \
ovcc_h=ovcc.h; [ -f "$$ovcc_h" ] || ovcc_h="$(srcdir)/$$ovcc_h"; \ ovcc_h=ovcc.h; [ -f "$$ovcc_h" ] || ovcc_h="$(srcdir)/$$ovcc_h"; \
cat $(srcdir)/hack.h "$$ovcc_h" | sed '/<hack.h>/d'> "$$f" && \ cat $(srcdir)/hack.h "$$ovcc_h" | $(SED) '/<hack.h>/d'> "$$f" && \
(echo "/* this file is auto-generated, do not modify it (XXX: generated by valac) */" && \ (echo "/* this file is auto-generated, do not modify it (XXX: generated by valac) */" && \
cat "$$f") > ovcc.h) cat "$$f") > ovcc.h)
(f=`mktemp $@.XXXXXXXXXX`; trap -- "rm -f '$$f'" EXIT QUIT TERM; \ (f=`mktemp $@.XXXXXXXXXX`; trap -- "rm -f '$$f'" EXIT QUIT TERM; \
ovcc_vapi=ovcc.vapi; [ -f "$$ovcc_vapi" ] || ovcc_vapi="$(srcdir)/$$ovcc_vapi"; \ ovcc_vapi=ovcc.vapi; [ -f "$$ovcc_vapi" ] || ovcc_vapi="$(srcdir)/$$ovcc_vapi"; \
cat $(srcdir)/hack.vapi "$$ovcc_vapi" | sed 's~"\(hack\|ovcc\).h"~"ovcc/ovcc.h"~g' > "$$f" && \ cat $(srcdir)/hack.vapi "$$ovcc_vapi" | $(SED) 's~"\(hack\|ovcc\).h"~"ovcc/ovcc.h"~g' > "$$f" && \
(echo "/* this file is auto-generated, do not modify it (XXX: generated by valac) */" && \ (echo "/* this file is auto-generated, do not modify it (XXX: generated by valac) */" && \
cat "$$f") > ovcc.vapi) cat "$$f") > ovcc.vapi)
touch $@ touch $@
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
# ------------------------------------ # ------------------------------------
AC_DEFUN([OVCC_VALADOC_CHECK], AC_DEFUN([OVCC_VALADOC_CHECK],
[ [
AC_REQUIRE([AC_PROG_SED])
AC_ARG_ENABLE([valadoc], AC_ARG_ENABLE([valadoc],
[AS_HELP_STRING([--enable-valadoc], [AS_HELP_STRING([--enable-valadoc],
[Whether to build the documentation @<:@default=auto@:>@])], [Whether to build the documentation @<:@default=auto@:>@])],
...@@ -16,7 +18,7 @@ AC_DEFUN([OVCC_VALADOC_CHECK], ...@@ -16,7 +18,7 @@ AC_DEFUN([OVCC_VALADOC_CHECK],
[AC_PATH_PROG([VALADOC], [valadoc], [NONE]) [AC_PATH_PROG([VALADOC], [valadoc], [NONE])
AS_IF([test "x$VALADOC" != xNONE], AS_IF([test "x$VALADOC" != xNONE],
[AC_MSG_CHECKING([whether $VALADOC is at least version $1]) [AC_MSG_CHECKING([whether $VALADOC is at least version $1])
ovcc__valadoc_version=`$VALADOC --version | sed 's/Valadoc *//'` ovcc__valadoc_version=`$VALADOC --version | $SED 's/Valadoc *//'`
AS_VERSION_COMPARE([$1], ["$ovcc__valadoc_version"], AS_VERSION_COMPARE([$1], ["$ovcc__valadoc_version"],
[have_valadoc=yes], [have_valadoc=yes],
[have_valadoc=yes], [have_valadoc=yes],
......
...@@ -18,5 +18,5 @@ $(srcdir)/ovccclient.h $(srcdir)/ovccclient.vapi: libovccclient_la_vala.stamp ...@@ -18,5 +18,5 @@ $(srcdir)/ovccclient.h $(srcdir)/ovccclient.vapi: libovccclient_la_vala.stamp
# hack: add prefix to header filename in VAPI file # hack: add prefix to header filename in VAPI file
stamp-hack: $(srcdir)/ovccclient.vapi stamp-hack: $(srcdir)/ovccclient.vapi
$(AM_V_GEN) \ $(AM_V_GEN) \
sed -i 's~"\(ovccclient.h\)"~"ovcc/\1"~g' $< $(SED) -i 's~"\(ovccclient.h\)"~"ovcc/\1"~g' $<
touch $@ touch $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment