Author: yamakenz
Date: Sat Sep 29 15:53:59 2007
New Revision: 5021
Added:
trunk/m4/ax_path_qmake4.m4
Modified:
trunk/configure.ac
Log:
* m4/ax_path_qmake4.m4
- New file
* configure.ac
- Replace QMAKE_QT4 handlings with AX_PATH_QMAKE4. This resolves
finding a non-qt4 qmake as qmake4. Thanks UTUMI Hirosi for letting
me know it
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Sep 29 15:53:59 2007
@@ -22,7 +22,7 @@
AC_PATH_PROG(RSVG, rsvg)
AC_PATH_PROGS(MD5, md5 md5sum)
AC_PATH_PROGS(SHA1, sha1 sha1sum)
-AC_PATH_PROGS(QMAKE_QT4, qmake-qt4 qmake4 qmake)
+AX_PATH_QMAKE4
AM_MAINTAINER_MODE
@@ -767,7 +767,7 @@
use_qt4_immodule="no"
])
if test x$use_qt4_immodule = xyes; then
- if test -z "$QMAKE_QT4"; then
+ if test -z "$QMAKE4"; then
AC_MSG_ERROR([no qmake for Qt4 found])
fi
fi
@@ -1435,10 +1435,10 @@
# Generate Makefiles for Qt4 by qmake
if test x$use_qt4_immodule = xyes; then
- ${QMAKE_QT4} -o ${ac_abs_top_builddir}/qt4/immodule/Makefile.qmake \
- ${ac_abs_top_srcdir}/qt4/immodule/quiminputcontextplugin.pro
- ${QMAKE_QT4} -o ${ac_abs_top_builddir}/qt4/edittest/Makefile.qmake \
- ${ac_abs_top_srcdir}/qt4/edittest/edittest.pro
+ ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/immodule/Makefile.qmake \
+ ${ac_abs_top_srcdir}/qt4/immodule/quiminputcontextplugin.pro
+ ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/edittest/Makefile.qmake \
+ ${ac_abs_top_srcdir}/qt4/edittest/edittest.pro
fi
AC_MSG_RESULT([
Added: trunk/m4/ax_path_qmake4.m4
==============================================================================
--- (empty file)
+++ trunk/m4/ax_path_qmake4.m4 Sat Sep 29 15:53:59 2007
@@ -0,0 +1,42 @@
+#####
+#
+# SYNOPSIS
+#
+# AX_PATH_QMAKE4
+#
+# DESCRIPTION
+#
+# Check for Qt4 version of qmake.
+#
+# $QMAKE4 is set to absolute name of the executable if found.
+#
+# LAST MODIFICATION
+#
+# 2007-09-30
+#
+# COPYLEFT
+#
+# Copyright (c) 2007 YAMAMOTO Kengo <yamaken AT bp.iij4u.or.jp>
+#
+# Copying and distribution of this file, with or without
+# modification, are permitted in any medium without royalty provided
+# the copyright notice and this notice are preserved.
+
+AC_DEFUN([AX_PATH_QMAKE4], [
+
ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
+ AC_PROG_EGREP
+ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [],
["$PATH:$ax_guessed_qt4_dirs"])
+ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
+
+ AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
+ ax_cv_path_QMAKE4=no
+ for qmake4 in ${_QMAKE4} ${_QMAKE}; do
+ if ($qmake4 --version 2>&1 | $EGREP -q 'Qt.*[[Vv]]ersion 4'); then
+ QMAKE4="$qmake4"
+ ax_cv_path_QMAKE4="$qmake4"
+ AC_SUBST([QMAKE4])
+ break
+ fi
+ done
+ ])
+])
