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.
+# 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
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
AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
# Check for installed python
-AM_PATH_PYTHON(1.5.2,, :)
+AM_PATH_PYTHON(2.3,, :)
# Work around a problem in automake 1.4: when invoking install-strip,
# INSTALL_PROGRAM is changed to 'install -s', and since
LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+### These are needed in windows
+AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
+AC_SUBST(LIBSHLWAPI)
+AC_CHECK_LIB(gdi32, main)
+
AC_ARG_WITH(aiksaurus,
[ --without-aiksaurus do not use the Aiksaurus library],
[lyx_use_aiksaurus=$withval])
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
-### Check for some Cygwin-specific details.
-CHECK_WITH_CYGWIN
-
### Check for X libraries
AC_PATH_XTRA
case $have_x in
dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
for frontend in $FRONTENDS ; do
case "$frontend" in
- xforms)
- XFORMS_DO_IT_ALL
- FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
- FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
- RPM_FRONTEND="xforms"
- FRONTEND_INFO="${FRONTEND_INFO}\
- XForms Frontend:\n\
- libXpm version:\t\t${XPM_VERSION}\n\
- libforms version:\t\t${XFORMS_VERSION}\n"
- ;;
gtk)
PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft)
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
;;
- qt)
+ qt3)
QT_DO_IT_ALL
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
- FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
- RPM_FRONTEND="qt"
+ FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
+ RPM_FRONTEND="qt3"
FRONTEND_INFO="${FRONTEND_INFO}\
Qt Frontend:\n\
Qt version:\t\t${QT_VERSION}\n"
# Check the form of mkdir()
AC_FUNC_MKDIR
-AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[
- case "${enableval}" in
- yes) use_compression=true ;;
- no) use_compression=false ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-compression-support) ;;
- esac
-],[use_compression=true])
-if test $use_compression=true ; then
- AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
- 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="compression $lyx_flags"
- fi
-fi
-AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue)
-AC_MSG_CHECKING([whether to support compressed files])
-AC_MSG_RESULT($use_compression)
-
+# check for compression support
+AC_CHECK_HEADERS(zlib.h,
+ [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
+ [LYX_LIB_ERROR(zlib.h,zlib)])
dnl This is a slight hack: the tests generated by autoconf 2.52 do not
dnl work correctly because of some conflict with stdlib.h with g++ 2.96
LIBS=
AC_CHECK_FUNCS(fcntl,
[AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([socket], [socket], [],
+ AC_SEARCH_LIBS([socket], [socket], [],
[AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
- [], [-lnsl])])],
+ [], [-lnsl])])],
[lyx_client_subdir=false])
AC_SUBST(SOCKET_LIBS,$LIBS)
LIBS="$save_LIBS"
#endif
#endif
-#ifdef __EMX__
-#include "support/os2_defines.h"
-#endif
-
#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#define USE_BOOST_FORMAT 1
+# define USE_BOOST_FORMAT 1
#else
-#define USE_BOOST_FORMAT 0
+# define USE_BOOST_FORMAT 0
#endif
#define BOOST_USER_CONFIG <config.h>
-#if defined(ENABLE_ASSERTIONS)
-#define BOOST_ENABLE_ASSERT_HANDLER 1
-#else
-#define BOOST_DISABLE_ASSERTS 1
+#if !defined(ENABLE_ASSERTIONS)
+# define BOOST_DISABLE_ASSERTS 1
#endif
+#define BOOST_ENABLE_ASSERT_HANDLER 1
#define BOOST_DISABLE_THREADS 1
#define BOOST_NO_WREGEX 1
#define BOOST_NO_WSTRING 1
#ifdef __CYGWIN__
-#define BOOST_POSIX 1
+# define BOOST_POSIX 1
#endif
#if defined(HAVE_NEWAPIS_H)
-#define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
+# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
#endif
#endif
])
### Finish the work.
-AC_CONFIG_SUBDIRS(lib)
AC_CONFIG_FILES([Makefile m4/Makefile \
boost/Makefile \
boost/libs/Makefile \
boost/libs/filesystem/Makefile \
boost/libs/filesystem/src/Makefile \
+ boost/libs/iostreams/Makefile \
+ boost/libs/iostreams/src/Makefile \
boost/libs/regex/Makefile \
boost/libs/regex/src/Makefile \
boost/libs/signals/Makefile \
development/lyx.spec \
lib/Makefile \
lib/doc/Makefile \
+ lib/lyx2lyx/lyx2lyx_version.py \
lib/lyx2lyx/Makefile \
intl/Makefile \
po/Makefile.in \
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/xforms/forms/Makefile \
src/frontends/gtk/Makefile \
src/frontends/gtk/gimages/Makefile \
src/frontends/gtk/glade/Makefile \
- src/frontends/qt2/Makefile \
- src/frontends/qt2/moc/Makefile \
- src/frontends/qt2/ui/Makefile \
- src/frontends/qt2/ui/moc/Makefile \
+ src/frontends/qt3/Makefile \
+ src/frontends/qt3/moc/Makefile \
+ src/frontends/qt3/ui/Makefile \
+ src/frontends/qt3/ui/moc/Makefile \
src/frontends/qt4/Makefile \
- src/frontends/qt4/moc/Makefile \
src/frontends/qt4/ui/Makefile \
])
projects / lyx.git / blobdiff