[X2Go-Commits] [pinentry-x2go] 05/05: Run lrelease during autoreconf.
git-admin at x2go.org
git-admin at x2go.org
Tue Feb 25 17:53:24 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pinentry-x2go.
commit 027f24f7ef0606a4af1ef856a9141f6d5155f641
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Feb 25 17:53:02 2014 +0100
Run lrelease during autoreconf.
---
configure.ac | 9 ++++++++-
debian/changelog | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index af69073..7b5253f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,13 +158,20 @@ Makefile
AC_OUTPUT
+for lrelease in $(which lrelease-qt4 lrelease 2>/dev/null); do
+ break;
+done;
for qmake in $(which qmake-qt4 qmake 2>/dev/null); do
break;
done;
+if test -z "$lrelease"; then
+ AC_MSG_ERROR([lrelease not found])
+fi;
if test -z "$qmake"; then
AC_MSG_ERROR([qmake not found])
fi;
-cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+( cd pinentry-x2go && "$lrelease" pinentry-x2go.pro; cd - 1>/dev/null;)
+( cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS"; cd - 1>/dev/null;)
AC_MSG_NOTICE([
Pinentry-X2Go v${VERSION} has been configured.
diff --git a/debian/changelog b/debian/changelog
index b9422d5..c60b0aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pinentry-x2go (0.7.5.7-0x2go1) UNRELEASED; urgency=low
- Set Pinentry title to X2Go Pinpad (was: X2GO ...).
- Update config.h.in.
- Update German translation file.
+ - Run lrelease during autoreconf.
* debian/source/format:
+ Add file, use format 1.0.
* debian/rules:
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
More information about the x2go-commits
mailing list