Commit 1e58ee19 authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

core-deps-3.26: fix libbytesize and libblockdev build

autogen.sh of these two modules does not execute generated
configure script. Use custom autogen template to execute both
scripts - autogen.sh and configure.

Note that previous attempt to use patches did not work because
these modules are not built from tarballs.
parent b11dc31e
......@@ -1077,10 +1077,10 @@
</suggests>
</meson>
<autotools id="libblockdev" autogenargs="--without-gtk-doc">
<branch repo="github.com" module="storaged-project/libblockdev">
<patch file="libblockdev-autogen-configure.patch" strip="1"/>
</branch>
<autotools id="libblockdev"
autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix=%(prefix)s %(autogenargs)s"
autogenargs="--without-gtk-doc">
<branch repo="github.com" module="storaged-project/libblockdev"/>
<dependencies>
<dep package="pygobject"/>
<dep package="m4-common"/>
......@@ -1089,10 +1089,10 @@
</dependencies>
</autotools>
<autotools id="libbytesize" autogenargs="--without-gtk-doc">
<branch repo="github.com" module="rhinstaller/libbytesize">
<patch file="libbytesize-autogen-configure.patch" strip="1"/>
</branch>
<autotools id="libbytesize"
autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix=%(prefix)s %(autogenargs)s"
autogenargs="--without-gtk-doc">
<branch repo="github.com" module="rhinstaller/libbytesize"/>
<dependencies>
<dep package="m4-common"/>
</dependencies>
......
diff --git a/autogen.sh b/autogen.sh
index 1f63992..0ea7050 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,3 +14,12 @@ PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac`
aclocal --install || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
popd
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
+
+ if [ "$1" = "--help" ]; then exit 0 else
+ echo "Now type \`make\' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
diff --git a/autogen.sh b/autogen.sh
index 0fa7f21..b73357a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,3 +15,12 @@ aclocal --install || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
rm -rf autom4te.cache
popd
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
+
+ if [ "$1" = "--help" ]; then exit 0 else
+ echo "Now type \`make\' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
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