+2005-12-23 Lars Gullik Bjonnes <larsbj@lyx.org>
+
+ * autogen.sh (AUTOMAKE): add --force-missing to args.
+
+ * configure.ac: add am args to AM_INIT_AUTOMAKE, modify AC_INIT to
+ contain tar name as well, use AC_CONFIG_HEADERS instead of
+ AM_CONFIG_HEADER, remove unused variable VERSION
+
2005-12-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac: add to SOCKET_LIBS the libraries required by
ACLOCAL="aclocal -I ${PWD}/m4"
AUTOHEADER="autoheader"
-AUTOMAKE="automake -a -c --foreign"
+AUTOMAKE="automake --add-missing --copy --force-missing --foreign"
AUTOCONF="autoconf"
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 cygwin.m4 pkg.m4"
+2005-12-23 Lars Gullik Bjonnes <larsbj@lyx.org>
+
+ * common.am (AUTOMAKE_OPTIONS): deleted, we now setupt am args
+ from configure.ac
+
+ * lyxinclude.m4: use AC_PACKAGE_VERSION instead of VERSION, use
+ AC_PROGLIB_TOOL instead of AM_PROG_LIBTOOL
+
2005-10-12 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxinclude.m4 (LYX_USE_PACKAGING): set PACKAGE depending on
-AUTOMAKE_OPTIONS = foreign dist-bzip2
-
CLEANFILES = pch.h.gch
DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
dnl sets variables "lyx_devel_version" and "lyx_prerelease"
AC_DEFUN([LYX_CHECK_VERSION],[
echo "configuring LyX version $VERSION"
-if echo "$VERSION" | grep 'cvs' >/dev/null ; then
+if echo AC_PACKAGE_VERSION | grep 'cvs' >/dev/null ; then
lyx_devel_version=yes
AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
echo "WARNING: This is a development version. Expect bugs."
else
lyx_devel_version=no
fi
-if echo "$VERSION" | grep 'pre' > /dev/null ; then
+if echo AC_PACKAGE_VERSION | grep 'pre' > /dev/null ; then
lyx_prerelease=yes
echo "WARNING: This is a prerelease. Be careful and backup your documents."
else
ac_save_cflags="$CFLAGS"
CC=$CXX
CFLAGS="$CXXFLAGS"
-AM_PROG_LIBTOOL dnl for libraries
+AC_PROG_LIBTOOL dnl for libraries
CC=$ac_save_cc
CFLAGS="$ac_save_cflags"
])
dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(LyX,1.4.0cvs,[lyx-devel@lists.lyx.org],[lyx])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.C)
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_AUX_DIR(config)
-# first the version
-VERSION="1.4.0cvs"
+# First check the version
LYX_CHECK_VERSION
AC_CANONICAL_TARGET
+
# Check how the files should be packaged
LYX_USE_PACKAGING
LYX_VERSION_SUFFIX
fi
AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar])
### Set the execute permissions of the various scripts correctly
for file in config/install-sh config/mkinstalldirs lib/configure ; do