[empathy] Use AC_ARG_ENABLE with --enable-*
- From: Emilio Pozuelo Monfort <epm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Use AC_ARG_ENABLE with --enable-*
- Date: Tue, 16 Aug 2011 12:07:45 +0000 (UTC)
commit e239157c776847fc577662752a5b49cd559b4a38
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Tue Aug 16 12:56:12 2011 +0100
Use AC_ARG_ENABLE with --enable-*
configure.ac | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e536613..4294602 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,11 +189,11 @@ PKG_CHECK_MODULES(EMPATHY_AV,
# -----------------------------------------------------------
# Call interface
# -----------------------------------------------------------
-AC_ARG_WITH(call,
- AC_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
+AC_ARG_ENABLE(call,
+ AS_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
[build with Call interface support]),,
- [with_call=auto])
-if test "x$with_call" != "xno" ; then
+ [enable_call=auto])
+if test "x$enable_call" != "xno" ; then
PKG_CHECK_MODULES(EMPATHY_CALL,
[
farsight2-0.10
@@ -210,7 +210,7 @@ else
have_call=no
fi
-if test "x$with_call" = "xyes" -a "x$have_call" != "xyes"; then
+if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
AC_MSG_ERROR([Could not find Call handler dependencies.])
fi
AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
@@ -219,11 +219,11 @@ AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
# -----------------------------------------------------------
# Call support in tp-logger
# -----------------------------------------------------------
-AC_ARG_WITH(call-logs,
- AC_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
+AC_ARG_ENABLE(call-logs,
+ AS_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
[build with call logs support]),,
- [with_call_logs=auto])
-if test "x$with_call_logs" != "xno" ; then
+ [enable_call_logs=auto])
+if test "x$enable_call_logs" != "xno" ; then
SAVE_CFLAGS=$CFLAGS
SAVE_CPPFLAGS=$CPPFLAGS
CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
@@ -242,7 +242,7 @@ else
have_call_logs=no
fi
-if test "x$with_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
+if test "x$enable_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
AC_MSG_ERROR([Call logs support requested but telepathy-logger wasn't
built with --enable-call])
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]