Commit 509e807f authored by Kai Lüke's avatar Kai Lüke

Build UDisks again

Removing UDisks as system dependency because
the dependencies are able to be built in
jhbuild now.
parent 4af19fbb
......@@ -14,6 +14,8 @@
href="https://github.com/"/>
<repository type="git" name="gitlab.com"
href="https://gitlab.com/"/>
<repository type="git" name="pagure.io"
href="https://pagure.io/"/>
<!-- tarball repos -->
<repository type="tarball" name="cairo.org"
......@@ -1072,6 +1074,23 @@
</suggests>
</meson>
<autotools id="libblockdev" autogenargs="--without-gtk-doc">
<branch repo="github.com" module="storaged-project/libblockdev" patch="libblockdev-autogen-configure.patch"/>
<dependencies>
<dep package="pygobject"/>
<dep package="m4-common"/>
<dep package="libbytesize"/>
<dep package="libvolume_key"/>
</dependencies>
</autotools>
<autotools id="libbytesize" autogenargs="--without-gtk-doc">
<branch repo="github.com" module="rhinstaller/libbytesize" patch="libbytesize-autogen-configure.patch"/>
<dependencies>
<dep package="m4-common"/>
</dependencies>
</autotools>
<autotools id="libchamplain" autogenargs="--enable-vala">
<branch/>
<dependencies>
......@@ -1464,6 +1483,13 @@
</dependencies>
</autotools>
<autotools id="libvolume_key" autogen-sh="autoreconf">
<branch repo="pagure.io" module="volume_key"/>
<dependencies>
<dep package="m4-common"/>
</dependencies>
</autotools>
<!-- Deprecated -->
<autotools id="libwnck">
<branch/>
......@@ -1786,6 +1812,22 @@
</suggests>
</autotools>
<autotools id="udisks" autogenargs="--with-systemdsystemunitdir=no --disable-gtk-doc-html">
<branch repo="github.com" module="storaged-project/udisks"/>
<dependencies>
<dep package="gudev"/>
<dep package="libacl"/>
<dep package="polkit-gobject"/>
<dep package="polkit-agent"/>
<dep package="libatasmart"/>
<dep package="libblockdev"/>
<dep package="m4-common"/>
<if condition-set="systemd">
<dep package="libsystemd"/>
</if>
</dependencies>
</autotools>
<autotools id="uhttpmock" supports-non-srcdir-builds="no">
<branch repo="github.com" checkoutdir="uhttpmock" module="pwithnall/uhttpmock.git"/>
<dependencies>
......
......@@ -1103,11 +1103,6 @@
</systemdependencies>
</systemmodule>
<systemmodule id="udisks">
<pkg-config>udisks2.pc</pkg-config>
<branch repo="system" version="2.1.1"/>
</systemmodule>
<systemmodule id="valgrind">
<pkg-config>valgrind.pc</pkg-config>
<branch repo="system" version="3.10.0"/>
......
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