Attachment 87387 Details for Bug 54114 – 2/3] configure.ac: consistently use AS_IF instead of if/fi

[patch] 2/3] configure.ac: consistently use AS_IF instead of if/fi

0002-configure.ac-consistently-use-AS_IF-instead-of-if-fi.patch (text/plain), 2.39 KB, created by Simon McVittie on 2013-10-10 12:11:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-10 12:11:19 UTC

Size: 2.39 KB

patch

obsolete

>From 213784d3e87f0e6246a23cd6a54e3f1f02e6e40e Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 11 Jun 2013 15:22:16 +0100
>Subject: [PATCH 2/3] configure.ac: consistently use AS_IF instead of if/fi
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54114
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> configure.ac | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 911432f..f82b8b3 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -79,9 +79,8 @@ AC_SUBST([ERROR_CFLAGS])
> 
> # these aren't really error flags but they serve a similar purpose for us -
> # making the toolchain stricter
>-if test "x$enable_fatal_warnings" = xyes; then
>-  TP_ADD_LINKER_FLAG([ERROR_LDFLAGS], [-Wl,--no-copy-dt-needed-entries])
>-fi
>+AS_IF([test "x$enable_fatal_warnings" = xyes],
>+  [TP_ADD_LINKER_FLAG([ERROR_LDFLAGS], [-Wl,--no-copy-dt-needed-entries])])
> 
> AC_HEADER_STDC([])
> AC_C_INLINE
>@@ -103,23 +102,23 @@ PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.21])
> dnl Check for code generation tools
> XSLTPROC=
> AC_CHECK_PROGS([XSLTPROC], [xsltproc])
>-if test -z "$XSLTPROC"; then
>-  AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
>-fi
>+AS_IF([test -z "$XSLTPROC"],
>+  [AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])])
> 
> AM_PATH_PYTHON([2.3])
> 
> dnl check for a version of python that can run the twisted tests
> AC_MSG_CHECKING([for Python with Twisted and IRC protocol support])
> for TEST_PYTHON in python2.5 python2.6 python; do
>-  if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then
>-    if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then
>-      AM_CONDITIONAL([WANT_TWISTED_TESTS], true)
>+  AS_IF([$TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1],
>+    [
>+    AS_IF([$TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1],
>+      [
>+      AM_CONDITIONAL([WANT_TWISTED_TESTS], [true])
>       break
>-    else
>-      TEST_PYTHON=no
>-    fi
>-  fi
>+      ],
>+      [TEST_PYTHON=no])
>+    ])
> done
> AC_MSG_RESULT([$TEST_PYTHON])
> AC_SUBST(TEST_PYTHON)
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 54114: 80692 | 80693 | 80694 | 80695 | 80696 | 80697 | 80698 | 87386 | 87387 | 87388

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.