AC_CONFIG_AUX_DIR(config)
-PACKAGE=lyx${program_suffix}
+# first the version
VERSION="1.4.0cvs"
LYX_CHECK_VERSION
+AC_CANONICAL_TARGET
+# Check how the files should be packaged
+LYX_USE_PACKAGING
+LYX_VERSION_SUFFIX
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)
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
### Set the execute permissions of the various scripts correctly
for file in config/install-sh config/mkinstalldirs lib/configure ; do
### 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
dnl if the gtk frontend has been specified, then xforms is needed too
if echo $FRONTENDS | grep gtk | grep -v xforms ; then
FRONTENDS="xforms $FRONTENDS"
+ noxformsbin=yes
fi
dnl The code below is not in a macro, because this would cause big
case "$frontend" in
xforms)
XFORMS_DO_IT_ALL
- FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
+ if test -z "$noxformsbin" ; then
+ FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
+ fi
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
RPM_FRONTEND="xforms"
FRONTEND_INFO="${FRONTEND_INFO}\
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
;;
*)
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}'
# 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 utime.h sys/utime.h io.h process.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)
AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
AC_LANG_POP(C)
-
AC_FUNC_SELECT_ARGTYPES
### Some information on what just happened
real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
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"
+real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
+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_datadir})
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_SUBDIRS(lib)
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 \