dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,1.4.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.C)
AC_CONFIG_HEADERS([src/config.h])
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
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
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
#ifdef __EMX__
-#include "support/os2_defines.h"
+# 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/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