Changeset 148 for trunk

Timestamp:

06/01/07 17:23:38 (18 months ago)

Author:

zany

Message:

using AC_HELP_STRING for compat with autoconf <=2.57

Location:

trunk

Files:

• acinclude.m4 (modified) (2 diffs)
• configure.in (modified) (7 diffs)

trunk/acinclude.m4

@@ -8 +8 @@
 AC_DEFUN([IRDA_CHECK],[
 AC_ARG_ENABLE([irda],
-              [AS_HELP_STRING([--disable-irda],
+              [AC_HELP_STRING([--disable-irda],
                               [Disables openftp irda support @<:@default=auto@:>@])],
               [ac_irda_enabled=$enableval], [ac_irda_enabled=yes])
@@ -33 +33 @@
 AC_DEFUN([BLUETOOTH_CHECK],[  
 AC_ARG_ENABLE([bluetooth],
-              [AS_HELP_STRING([--disable-bluetooth],
+              [AC_HELP_STRING([--disable-bluetooth],
                               [Disables openftp bluetooth support @<:@default=auto@:>@])],
               [ac_bluetooth_enabled=$enableval], [ac_bluetooth_enabled=yes])

trunk/configure.in

@@ -5 +5 @@
 AM_INIT_AUTOMAKE(dist-bzip2)
 AM_CONFIG_HEADER(config.h)
+
+# note: AC_HELP_STRING is deprecated in autoconf 2.59 and later but
+# AS_HELP_STRING is not available in autoconf 2.57 or earlier.
 
 dnl AM_MAINTAINER_MODE
@@ -35 +38 @@
 # check for optional swig rebuild
 AC_ARG_ENABLE([swig],
-                [AS_HELP_STRING([--enable-swig],
+                [AC_HELP_STRING([--enable-swig],
                         [Rebuild language bindings @<:@default=no@:>@])],
 [case "${enableval}" in
@@ -49 +52 @@
 # check for language bindings
 AC_ARG_ENABLE([perl],
-              [AS_HELP_STRING([--disable-perl],
+              [AC_HELP_STRING([--disable-perl],
                               [Disables perl language bindings @<:@default=auto@:>@])],
               [ac_perl_enabled=$enableval], [ac_perl_enabled=yes])
@@ -59 +62 @@
 
 AC_ARG_ENABLE([python],
-              [AS_HELP_STRING([--disable-python],
+              [AC_HELP_STRING([--disable-python],
                               [Disables python language bindings @<:@default=auto@:>@])],
               [ac_python_enabled=$enableval], [ac_python_enabled=yes])
@@ -69 +72 @@
 
 AC_ARG_ENABLE([ruby],
-              [AS_HELP_STRING([--disable-ruby],
+              [AC_HELP_STRING([--disable-ruby],
                               [Disables ruby language bindings @<:@default=auto@:>@])],
               [ac_ruby_enabled=$enableval], [ac_ruby_enabled=yes])
@@ -79 +82 @@
 
 AC_ARG_ENABLE([tcl],
-              [AS_HELP_STRING([--enable-tcl],
+              [AC_HELP_STRING([--enable-tcl],
                               [Enables tcl language bindings @<:@default=off@:>@])],
               [ac_tcl_enabled=$enableval], [ac_tcl_enabled=no])
@@ -91 +94 @@
 dnl no need to build docs by default
 AC_ARG_ENABLE(builddocs,
-        AS_HELP_STRING([--enable-builddocs],
+        AC_HELP_STRING([--enable-builddocs],
                         [Compile documentation @<:@default=no@:>@]),
 [case "${enableval}" in