dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(LyX,1.5.0svn,[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)
-PACKAGE=lyx${program_suffix}
-VERSION="1.4.0cvs"
+# First check the version
LYX_CHECK_VERSION
+LYX_VERSION_SUFFIX
+# Check how the files should be packaged
+AC_CANONICAL_TARGET
+LYX_USE_PACKAGING
+# We need to define these variables here and the no-define option of
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
dnl default maintainer mode to true for development versions
if test "${enable_maintainer_mode+set}" != set; then
enable_maintainer_mode=$lyx_devel_version
fi
AM_MAINTAINER_MODE
-AC_CANONICAL_TARGET
-LYX_VERSION_SUFFIX
-
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
-
-# The list of languages known to LyX
-# This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
+save_PACKAGE=$PACKAGE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9])
+PACKAGE=$save_PACKAGE
### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs lib/configure ; do
+for file in config/install-sh config/mkinstalldirs ; do
chmod 755 ${srcdir}/${file}
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
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
enable_assertions=no;
fi;])
if test "x$enable_assertions" = xyes ; then
- lyx_flags="$lyx_flags assertions"
+ lyx_flags="assertions $lyx_flags"
AC_DEFINE(ENABLE_ASSERTIONS,1,
[Define if you want assertions to be enabled in the code])
fi
AC_CHECK_LIB(Aiksaurus, main,
[AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
AIKSAURUS_LIBS="-lAiksaurus"
- lyx_flags="$lyx_flags aiksaurus"
+ lyx_flags="aiksaurus $lyx_flags"
])
AC_CHECK_HEADER(Aiksaurus.h,[
ac_cv_header_aiksaurus_h=yes
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
-### Check if we want spell libraries, prefer new aspell
-CHECK_WITH_ASPELL
-if test "$USING_ASPELL" != "yes"; then
- CHECK_WITH_PSPELL
-fi
-
### Check for some Cygwin-specific details.
CHECK_WITH_CYGWIN
### check which frontend we want to use
-dnl if the gtk frontend has been specified, then xforms is needed too
-if echo $FRONTENDS | grep gtk | grep -v xforms ; then
- FRONTENDS="$FRONTENDS xforms"
-fi
-
dnl The code below is not in a macro, because this would cause big
dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
for frontend in $FRONTENDS ; do
libXpm version:\t\t${XPM_VERSION}\n\
libforms version:\t\t${XFORMS_VERSION}\n"
;;
- dnl gnome)
- dnl XFORMS_DO_IT_ALL
- dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
- dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
- dnl AC_SUBST(GNOME_FRONTEND_LIBS)
-
- dnl FRONTEND="xforms gnome"
- dnl FRONTEND_GUILIB="gnome/*.lo"
- dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
- dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
- dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
- dnl ;;
gtk)
- PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4)
+ PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft)
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
RPM_FRONTEND="gtk"
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
+ ;;
+ qt4)
+ QT4_DO_IT_ALL
+ FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
+ FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
+ RPM_FRONTEND="qt4"
+ FRONTEND_INFO="${FRONTEND_INFO}\
+ Qt 4 Frontend:\n\
+ Qt 4 version:\t\t${QT4_VERSION}\n"
+dnl qt 4 build will fail without moc or uic
+ if test -z "$MOC4"; then
+ LYX_ERROR([moc 4 binary not found !])
+ fi
+ if test -z "$UIC4"; then
+ LYX_ERROR([uic 4 binary not found !])
+ fi
+ if test -z "$QT4_LIB"; then
+ LYX_ERROR([qt 4 library not found !])
+ fi
;;
*)
LYX_ERROR(Unknown frontend '$frontend');;
esac
done
-### Check how the files should be packaged
-LYX_USE_PACKAGING
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
### Setup GNU gettext
dnl GNUÂ gettext is written in C
AC_LANG_PUSH(C)
-# Some tests that may be useful for gettext
-AC_C_CONST
-AC_C_INLINE
-# Do the real setup now
AM_GNU_GETTEXT
-# a hack for those who try to change LyX, but do not have gettext installed
-case "${XGETTEXT}" in
- *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
-esac
-
-AC_SUBST(LINGUAS)
-
AC_LANG_POP(C)
# some standard header files
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h io.h process.h NewAPIs.h)
# some standard structures
AC_HEADER_STAT
AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
if test $use_compression = true ; then
AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.])
- lyx_flags="$lyx_flags compression"
+ lyx_flags="compression $lyx_flags"
fi
fi
AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue)
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+AC_CHECK_FUNCS(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink)
+AC_LANG_POP(C)
+
+LYX_CHECK_SPELL_ENGINES
+
+lyx_client_subdir=true
+AC_LANG_PUSH(C)
+dnl LIBS already contains some X extra libs that may interfere.
+save_LIBS="$LIBS"
+LIBS=
+AC_CHECK_FUNCS(fcntl,
+ [AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket], [socket], [],
+ [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+ [], [-lnsl])])],
+ [lyx_client_subdir=false])
+AC_SUBST(SOCKET_LIBS,$LIBS)
+LIBS="$save_LIBS"
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
AC_LANG_POP(C)
AC_FUNC_SELECT_ARGTYPES
### Some information on what just happened
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
VERSION_INFO="Configuration\n\
Host type: ${host}\n\
- Special build flags: ${lyx_flags}\n\
- C Compiler: ${CC}\n\
+ Special build flags: ${lyx_flags}\n\
+ C Compiler: ${CC} ${CC_VERSION}\n\
+ C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\
C++ Compiler: ${CXX} ${CXX_VERSION}\n\
+ C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\
- Linker flags: ${LDFLAGS}\n\
+ Linker flags: ${AM_LDFLAGS}\n\
+ Linker user flags: ${LDFLAGS}\n\
${FRONTEND_INFO}\
Packaging: ${lyx_use_packaging}\n\
LyX binary dir: ${real_bindir}\n\
- LyX files dir: ${real_datadir}\n"
+ LyX files dir: ${real_pkgdatadir}\n"
+MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir})
+MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir})
+MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_pkgdatadir})
AC_SUBST(VERSION_INFO)
AC_SUBST(RPM_FRONTEND)
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(AM_CXXFLAGS)
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
+AC_SUBST(LYX_ABS_TOP_SRCDIR)
+AC_SUBST(LYX_ABS_INSTALLED_LOCALEDIR)
+AC_SUBST(LYX_ABS_INSTALLED_DATADIR)
## Some config.h stuff
#define BOOST_POSIX 1
#endif
+#if defined(HAVE_NEWAPIS_H)
+#define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
+#endif
+
#endif
])
### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
AC_CONFIG_FILES([Makefile m4/Makefile \
boost/Makefile \
boost/libs/Makefile \
development/lyx.spec \
lib/Makefile \
lib/doc/Makefile \
+ lib/lyx2lyx/Makefile \
intl/Makefile \
po/Makefile.in \
sourcedoc/Doxyfile \
src/support/tests/Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
+ src/frontends/controllers/tests/Makefile \
src/frontends/xforms/Makefile \
src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \
src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \
+ src/frontends/qt4/Makefile \
+ src/frontends/qt4/moc/Makefile \
+ src/frontends/qt4/ui/Makefile \
])
+echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\""
+(test -d lib || mkdir lib; cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix")
AC_OUTPUT
# show version information