Jean-Marc Lasgouttes wrote:
> I'd really prefer something like
>
> 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)
Ok, here are the patches for 13x and 14x.
Ok to commit?
--
Angus
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.86.2.42
diff -u -p -r1.86.2.42 ChangeLog
--- config/ChangeLog 30 Mar 2005 14:50:53 -0000 1.86.2.42
+++ config/ChangeLog 22 Apr 2005 10:18:45 -0000
@@ -1,3 +1,8 @@
+2005-04-22 Angus Leeming <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* configure.in (ALL_LINGUAS):
Index: config/qt.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/qt.m4,v
retrieving revision 1.6.2.3
diff -u -p -r1.6.2.3 qt.m4
--- config/qt.m4 18 Feb 2005 17:25:10 -0000 1.6.2.3
+++ config/qt.m4 22 Apr 2005 10:18:47 -0000
@@ -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)
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.389.2.66
diff -u -p -r1.389.2.66 ChangeLog
--- src/frontends/qt2/ChangeLog 8 Apr 2005 15:12:17 -0000 1.389.2.66
+++ src/frontends/qt2/ChangeLog 22 Apr 2005 10:19:02 -0000
@@ -1,3 +1,11 @@
+2005-04-22 Angus Leeming <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* QAbout.C (build_dialog): specify that the CREDITS data is
Index: src/frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.71.2.2
diff -u -p -r1.71.2.2 Makefile.am
--- src/frontends/qt2/Makefile.am 14 Dec 2004 10:40:06 -0000 1.71.2.2
+++ src/frontends/qt2/Makefile.am 22 Apr 2005 10:19:02 -0000
@@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_s
$(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 \
Index: src/frontends/qt2/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/moc/Makefile.am,v
retrieving revision 1.24.2.1
diff -u -p -r1.24.2.1 Makefile.am
--- src/frontends/qt2/moc/Makefile.am 14 Dec 2004 10:40:07 -0000 1.24.2.1
+++ src/frontends/qt2/moc/Makefile.am 22 Apr 2005 10:19:03 -0000
@@ -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)
Index: src/frontends/qt2/ui/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/Makefile.am,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.am
--- src/frontends/qt2/ui/Makefile.am 13 Jan 2003 10:33:21 -0000 1.20
+++ src/frontends/qt2/ui/Makefile.am 22 Apr 2005 10:19:03 -0000
@@ -14,8 +14,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_s
$(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)
Index: src/frontends/qt2/ui/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/moc/Makefile.am,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.am
--- src/frontends/qt2/ui/moc/Makefile.am 13 Jan 2003 10:33:23 -0000 1.14
+++ src/frontends/qt2/ui/moc/Makefile.am 22 Apr 2005 10:19:04 -0000
@@ -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)
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.155
diff -u -p -r1.155 ChangeLog
--- config/ChangeLog 18 Feb 2005 17:25:06 -0000 1.155
+++ config/ChangeLog 22 Apr 2005 10:18:26 -0000
@@ -1,3 +1,8 @@
+2005-04-22 Angus Leeming <[EMAIL PROTECTED]>
+
+ * qt.m4: Move the Qt-specific preprocessor flags out of the
+ various Makefile.am files to here. Specialise the flags for mingw.
+
2005-02-17 Michael Schmitt <[EMAIL PROTECTED]>
* qt.m4: detect Qt Win/Free library
Index: config/qt.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/qt.m4,v
retrieving revision 1.11
diff -u -p -r1.11 qt.m4
--- config/qt.m4 18 Feb 2005 17:25:06 -0000 1.11
+++ config/qt.m4 22 Apr 2005 10:18:26 -0000
@@ -199,6 +199,13 @@ AC_DEFUN([QT_DO_IT_ALL],
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
+ 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
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.763
diff -u -p -r1.763 ChangeLog
--- src/frontends/qt2/ChangeLog 15 Apr 2005 08:56:46 -0000 1.763
+++ src/frontends/qt2/ChangeLog 22 Apr 2005 10:23:04 -0000
@@ -1,3 +1,11 @@
+2005-04-22 Angus Leeming <[EMAIL PROTECTED]>
+
+ * 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-15 Jürgen Spitzmüller <[EMAIL PROTECTED]>
* ui/QPrefsConvertersModule.ui:
Index: src/frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile.am
--- src/frontends/qt2/Makefile.am 14 Dec 2004 10:41:06 -0000 1.101
+++ src/frontends/qt2/Makefile.am 22 Apr 2005 10:23:04 -0000
@@ -11,8 +11,7 @@ libqt2_la_LDFLAGS = $(QT_LDFLAGS)
libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
AM_CPPFLAGS = \
- -DQT_CLEAN_NAMESPACE \
- -DQT_GENUINE_STR \
+ $(QT_CPPFLAGS) \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
Index: src/frontends/qt2/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/moc/Makefile.am,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile.am
--- src/frontends/qt2/moc/Makefile.am 5 Jan 2005 15:35:41 -0000 1.31
+++ src/frontends/qt2/moc/Makefile.am 22 Apr 2005 10:23:07 -0000
@@ -3,7 +3,8 @@ include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += *.C
-AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
+AM_CPPFLAGS = \
+ $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
Index: src/frontends/qt2/ui/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/Makefile.am,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile.am
--- src/frontends/qt2/ui/Makefile.am 15 Jan 2005 19:17:11 -0000 1.29
+++ src/frontends/qt2/ui/Makefile.am 22 Apr 2005 10:23:07 -0000
@@ -8,9 +8,7 @@ SUBDIRS = . moc
EXTRA_DIST = QPreambleDialogBase.ui $(UIFILES)
AM_CPPFLAGS = \
- -DQT_CLEAN_NAMESPACE \
- -DQT_GENUINE_STR \
- -DQT_NO_TRANSLATION \
+ $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
Index: src/frontends/qt2/ui/moc/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/moc/Makefile.am,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile.am
--- src/frontends/qt2/ui/moc/Makefile.am 5 Jan 2005 15:35:41 -0000 1.20
+++ src/frontends/qt2/ui/moc/Makefile.am 22 Apr 2005 10:23:07 -0000
@@ -3,7 +3,8 @@ include $(srcdir)/../../Makefile.dialogs
DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
-AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
+AM_CPPFLAGS = \
+ $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
$(PCH_FLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
