/pidgin/main: b331678195f5: Use AS_HELP_STRING instead of obsole...
Elliott Sales de Andrade
qulogic at pidgin.im
Fri Jan 25 02:16:43 EST 2013
Changeset: b331678195f5f73a2a2978b8f2a5adead0df011c
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2013-01-23 22:03 -0500
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/b331678195f5
Description:
Use AS_HELP_STRING instead of obsolete AC_HELP_STRING.
diffstat:
configure.ac | 118 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 59 deletions(-)
diffs (truncated from 408 to 300 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -296,7 +296,7 @@ esac
dnl #######################################################################
dnl # Disable creation and installation of translation files
dnl #######################################################################
-AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
+AC_ARG_ENABLE(nls, AS_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
if test x$enable_i18n = xyes; then
AC_PROG_INTLTOOL
@@ -352,7 +352,7 @@ GLIB_GENMARSHAL=`pkg-config --variable=g
AC_SUBST(GLIB_GENMARSHAL)
AC_ARG_WITH([extraversion],
- AC_HELP_STRING([--with-extraversion=STRING],
+ AS_HELP_STRING([--with-extraversion=STRING],
[extra version number to be displayed in Help->About and --help (for packagers)]),
EXTRA_VERSION=$withval)
@@ -362,19 +362,19 @@ else
AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION", [display version info])
fi
-AC_ARG_ENABLE(missing-dependencies, [AC_HELP_STRING([--disable-missing-dependencies],
+AC_ARG_ENABLE(missing-dependencies, [AS_HELP_STRING([--disable-missing-dependencies],
[skip missing dependencies instead of aborting configure])],
force_deps="$enableval", force_deps="yes")
AC_ARG_WITH(x, [],
with_x="$withval", with_x="yes")
-AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
+AC_ARG_ENABLE(gtkui, [AS_HELP_STRING([--disable-gtkui],
[compile without GTK+ user interface])],
enable_gtkui="$enableval", enable_gtkui="yes")
-AC_ARG_WITH(gtk, [AC_HELP_STRING([--with-gtk=<version>],
+AC_ARG_WITH(gtk, [AS_HELP_STRING([--with-gtk=<version>],
[compile with GTK+ 2 or 3 user interface (default: auto)])],
with_gtk="$withval", with_gtk="auto")
-AC_ARG_ENABLE(consoleui, [AC_HELP_STRING([--disable-consoleui],
+AC_ARG_ENABLE(consoleui, [AS_HELP_STRING([--disable-consoleui],
[compile without console user interface])],
[enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no])
@@ -382,35 +382,35 @@ dnl ####################################
dnl # Check for GTK+ 2.10 and other things used by the GTK UI
dnl #######################################################################
AC_ARG_ENABLE(screensaver,
- [AC_HELP_STRING([--disable-screensaver],
+ [AS_HELP_STRING([--disable-screensaver],
[compile without X screensaver extension (used to detect idleness)])],
enable_screensaver="$enableval", enable_screensaver="yes")
AC_ARG_ENABLE(sm,
- [AC_HELP_STRING([--disable-sm],
+ [AS_HELP_STRING([--disable-sm],
[compile without X session management support])],
enable_sm="$enableval", enable_sm="yes")
AC_ARG_ENABLE(startup-notification,
- [AC_HELP_STRING([--disable-startup-notification],
+ [AS_HELP_STRING([--disable-startup-notification],
[compile without startup notification support])],
enable_startup_notification="$enableval", enable_startup_notification="yes")
AC_ARG_ENABLE(gtkspell,
- [AC_HELP_STRING([--disable-gtkspell],
+ [AS_HELP_STRING([--disable-gtkspell],
[compile without GtkSpell automatic spell checking])],
enable_gtkspell="$enableval", enable_gtkspell="yes")
AC_ARG_ENABLE(gevolution,
- [AC_HELP_STRING([--enable-gevolution],
+ [AS_HELP_STRING([--enable-gevolution],
[compile with the Evolution plugin])],
enable_gevolution="$enableval", enable_gevolution="no")
AC_ARG_ENABLE(cap,
- [AC_HELP_STRING([--enable-cap],
+ [AS_HELP_STRING([--enable-cap],
[compile with Contact Availability Prediction plugin])],
enable_cap="$enableval", enable_cap="no")
AC_ARG_ENABLE(gestures,
- [AC_HELP_STRING([--disable-gestures],
+ [AS_HELP_STRING([--disable-gestures],
[compile without the gestures plugin])],
enable_gestures="$enableval", enable_gestures="yes")
AC_ARG_ENABLE(gcr,
- [AC_HELP_STRING([--enable-gcr],
+ [AS_HELP_STRING([--enable-gcr],
[compile with GCR certificate widgets])],
enable_gcr="$enableval", enable_gcr="no")
@@ -717,7 +717,7 @@ dnl # Check for ncurses and other things
dnl #######################################################################
GNT_LIBS=""
GNT_CFLAGS=""
-AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
+AC_ARG_WITH(ncurses-headers, [AS_HELP_STRING([--with-ncurses-headers=DIR],
[compile finch against the ncurses includes in DIR])],
[ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
if test "x$enable_consoleui" = "xyes"; then
@@ -852,9 +852,9 @@ dnl ####################################
dnl # Check for GStreamer
dnl #######################################################################
AC_ARG_ENABLE(gstreamer,
- [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
+ [AS_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
enable_gst="$enableval", enable_gst="yes")
-AC_ARG_WITH(gstreamer, [AC_HELP_STRING([--with-gstreamer=<version>],
+AC_ARG_WITH(gstreamer, [AS_HELP_STRING([--with-gstreamer=<version>],
[compile with GStreamer 0.10 or 1.0 interface (default: auto)])],
with_gstreamer="$withval", with_gstreamer="auto")
if test "x$enable_gst" != "xno"; then
@@ -922,7 +922,7 @@ dnl # Check for GStreamer Video
dnl #######################################################################
if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0"; then
AC_ARG_ENABLE(gstreamer-video,
- [AC_HELP_STRING([--disable-gstreamer-video], [compile without GStreamer 1.0 Video Overlay support])],
+ [AS_HELP_STRING([--disable-gstreamer-video], [compile without GStreamer 1.0 Video Overlay support])],
enable_gstvideo="$enableval", enable_gstvideo="yes")
if test "x$enable_gstvideo" != "xno"; then
PKG_CHECK_MODULES(GSTVIDEO, [gstreamer-video-1.0], [
@@ -942,7 +942,7 @@ dnl # Check for GStreamer Interfaces
dnl #######################################################################
if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x0.10"; then
AC_ARG_ENABLE(gstreamer-interfaces,
- [AC_HELP_STRING([--disable-gstreamer-interfaces], [compile without GStreamer 0.10 interface support])],
+ [AS_HELP_STRING([--disable-gstreamer-interfaces], [compile without GStreamer 0.10 interface support])],
enable_gstinterfaces="$enableval", enable_gstinterfaces="yes")
if test "x$enable_gstinterfaces" != "xno"; then
PKG_CHECK_MODULES(GSTINTERFACES, [gstreamer-interfaces-0.10], [
@@ -961,7 +961,7 @@ dnl ####################################
dnl # Check for Farstream
dnl #######################################################################
AC_ARG_ENABLE(farstream,
- [AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
+ [AS_HELP_STRING([--disable-farstream], [compile without farstream support])],
enable_farstream="$enableval", enable_farstream="yes")
if test "x$enable_farstream" != "xno"; then
if test "x$with_gstreamer" == "x1.0"; then
@@ -992,7 +992,7 @@ dnl ####################################
dnl # Check for Voice and Video support
dnl #######################################################################
AC_ARG_ENABLE(vv,
- [AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
+ [AS_HELP_STRING([--disable-vv], [compile without voice and video support])],
enable_vv="$enableval", enable_vv="yes")
if test "x$enable_vv" != "xno"; then
if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0" -a "x$enable_gstvideo" != "xno" -a "x$enable_farstream" != "xno"; then
@@ -1017,7 +1017,7 @@ dnl # Check for Internationalized Domain
dnl #######################################################################
AC_ARG_ENABLE(idn,
- [AC_HELP_STRING([--disable-idn], [compile without IDN support])],
+ [AS_HELP_STRING([--disable-idn], [compile without IDN support])],
[enable_idn="$enableval" force_idn=$enableval], [enable_idn="yes" force_idn=no])
if test "x$enable_idn" != "xno"; then
PKG_CHECK_MODULES(IDN, libidn >= 0.0.0, [
@@ -1040,7 +1040,7 @@ dnl ####################################
dnl # Check for Meanwhile headers (for Sametime)
dnl #######################################################################
AC_ARG_ENABLE(meanwhile,
- [AC_HELP_STRING([--disable-meanwhile],
+ [AS_HELP_STRING([--disable-meanwhile],
[compile without meanwhile (required for Sametime support)])],
enable_meanwhile="$enableval", enable_meanwhile="yes")
if test "x$enable_meanwhile" = "xyes"; then
@@ -1062,13 +1062,13 @@ dnl ####################################
dnl # Check for Native Avahi headers (for Bonjour)
dnl #######################################################################
AC_ARG_ENABLE(avahi,
- [AC_HELP_STRING([--disable-avahi],
+ [AS_HELP_STRING([--disable-avahi],
[compile without avahi (required for Bonjour support)])],
enable_avahi="$enableval", enable_avahi="yes")
if test "x$enable_avahi" = "xyes"; then
- AC_ARG_WITH(avahi-client-includes, [AC_HELP_STRING([--with-avahi-client-includes=DIR], [compile the Bonjour plugin against the Avahi Client includes in DIR])], [ac_avahi_client_includes="$withval"], [ac_avahi_client_includes="no"])
- AC_ARG_WITH(avahi-client-libs, [AC_HELP_STRING([--with-avahi-client-libs=DIR], [compile the Bonjour plugin against the Avahi Client libs in DIR])], [ac_avahi_client_libs="$withval"], [ac_avahi_client_libs="no"])
+ AC_ARG_WITH(avahi-client-includes, [AS_HELP_STRING([--with-avahi-client-includes=DIR], [compile the Bonjour plugin against the Avahi Client includes in DIR])], [ac_avahi_client_includes="$withval"], [ac_avahi_client_includes="no"])
+ AC_ARG_WITH(avahi-client-libs, [AS_HELP_STRING([--with-avahi-client-libs=DIR], [compile the Bonjour plugin against the Avahi Client libs in DIR])], [ac_avahi_client_libs="$withval"], [ac_avahi_client_libs="no"])
AVAHI_CFLAGS=""
AVAHI_LIBS=""
@@ -1115,8 +1115,8 @@ AC_SUBST(AVAHI_LIBS)
dnl #######################################################################
dnl # Check for SILC client includes and libraries
dnl #######################################################################
-AC_ARG_WITH(silc-includes, [AC_HELP_STRING([--with-silc-includes=DIR], [compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
-AC_ARG_WITH(silc-libs, [AC_HELP_STRING([--with-silc-libs=DIR], [compile the SILC plugin against the SILC libs in DIR])], [ac_silc_libs="$withval"], [ac_silc_libs="no"])
+AC_ARG_WITH(silc-includes, [AS_HELP_STRING([--with-silc-includes=DIR], [compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
+AC_ARG_WITH(silc-libs, [AS_HELP_STRING([--with-silc-libs=DIR], [compile the SILC plugin against the SILC libs in DIR])], [ac_silc_libs="$withval"], [ac_silc_libs="no"])
SILC_CFLAGS=""
SILC_LIBS=""
have_silc="no"
@@ -1162,8 +1162,8 @@ fi
dnl #######################################################################
dnl # Check for Gadu-Gadu client includes and libraries
dnl #######################################################################
-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+AC_ARG_WITH(gadu-includes, [AS_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+AC_ARG_WITH(gadu-libs, [AS_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
GADU_CFLAGS=""
GADU_LIBS=""
GADU_LIBGADU_VERSION=1.11.2
@@ -1266,7 +1266,7 @@ AC_SUBST(GADU_LIBGADU_VERSION)
AC_ARG_ENABLE(distrib,,,enable_distrib=no)
AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
DYNAMIC_PRPLS=all
-AC_ARG_WITH(static-prpls, [AC_HELP_STRING([--with-static-prpls], [Link to certain protocols statically])], [STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`], [STATIC_PRPLS=""])
+AC_ARG_WITH(static-prpls, [AS_HELP_STRING([--with-static-prpls], [Link to certain protocols statically])], [STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`], [STATIC_PRPLS=""])
if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then
DYNAMIC_PRPLS=""
fi
@@ -1349,7 +1349,7 @@ AC_SUBST(STATIC_LINK_LIBS)
AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
[Loads static protocol plugin module initialization functions.])
-AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+AC_ARG_WITH(dynamic_prpls, [AS_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
if test "x$DYNAMIC_PRPLS" = "xall" ; then
DYNAMIC_PRPLS="bonjour gg irc jabber msn mxit myspace novell oscar sametime silc simple yahoo zephyr"
fi
@@ -1386,15 +1386,15 @@ for i in $DYNAMIC_PRPLS ; do
esac
done
-AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes)
-AC_ARG_WITH(krb4, [AC_HELP_STRING([--with-krb4=PREFIX], [compile Zephyr plugin with Kerberos 4 support])], kerberos="$withval", kerberos="no")
-AC_ARG_WITH(zephyr, [AC_HELP_STRING([--with-zephyr=PREFIX], [compile Zephyr plugin against external libzephyr])], zephyr="$withval", zephyr="no")
+AC_ARG_ENABLE(plugins, [AS_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes)
+AC_ARG_WITH(krb4, [AS_HELP_STRING([--with-krb4=PREFIX], [compile Zephyr plugin with Kerberos 4 support])], kerberos="$withval", kerberos="no")
+AC_ARG_WITH(zephyr, [AS_HELP_STRING([--with-zephyr=PREFIX], [compile Zephyr plugin against external libzephyr])], zephyr="$withval", zephyr="no")
AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
AC_CHECK_HEADERS(sys/utsname.h)
AC_CHECK_FUNC(uname)
-AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
+AC_ARG_ENABLE(fortify, [AS_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
if test "x$GCC" = "xyes"; then
@@ -1487,8 +1487,8 @@ dnl ####################################
dnl # Check for D-Bus libraries
dnl #######################################################################
-AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes)
-AC_ARG_ENABLE(nm, [AC_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes)
+AC_ARG_ENABLE(dbus, [AS_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes)
+AC_ARG_ENABLE(nm, [AS_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes)
if test "x$enable_dbus" = "xyes" ; then
AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
@@ -1546,7 +1546,7 @@ dnl Alternatively, these python scripts
dnl in C (brrrr ...).
AC_ARG_WITH([python],
- AC_HELP_STRING([--with-python=PATH],
+ AS_HELP_STRING([--with-python=PATH],
[which python interpreter to use for dbus code generation]),
PYTHON=$withval)
@@ -1580,7 +1580,7 @@ dnl # This is still prone to error if on
dnl # although a newer dbus is installed. But I have tried to order the
dnl # directory searching to keep this situation at a minimum.
dnl ###########################################################################
-AC_ARG_WITH(dbus-services, [AC_HELP_STRING([--with-dbus-services=<dir>], [where the D-Bus services directory is located.])])
+AC_ARG_WITH(dbus-services, [AS_HELP_STRING([--with-dbus-services=<dir>], [where the D-Bus services directory is located.])])
DBUS_SERVICES_DIR=""
@@ -1661,7 +1661,7 @@ AC_SUBST(PY_LIBS)
dnl #######################################################################
dnl # Check for Mono support
dnl #######################################################################
-AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no)
+AC_ARG_ENABLE(mono, [AS_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no)
if test x"$enable_mono" = x"yes" ; then
PKG_CHECK_MODULES(MONO, mono, [
AC_SUBST(MONO_CFLAGS)
@@ -1702,7 +1702,7 @@ AM_CONDITIONAL(USE_MONO, test x"$enable_
dnl #######################################################################
dnl # Check for Perl support
dnl #######################################################################
-AC_ARG_ENABLE(perl, [AC_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes)
+AC_ARG_ENABLE(perl, [AS_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes)
if test "$enable_plugins" = no ; then
enable_perl=no
@@ -1825,7 +1825,7 @@ dnl #
dnl # Thanks go to Evolution for the checks.
dnl #######################################################################
-AC_ARG_WITH(system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])], [ssl_certificates_dir=$withval])
+AC_ARG_WITH(system-ssl-certs, [AS_HELP_STRING([--with-system-ssl-certs=<dir>], [directory containing system-wide SSL CA certificates])], [ssl_certificates_dir=$withval])
SSL_CERTIFICATES_DIR=""
if ! test -z "$ssl_certificates_dir" ; then
@@ -1895,7 +1895,7 @@ if test "x$enable_gnutls" != "xno"; then
fi
More information about the Commits
mailing list