Skip to content

Commit

Permalink
Make "--with-qtdir" work better in ./configure.
Browse files Browse the repository at this point in the history
Previously if your --with-qtdir was not in your PATH, ./configure would pick up the uic that was in your path anyway.  Now uic and rcc are forced to those found inside whatever you specify with --with-qtdir.
-This line, and those below, will be ignored--

M    qgis/acinclude.m4


git-svn-id: http://svn.osgeo.org/qgis/trunk@4719 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
morb_au committed Jan 22, 2006
1 parent f1e52d8 commit ab2e759
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions acinclude.m4
Expand Up @@ -250,13 +250,13 @@ if test $QT_MAJOR = "4" ; then
fi
fi
# uic3 is the Qt user interface compiler in Qt3 legacy mode
AC_PATH_PROG(UIC, uic, , [$PATH:$QTDIR/bin])
# uic is the Qt user interface compiler
AC_CHECK_PROG(UIC, uic, $QTDIR/bin/uic, , $QTDIR/bin)
if test x$UIC = x ; then
AC_MSG_ERROR([*** uic must be in path])
fi
# check for rcc
AC_PATH_PROG(RCC, rcc, , [$PATH:$QTDIR/bin])
AC_CHECK_PROG(RCC, rcc, $QTDIR/bin/rcc, , $QTDIR/bin)
if test x$RCC = x ; then
AC_MSG_ERROR([*** rcc must be in path])
fi
Expand Down

0 comments on commit ab2e759

Please sign in to comment.