X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=988e51094ae0427529ec66240747a4d43539fe30;hb=56a35c2c61401f1855e91c11142a5389bfc5572c;hp=a77234c7dfb2af7ac72348ced26914e113dc7a2b;hpb=ac28bcc93fd3085f5a680a7ad76b0da5f7ad1021;p=lyx.git

diff --git a/configure.ac b/configure.ac
index a77234c7df..988e51094a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-dnl Process with autoconf to generate configure script   -*- sh -*-
+vdnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.6.0beta1,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Fri, May 29, 2008"])
+AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_SUBST(LYX_DATE, ["Fri, Jul 11, 2008"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -33,24 +33,10 @@ for file in config/install-sh config/mkinstalldirs ; do
   chmod 755 ${srcdir}/${file}
 done
 
-### Provide a dummy POTFILES.in in po in order to mark it as a PO directory
-test -f ${srcdir}/po/POTFILES.in || touch ${srcdir}/po/POTFILES.in
-
 ### 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
-    AC_DEFINE(HAVE_KPSEWHICH, 1,
-    [Define this if you have the kpsewhich program working on your system.])
-fi
-AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
-
 # Check for installed python
 AM_PATH_PYTHON(2.3,, :)
 
@@ -62,6 +48,7 @@ INSTALL_SCRIPT='${INSTALL}'
 
 ### we will also need a C compiler to compile GNU gettext
 AC_PROG_CC
+AC_GNU_SOURCE
 
 ### check for special systems
 AC_ISC_POSIX
@@ -238,6 +225,7 @@ fi
 dnl GNU gettext is written in C
 AC_LANG_PUSH(C)
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.16.1])
 AC_LANG_POP(C)
 
 # some standard header files