Kaydet (Commit) 162620c9 authored tarafından Luboš Luňák's avatar Luboš Luňák

first try to find moc in the Qt3/Qt4 location where the libs are

now it's possible to build with both KDE3 and KDE4 support
without having to set up anything specially
üst 67644e1a
...@@ -6600,7 +6600,7 @@ your Qt installation by exporting QTDIR before running "configure".]) ...@@ -6600,7 +6600,7 @@ your Qt installation by exporting QTDIR before running "configure".])
fi fi
dnl Check for Meta Object Compiler dnl Check for Meta Object Compiler
AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] ) AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
if test "$MOC" = "no" ; then if test "$MOC" = "no" ; then
AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
the root of your Qt installation by exporting QTDIR before running "configure".]) the root of your Qt installation by exporting QTDIR before running "configure".])
...@@ -6736,7 +6736,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then ...@@ -6736,7 +6736,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
fi fi
dnl Check for Meta Object Compiler dnl Check for Meta Object Compiler
AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] ) AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$PATH:$QT4DIR/bin] )
if test "$MOC4" = "no" ; then if test "$MOC4" = "no" ; then
AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
the root of your Qt installation by exporting QT4DIR before running "configure".]) the root of your Qt installation by exporting QT4DIR before running "configure".])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment