>>>>> "Enrico" == Enrico Forestieri <[EMAIL PROTECTED]> writes:

>>  It seems AC_CHECK_LIB(gdi32,main) should work.

Enrico> Hmmm...

Enrico> $ nm /usr/lib/w32api/libgdi32.a | grep main (nothing here)

Enrico> But then I am an ignorant and perhaps main is special.

Actually, main() is defined in the test file used to compile. Thus
this code tests for the existence of the library, but it does not
check what the library defines.

JMarc

Index: configure.ac
===================================================================
--- configure.ac	(revision 13831)
+++ configure.ac	(working copy)
@@ -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)
+dnl 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
Index: config/qt.m4
===================================================================
--- config/qt.m4	(revision 13831)
+++ 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 13831)
+++ 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 \

Reply via email to