[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes:
| In Fedora Core pkg-config is available as a tool to configure the
| build correctly. But what about other platforms, where can we expect
| pkg-config to exist?
Why am I asking you say?
This simplifies things a bit, but is only protable to other places
using pkgconfig.
I did this in my tree: (sorry about the newlines...)
Index: autogen.sh
===================================================================
--- autogen.sh (revision 14495)
+++ autogen.sh (working copy)
@@ -4,7 +4,7 @@
AUTOHEADER="autoheader"
AUTOMAKE="automake --add-missing --copy --foreign"
AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 qt.m4 qt4.m4 gtk--.m4
gnome--.m4 gnom
e.m4 spell.m4 pkg.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 gtk--.m4 gnome--.m4
gnome.m4 spell.m4
pkg.m4"
# Discover what version of automake we are using.
automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
Index: configure.ac
===================================================================
--- configure.ac (revision 14495)
+++ configure.ac (working copy)
@@ -181,32 +181,51 @@
;;
qt3)
- QT_DO_IT_ALL
+ PKG_CHECK_MODULES(QT3_FRONTEND, qt-mt)
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt3\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
RPM_FRONTEND="qt3"
+ QTMT_VERSION=`pkg-config --modversion qt-mt`
+ QT3_VERSION=${QTMT_VERSION}
+ AC_SUBST(QT3_VERSION)
+ QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
-DQT_NO_STL -DQT_NO
_EMIT"
+ case ${host} in
+ *mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";;
+ esac
+ AC_SUBST(QT_CPPFLAGS)
FRONTEND_INFO="${FRONTEND_INFO}\
Qt Frontend:\n\
- Qt version:\t\t${QT_VERSION}\n"
+ Qt version:\t\t${QT3_VERSION}\n"
dnl qt build will fail without moc or uic
+ AC_CHECK_PROGS(MOC, moc-qt3 moc)
+ AC_CHECK_PROGS(UIC, uic-qt3 uic)
if test -z "$MOC"; then
LYX_ERROR([moc binary not found !])
fi
if test -z "$UIC"; then
LYX_ERROR([uic binary not found !])
fi
- if test -z "$QT_LIB"; then
- LYX_ERROR([qt library not found !])
- fi
;;
qt4)
- QT4_DO_IT_ALL
+ PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui)
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
RPM_FRONTEND="qt4"
+ QTCORE_VERSION=`pkg-config --modversion QtCore`
+ QTGUI_VERSION=`pkg-config --modversion QtGui`
+ QT4_VERSION=${QTCORE_VERSION}
+ AC_SUBST(QT4_VERSION)
+ QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
-DQT_NO_STL -DQT3_
SUPPORT -DQT_NO_KEYWORDS"
+ case ${host} in
+ *mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
+ esac
+ AC_SUBST(QT4_CPPFLAGS)
FRONTEND_INFO="${FRONTEND_INFO}\
Qt 4 Frontend:\n\
- Qt 4 version:\t\t${QT4_VERSION}\n"
+ QtCore version:\t\t${QTCORE_VERSION}\n\
+ QtGui version:\t\t${QTGUI_VERSION}\n"
+ AC_CHECK_PROGS(MOC4, moc-qt4 moc)
+ AC_CHECK_PROGS(UIC4, uic-qt4 uic)
dnl qt 4 build will fail without moc or uic
if test -z "$MOC4"; then
LYX_ERROR([moc 4 binary not found !])
@@ -214,9 +233,6 @@
if test -z "$UIC4"; then
LYX_ERROR([uic 4 binary not found !])
fi
- if test -z "$QT4_LIB"; then
- LYX_ERROR([qt 4 library not found !])
- fi
;;
*)
LYX_ERROR(Unknown frontend '$frontend');;
--
Lgb
