X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=38085adf683f17aa60887f9ac7640e2dc65af0f0;hb=e5e65c031c05dee8caa0995219c208ecd5e80dde;hp=1ded61883d4fcdbced95eb834162594680217666;hpb=5733c3a92ff27ce3cbb0ff020b52399f5b9255c1;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 1ded61883d..38085adf68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-vdnl Process with autoconf to generate configure script   -*- sh -*-
+dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.6.0beta3,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Tue, Jun 3, 2008"])
+AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_SUBST(LYX_DATE, ["Fri, Aug 1, 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,23 +33,9 @@ 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)
+dnl AC_PROG_MAKE_SET
+dnl AC_PROG_INSTALL
 
 # Check for installed python
 AM_PATH_PYTHON(2.3,, :)
@@ -62,10 +48,7 @@ INSTALL_SCRIPT='${INSTALL}'
 
 ### we will also need a C compiler to compile GNU gettext
 AC_PROG_CC
-
-### check for special systems
-AC_ISC_POSIX
-AC_AIX
+AC_USE_SYSTEM_EXTENSIONS
 
 ### we need to know the byte order for unicode conversions
 AC_C_BIGENDIAN
@@ -237,7 +220,12 @@ fi
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_PUSH(C)
+dnl Dirty trick ahead: disable macro AC_GNU_SOURCE because it triggers a bug with autoconf 2.62.
+dnl this can be removed if gettext is been updated to avoid that.
+m4_undefine([AC_GNU_SOURCE])
+m4_defun([AC_GNU_SOURCE],[])
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.16.1])
 AC_LANG_POP(C)
 
 # some standard header files
@@ -463,6 +451,8 @@ AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX],
 
 AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
+AC_DEFINE_UNQUOTED([LYX_DIR_VER],"$lyx_dir_ver",[Versioned env var for system dir])
+AC_DEFINE_UNQUOTED([LYX_USERDIR_VER],"$lyx_userdir_ver",[Versioned env var for user dir])
 AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
 AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])