dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.1.0dev,[lyx-devel@lists.lyx.org],[lyx])
+AC_PRESERVE_HELP_ORDER
# Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2011-02-07"])
-AC_PREREQ(2.52)
+AC_SUBST(LYX_DATE, ["2011-04-29"])
+AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
done
# Check for installed python
-AM_PATH_PYTHON(2.3.4,, :)
+AM_PATH_PYTHON(2.4.0,, :)
### we need to know the byte order for unicode conversions
AC_C_BIGENDIAN
-### check which frontend we want to use
-LYX_USE_FRONTENDS
-
### Check for a C++ compiler
LYX_PROG_CXX
### We need iconv for unicode support (Qt4 frontend requires it too)
AM_ICONV
if test "$am_cv_func_iconv" = no; then
- LYX_ERROR([Cannot find required library iconv])
+ AC_MSG_ERROR([cannot find required library iconv.])
else
LIBS="$LIBS $LIBICONV"
fi
[AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
[LYX_LIB_ERROR(zlib.h,zlib)])
-
-### check which frontend we want to use
-
+### check for file magic support (currently optional)
+AC_CHECK_HEADERS(magic.h,
+ [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"],
+ LYX_WARNING([cannot find libmagic. Please check that the libmagic library
+ is correctly installed on your system.
+ Falling back to builtin file format detection.]))],
+ [LYX_WARNING([cannot find magic.h. Please check that the libmagic library
+ is correctly installed on your system.
+ Falling back to builtin file format detection.])])
+
+### setup the qt4 frontend.
dnl The code below is not in a macro, because this would cause big
dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
-for frontend in $FRONTENDS ; do
- case "$frontend" in
- qt4)
- QT4_DO_IT_ALL
- FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
- FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
- RPM_FRONTEND="qt4"
- FRONTEND_INFO="${FRONTEND_INFO}\
+QT4_DO_IT_ALL([4.5.0])
+AC_SUBST([FRONTENDS_SUBDIRS], [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
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
- LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+ LYX_WARNING([the installation prefix \"${prefix}\" contains a space, which
causes problems with the Makefiles. The installation will be done in
directory \"`pwd`/installprefix\" instead. Please move its contents to
the right place after installation.])
AC_HEADER_MAJOR
AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h)
-# some standard structures
-AC_HEADER_STAT
-AC_HEADER_TIME
-
# some standard types
AC_CHECK_TYPE(mode_t,[AC_DEFINE(HAVE_MODE_T, 1, [Define this to 1 if your compiler supports the mode_t type.])])
AC_TYPE_OFF_T
AC_TYPE_PID_T
-AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_UID_T
LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;])
-AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink strerror)
+AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink strerror unsetenv)
# Check the form of mkdir()
AC_FUNC_MKDIR
AC_FUNC_SELECT_ARGTYPES
VERSION_INFO="Configuration\n\
Host type: ${host}\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\
LyX files dir: ${real_pkgdatadir}\n"
AC_SUBST(VERSION_INFO)
-AC_SUBST(RPM_FRONTEND)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CFLAGS)
development/cygwin/lyxrc.dist \
development/lyx.spec \
intl/Makefile \
+ lib/lyx.desktop-temp:lib/lyx.desktop.in
lib/Makefile \
lib/doc/Makefile \
lib/lyx2lyx/lyx2lyx_version.py \
printf "$VERSION_INFO"
echo
-# Display a final warning if there has been a LYX_ERROR
-LYX_CHECK_ERRORS
+# Display a final warning if there has been a LYX_WARNING
+LYX_CHECK_WARNINGS
+
+cat <<EOF
+Configuration of LyX was successful.
+Type 'make' to compile the program,
+and then 'make install' to install it.
+EOF