X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=ac2ebfcb5ffe7ff6c0749ef26860c46a10f5f5e5;hb=90c26e2848e867b7cb7b4f5c31ca3e1377682f23;hp=9c953b608fbbe3151cdb151e60479a1fa96add44;hpb=e5ae321dabe6069a0bd6423006e7c5f100a00860;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 9c953b608f..ac2ebfcb5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,10 @@ done
 ### Check for programs
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+
+AC_PROG_AWK
+test "$AWK" = gawk && AWK="gawk --posix"
+
 #AC_PROG_RANLIB
 AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
 if test "x$KPSEWHICH" = xkpsewhich ; then
@@ -38,6 +42,9 @@ if test "x$KPSEWHICH" = xkpsewhich ; then
 fi
 AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
 
+# Check for installed python
+AM_PATH_PYTHON(1.5.2,, :)
+
 # Work around a problem in automake 1.4: when invoking install-strip,
 # INSTALL_PROGRAM is changed to 'install -s', and since
 # INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
@@ -152,6 +159,7 @@ esac
 dnl if the gtk frontend has been specified, then xforms is needed too
 if echo $FRONTENDS | grep gtk | grep -v xforms ; then
   FRONTENDS="xforms $FRONTENDS"
+  noxformsbin=yes
 fi
 
 dnl The code below is not in a macro, because this would cause big
@@ -160,7 +168,9 @@ for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
 	  XFORMS_DO_IT_ALL
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
+	  if test -z "$noxformsbin" ; then
+	    FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
+	  fi
 	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
 	  RPM_FRONTEND="xforms"
 	  FRONTEND_INFO="${FRONTEND_INFO}\
@@ -208,6 +218,9 @@ dnl qt build will fail without moc or uic
 	  if test -z "$UIC"; then
 	    LYX_ERROR([uic binary not found !])
 	  fi
+	  if test -z "$QT_LIB"; then
+	    LYX_ERROR([qt library not found !])
+	  fi
       ;;
     *)
 	  LYX_ERROR(Unknown frontend '$frontend');;
@@ -392,7 +405,7 @@ int mkstemp(char*);
 ])
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
+AC_CONFIG_SUBDIRS(lib)
 AC_CONFIG_FILES([Makefile  m4/Makefile \
        boost/Makefile \
        boost/libs/Makefile \
@@ -407,6 +420,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        development/lyx.spec \
        lib/Makefile \
        lib/doc/Makefile \
+       lib/lyx2lyx/Makefile \
        intl/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \