|
From: <sv...@va...> - 2008-08-01 16:57:12
|
Author: bart Date: 2008-08-01 17:57:17 +0100 (Fri, 01 Aug 2008) New Revision: 8491 Log: Qt4 test is now skipped if pkg-config was not present at the time autogen.sh was run. Modified: branches/DRDDEV/configure.in Modified: branches/DRDDEV/configure.in =================================================================== --- branches/DRDDEV/configure.in 2008-08-01 06:53:39 UTC (rev 8490) +++ branches/DRDDEV/configure.in 2008-08-01 16:57:17 UTC (rev 8491) @@ -50,13 +50,6 @@ # place. AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], [--with-vex=$VEX_DIR]) -# pkg-config initialization. -ifdef( -[PKG_PROG_PKG_CONFIG], -[PKG_PROG_PKG_CONFIG()], -[echo "Error: pkg-config must be installed before autogen.sh is run."; exit 1] -) - # Checks for programs. CFLAGS="-Wno-long-long" @@ -1400,14 +1393,22 @@ # Has the QtCore package been installed ? -PKG_CHECK_EXISTS([QtCore], -[ - PKG_CHECK_MODULES([QTCORE], [QtCore]) - ac_have_qtcore=yes -], -[ - ac_have_qtcore=no -] +ifdef( + [PKG_CHECK_EXISTS], + [PKG_CHECK_EXISTS( + [QtCore], + [ + PKG_CHECK_MODULES([QTCORE], [QtCore]) + ac_have_qtcore=yes + ], + [ + ac_have_qtcore=no + ] + ) + ], + AC_MSG_WARN([pkg-config has not been installed or is too old.]) + AC_MSG_WARN([Detection of Qt4 will be skipped.]) + [ac_have_qtcore=no] ) AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes]) |