autoconf-archive/autoconf-archive-fix_AX_HAVE_QT.patch

54 lines
2.5 KiB
Diff

- Newer autoconfs get confused by code snippets that consist only
of comments.
- Use AS_HELP_STRING to format help messages.
signed-off-by: pth@suse.de
Index: m4/ax_have_qt.m4
===================================================================
--- m4/ax_have_qt.m4.orig 2010-10-26 00:00:00.000000000 +0200
+++ m4/ax_have_qt.m4 2011-03-23 14:53:45.959051749 +0100
@@ -101,20 +101,24 @@ AC_DEFUN([AX_HAVE_QT],
AC_MSG_CHECKING(for Qt)
AC_ARG_WITH([Qt-dir],
- [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the
- installation instructions of Trolltech. Header
- files are in DIR/include, binary utilities are
- in DIR/bin. The library is in DIR/lib, unless
- --with-Qt-lib-dir is also set.])
+ AS_HELP_STRING([--with-Qt-dir=DIR],
+ [DIR is equal to $QTDIR if you have followed the
+ installation instructions of Trolltech. Header
+ files are in DIR/include, binary utilities are
+ in DIR/bin. The library is in DIR/lib, unless
+ --with-Qt-lib-dir is also set.]))
AC_ARG_WITH([Qt-include-dir],
- [ --with-Qt-include-dir=DIR
- Qt header files are in DIR])
+ AS_HELP_STRING([--with-Qt-include-dir=DIR],
+ [Qt header files are in DIR]))
AC_ARG_WITH([Qt-bin-dir],
- [ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR])
+ AS_HELP_STRING([--with-Qt-bin-dir=DIR],
+ [Qt utilities such as moc and uic are in DIR]))
AC_ARG_WITH([Qt-lib-dir],
- [ --with-Qt-lib-dir=DIR The Qt library is in DIR])
+ AS_HELP_STRING([--with-Qt-lib-dir=DIR],
+ [The Qt library is in DIR]))
AC_ARG_WITH([Qt-lib],
- [ --with-Qt-lib=LIB Use -lLIB to link with the Qt library])
+ AS_HELP_STRING([--with-Qt-lib=LIB],
+ [Use -lLIB to link with the Qt library]))
if test x"$with_Qt_dir" = x"no" ||
test x"$with_Qt_include-dir" = x"no" ||
test x"$with_Qt_bin_dir" = x"no" ||
@@ -494,7 +498,6 @@ AC_DEFUN([AX_PATH_QT_DIRECT],
# We can link with no special library directory.
ax_qt_lib_dir=
], [
- # Leave ax_qt_lib_dir defined
])
])
])