anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the setting of the Qt preprocessor flags out of the Makefiles and into qt.m4

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9856 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-04-22 10:59:45 +00:00
parent 073215fa69
commit ffc55ce682
7 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-22 Angus Leeming <leeming@lyx.org>
* qt.m4: Move the Qt-specific preprocessor flags out of the
various Makefile.am files to here. Specialise the flags for mingw.
2005-03-30 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in (ALL_LINGUAS):

41
config/qt.m4
View File

@ -15,7 +15,7 @@ AC_DEFUN([QT_FIND_PATH],
dirs="$dirs $dir"
done
IFS=$qt_save_IFS
for dir in $dirs; do
if test -x "$dir/$1"; then
if test -n "$5"; then
@ -32,7 +32,7 @@ AC_DEFUN([QT_FIND_PATH],
done
fi
])
if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then
AC_MSG_RESULT(not found)
$4
@ -50,7 +50,7 @@ AC_DEFUN([QT_FIND_UIC],
AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !])
fi
])
dnl Find the right moc in path/qt_cv_dir
AC_DEFUN([QT_FIND_MOC],
[
@ -97,17 +97,17 @@ AC_DEFUN([QT_TRY_LINK],
)
LIBS="$SAVE_LIBS"
])
dnl check we can do a compile
AC_DEFUN([QT_CHECK_COMPILE],
[
AC_MSG_CHECKING([for Qt library name])
AC_CACHE_VAL(qt_cv_libname,
[
AC_LANG_CPLUSPLUS
SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
for libname in -lqt3 -lqt2 -lqt -lqt-mt -lqt-mt3;
do
@ -121,7 +121,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
])
if test -z "$qt_cv_libname"; then
AC_MSG_RESULT([failed])
AC_MSG_RESULT([failed])
if test "$FATAL" = 1 ; then
AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you have the right \$QTDIR !])
fi
@ -151,12 +151,12 @@ EOF
rm -f conftest.$ac_ext
CPPFLAGS=$SAVE_CPPFLAGS
])
QT_VERSION=$lyx_cv_qtversion
AC_SUBST(QT_VERSION)
])
dnl start here
dnl start here
AC_DEFUN([QT_DO_IT_ALL],
[
dnl Please leave this alone. I use this file in
@ -165,10 +165,10 @@ AC_DEFUN([QT_DO_IT_ALL],
AC_ARG_WITH(qt-dir, [ --with-qt-dir where the root of Qt is installed ],
[ qt_cv_dir=`eval echo "$withval"/` ])
AC_ARG_WITH(qt-includes, [ --with-qt-includes where the Qt includes are. ],
[ qt_cv_includes=`eval echo "$withval"` ])
AC_ARG_WITH(qt-libraries, [ --with-qt-libraries where the Qt library is installed.],
[ qt_cv_libraries=`eval echo "$withval"` ])
@ -176,7 +176,7 @@ AC_DEFUN([QT_DO_IT_ALL],
if test -z "$qt_cv_dir"; then
qt_cv_dir=$QTDIR
fi
dnl derive inc/lib if needed
if test -n "$qt_cv_dir"; then
if test -z "$qt_cv_includes"; then
@ -198,20 +198,27 @@ AC_DEFUN([QT_DO_IT_ALL],
fi
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
if test -z "$MOC"; then
dnl Preprocessor flags
case ${host} in
*mingw*) QT_CPPFLAGS="-DQT_DLL -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";;
*) QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";;
esac
AC_SUBST(QT_CPPFLAGS)
if test -z "$MOC"; then
QT_FIND_MOC
MOC=$ac_moc
fi
AC_SUBST(MOC)
if test -z "$UIC"; then
if test -z "$UIC"; then
QT_FIND_UIC
UIC=$ac_uic
fi
AC_SUBST(UIC)
QT_CHECK_COMPILE
QT_LIB=$qt_cv_libname;
AC_SUBST(QT_LIB)

8
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,11 @@
2005-04-22 Angus Leeming <leeming@lyx.org>
* Makefile.am:
* moc/Makefile.am:
* ui/Makefile.am:
* ui/moc/Makefile.am: Move the Qt-specific preprocessor flags out of
the various Makefile.am files to config/qt.m4.
2005-04-08 Angus Leeming <leeming@lyx.org>
* QAbout.C (build_dialog): specify that the CREDITS data is

2
src/frontends/qt2/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
AM_CXXFLAGS = $(QT_CPPFLAGS)
libqt2_la_SOURCES = \
Alert_pimpl.C \

2
src/frontends/qt2/moc/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/src \
$(FRONTEND_INCLUDES) \
$(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
AM_CXXFLAGS = $(QT_CPPFLAGS) -DQT_NO_TRANSLATION
nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)

3
src/frontends/qt2/ui/Makefile.am
View File

@ -14,8 +14,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
AM_CXXFLAGS = $(QT_CPPFLAGS) -DQT_NO_TRANSLATION
nodist_libqt2ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C)

2
src/frontends/qt2/ui/moc/Makefile.am
View File

@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src \
$(FRONTEND_INCLUDES) \
$(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
AM_CXXFLAGS = $(QT_CPPFLAGS) -DQT_NO_TRANSLATION
nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)