diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-02-07 20:58:45 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-02-07 20:58:45 +0000 |
| commit | 5f101234d6ff7ee82f4a7efadb35cbeaa82a6c69 (patch) | |
| tree | ac828897359bec07c8143e4b8d270f7dc5e72302 /aclocal-fallback/qt.m4 | |
| parent | 8a6b4d596dbf6904c69a67c688318343e0e5ea84 (diff) | |
| download | wireshark-5f101234d6ff7ee82f4a7efadb35cbeaa82a6c69.tar.gz | |
Use a variable for the package name we're querying.
Add SVN Id.
svn path=/trunk/; revision=47538
Diffstat (limited to 'aclocal-fallback/qt.m4')
| -rw-r--r-- | aclocal-fallback/qt.m4 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/aclocal-fallback/qt.m4 b/aclocal-fallback/qt.m4 index c82dc3fed0..58027f4f45 100644 --- a/aclocal-fallback/qt.m4 +++ b/aclocal-fallback/qt.m4 @@ -8,7 +8,7 @@ dnl AC_DEFUN([AM_PATH_QT], [ - pkg_config_args=Qt + pkg_config_module=Qt no_qt="" @@ -30,16 +30,16 @@ AC_DEFUN([AM_PATH_QT], AC_MSG_CHECKING(for Qt - version >= $min_qt_version) if test x"$no_qt" = x ; then - QT_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - QT_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - qt_config_major_version=`$PKG_CONFIG --modversion $pkg_config_args | \ + QT_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_module` + QT_LIBS=`$PKG_CONFIG --libs $pkg_config_module` + qt_config_major_version=`$PKG_CONFIG --modversion $pkg_config_module | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - qt_config_minor_version=`$PKG_CONFIG --modversion $pkg_config_args | \ + qt_config_minor_version=`$PKG_CONFIG --modversion $pkg_config_module | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - qt_config_micro_version=`$PKG_CONFIG --modversion $pkg_config_args | \ + qt_config_micro_version=`$PKG_CONFIG --modversion $pkg_config_module | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_args; then + if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then : else no_qt=yes |