Konrad Hofbauer <[EMAIL PROTECTED]> writes:
> At least on the Mac, it seems to be a non-issue. Deleting *.la in
> /qt/lib, and everything seems to be just fine - if I don't forget
> about it ;-). IMO no need to mess around before 1.6.0.

What was the contents of the .la files?

> We can build right now the Mac-version with 0 patches to the LyX
> source, 

That is a minimum for a supported platform.

Let's trying something I had in mind to avoid using --without-x. Wih
this patch, the code to configure X is only run when pkg-config has not
been successful. 

With this patch, you should be able to omit --without-x. Could you try
it out? Enrico, can you also try it on your 'exotic' platforms?

JMarc

svndiff

Index: configure.ac
===================================================================
--- configure.ac	(revision 26772)
+++ configure.ac	(working copy)
@@ -164,18 +164,6 @@ AC_CHECK_HEADERS(zlib.h,
  [LYX_LIB_ERROR(zlib.h,zlib)])
 
 
-### Check for X libraries
-AC_PATH_XTRA
-case $have_x in
-  yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-       CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
-  no) LYX_ERROR(dnl
-[Cannot find X window libraries and/or headers. Check your installation.
-  If you use a Linux system, check that you have installed
-  the development tools.]);;
-  disable) ;;
-esac
-
 ### check which frontend we want to use
 
 dnl The code below is not in a macro, because this would cause big
Index: config/qt4.m4
===================================================================
--- config/qt4.m4	(revision 26772)
+++ config/qt4.m4	(working copy)
@@ -182,6 +182,16 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
 
 AC_DEFUN([QT4_DO_MANUAL_CONFIG],
 [
+	dnl Check for X libraries
+	AC_PATH_X
+	AC_PATH_XTRA
+	case $have_x in
+	    yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+	         CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
+	     no) LYX_ERROR([Cannot find X window libraries and/or headers.]);;
+	disable) ;;
+	esac
+
 	dnl flags for compilation
 	QT4_INCLUDES=
 	QT4_LDFLAGS=

Reply via email to