>>>>> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:
>>>>> "Enrico" == Enrico Forestieri <[EMAIL PROTECTED]> writes: Enrico> On Wed, May 10, 2006 at 10:14:13AM +0200, Jean-Marc Lasgouttes Enrico> wrote: >>> >>>>> "Enrico" == Enrico Forestieri <[EMAIL PROTECTED]> writes: >>> Enrico> No, please. config/cygwin.m4 in 1.5 should be copied verbatim Enrico> to 1.4. >>> My plan is to replace it with something like the following (not >>> tested, I am in a hurry). Enrico> I guess yes, if it is used whenever a qt related file is Enrico> compiled. Jean-Marc> Could you try the following patch, on either 1.4 or 1.5? I Jean-Marc> will additionally remove cygwin.m4. It seems that I forgot the patch... I will additionally remove config/cygwin.m4. JMarc
Index: configure.ac =================================================================== --- configure.ac (revision 13823) +++ configure.ac (working copy) @@ -144,9 +144,6 @@ AC_LIBTOOL_WIN32_DLL #AM_PROG_LIBTOOL LYX_PROG_LIBTOOL -### Check for some Cygwin-specific details. -CHECK_WITH_CYGWIN - ### Check for X libraries AC_PATH_XTRA case $have_x in Index: config/qt.m4 =================================================================== --- config/qt.m4 (revision 13823) +++ config/qt.m4 (working copy) @@ -248,6 +248,14 @@ AC_DEFUN([QT_DO_IT_ALL], case ${host} in *mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";; esac + + case ${host_os} in + cygwin* ) + if test "x$with_x" = xno ; then + QT_CPPFLAGS="$QT_CPPFLAGS -DQ_CYGWIN_WIN" + fi;; + esac + AC_SUBST(QT_CPPFLAGS) if test -z "$MOC"; then Index: config/Makefile.am =================================================================== --- config/Makefile.am (revision 13823) +++ config/Makefile.am (working copy) @@ -2,7 +2,6 @@ include $(top_srcdir)/config/common.am EXTRA_DIST = \ common.am \ - cygwin.m4 \ gnome--.m4 \ gnome.m4 \ gtk--.m4 \