X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=db689d8fae088c029939851b3731b2da2d6837cc;hb=3410c395b58d12f63d7bfaac0e55a7b642e71009;hp=d0a64ccdb00c4494d21fbb28eefa3e85f34c66a1;hpb=620d390c2d2bf90979774531ba83baf3d5880c9c;p=lyx.git

diff --git a/configure.ac b/configure.ac
index d0a64ccdb0..db689d8fae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,9 @@ done
 ### Check for programs
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+
+AC_SUBST(AWK,[gawk])
+
 #AC_PROG_RANLIB
 AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
 if test "x$KPSEWHICH" = xkpsewhich ; then
@@ -38,6 +41,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
@@ -395,7 +401,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 \
@@ -410,6 +416,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 \