* config/qt.m4 (QT_DO_IT_ALL): add test for Qt-without-X11-under-cygwin.

* config/Makefile.am:
	* config/cygwin.m4: remove special cygwin tests

	* configure.ac: check for shlwapi and gdi32 libraries (needed in
	windows); do not check special cygwin features.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13841 a592a061-630c-0410-9148-cb99ea01b6c8

config/Makefile.am

@@ -2,7 +2,6 @@ include $(top_srcdir)/config/common.am
 
 EXTRA_DIST = \
 	common.am \
-	cygwin.m4 \
 	gnome--.m4 \
 	gnome.m4 \
 	gtk--.m4 \

config/cygwin.m4

@@ -1,25 +0,0 @@
-# Macro added for some Cygwin-specific support     -*- sh -*-
-# @author@: Kayvan Sylvan
-
-AC_DEFUN([CHECK_WITH_CYGWIN],
-[
-  case $host_os in
-  cygwin* )
-    for frontend in $FRONTENDS ; do
-      case "$frontend" in
-      qt* )
-	if test "$lyx_use_packaging" = posix; then
-	  AC_MSG_CHECKING([window system for Qt])
-	  if test "x$with_x" = xno; then
-	    CPPFLAGS="${CPPFLAGS} -DQ_CYGWIN_WIN"
-	    AC_MSG_RESULT([Windows])
-	  else
-	    AC_MSG_RESULT([X11])
-	  fi
-	fi
-        ;;
-      esac
-    done
-    ;;
-  esac
-])

config/qt.m4

@@ -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

configure.ac

@@ -117,6 +117,10 @@ LYX_LOOP_DIR($lyx_cv_extra_prefix,[
 LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
 
+### These are needed in windows
+AC_CHECK_LIB(shlwapi, main)
+AC_CHECK_LIB(gdi32, main)
+
 AC_ARG_WITH(aiksaurus,
   [  --without-aiksaurus     do not use the Aiksaurus library],
   [lyx_use_aiksaurus=$withval])
@@ -144,9 +148,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