X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=b0156035f12adca69cf9a742b4e3981f2c779e54;hb=5d356249a0fb7e98fe07676b42224984560b6f1f;hp=b7c322b9225f6e22551d3b4ce024c210ed81219b;hpb=64b8bcd2ff014d4f48dc33d1eba168f8a97da402;p=lyx.git diff --git a/configure.ac b/configure.ac index b7c322b922..b0156035f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,9 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx]) +AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx]) +AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"]) AC_PREREQ(2.52) -AC_CONFIG_SRCDIR(src/main.C) +AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_AUX_DIR(config) @@ -24,7 +25,7 @@ fi AM_MAINTAINER_MODE save_PACKAGE=$PACKAGE -AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.5]) PACKAGE=$save_PACKAGE ### Set the execute permissions of the various scripts correctly @@ -48,7 +49,7 @@ fi 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 @@ -63,6 +64,9 @@ AC_PROG_CC AC_ISC_POSIX AC_AIX +### we need to know the byte order for unicode conversions +AC_C_BIGENDIAN + ### check which frontend we want to use LYX_USE_FRONTENDS @@ -73,13 +77,13 @@ AC_LANG(C++) dnl we do not need that currently (and probably all our supported dnl compiler allow that) dnl LYX_CXX_PARTIAL -LYX_CXX_EXPLICIT +dnl LYX_CXX_EXPLICIT LYX_CXX_GLOBAL_CSTD -LYX_STD_COUNT +dnl LYX_STD_COUNT dnl we disable rtti for now dnl LYX_CXX_RTTI -AC_CHECK_HEADERS(ostream istream sstream locale limits ios) -LYX_CXX_STL_MODERN_STREAMS +dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios) +dnl LYX_CXX_STL_MODERN_STREAMS ### and now some special lyx flags. AC_ARG_ENABLE(assertions, @@ -96,10 +100,7 @@ if test "x$enable_assertions" = xyes ; then fi ### Library Files -dnl by testing these we check if it is ok to have -dnl -lc and -lm as args to the compiler -AC_CHECK_LIB(m, sin) -AC_CHECK_LIB(c, fopen) +dnl AC_CHECK_LIB(m, sin) ### Add extra directories to check for libraries. LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE) @@ -118,7 +119,8 @@ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include) LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)]) ### These are needed in windows -AC_CHECK_LIB(shlwapi, main) +AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi]) +AC_SUBST(LIBSHLWAPI) AC_CHECK_LIB(gdi32, main) AC_ARG_WITH(aiksaurus, @@ -142,12 +144,35 @@ AC_SUBST(AIKSAURUS_LIBS) LYX_USE_INCLUDED_BOOST +# Needed for our char_type +AC_CHECK_SIZEOF(wchar_t) + ### Setup libtool -AC_DISABLE_SHARED +dnl Dirty trick ahead: disable libtool checking for a fortran compiler +dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699 +dnl Note that this will reportedly not be needed with libtool 2.0 +m4_undefine([AC_PROG_F77]) +m4_defun([AC_PROG_F77],[]) +#AC_DISABLE_SHARED +AC_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL #AM_PROG_LIBTOOL LYX_PROG_LIBTOOL +### 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]) +else + LIBS="$LIBS $LIBICONV" +fi + +### 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)]) + + ### Check for X libraries AC_PATH_XTRA case $have_x in @@ -166,48 +191,6 @@ 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 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)" - FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk" - RPM_FRONTEND="gtk" - GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4` - LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4` - FRONTEND_INFO="${FRONTEND_INFO}\ - GTK Frontend:\n\ - libgtkmm version:\t\t${GTKMM_VERSION}\n\ - libglademm version:\t\t${LIBGLADEMM_VERSION}\n" - ;; - - qt) - QT_DO_IT_ALL - FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)" - FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3" - RPM_FRONTEND="qt" - FRONTEND_INFO="${FRONTEND_INFO}\ - Qt Frontend:\n\ - Qt version:\t\t${QT_VERSION}\n" -dnl qt build will fail without moc or uic - if test -z "$MOC"; then - LYX_ERROR([moc binary not found !]) - fi - 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)" @@ -244,7 +227,7 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then fi ### Setup GNU gettext -dnl GNU gettext is written in C +dnl GNU gettext is written in C AC_LANG_PUSH(C) AM_GNU_GETTEXT AC_LANG_POP(C) @@ -252,14 +235,14 @@ 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 utime.h sys/utime.h io.h process.h NewAPIs.h) +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h) # some standard structures AC_HEADER_STAT AC_HEADER_TIME # some standard types -AC_TYPE_MODE_T +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 @@ -273,17 +256,12 @@ LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h]) # Check the form of mkdir() AC_FUNC_MKDIR -# check for compression support -AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_ERROR([zlib not found!]))], - [LYX_ERROR([zlib.h not found!])]) - 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 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(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink) +AC_CHECK_FUNCS(chmod close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink) AC_LANG_POP(C) LYX_CHECK_SPELL_ENGINES @@ -308,7 +286,7 @@ AC_FUNC_SELECT_ARGTYPES ### Some information on what just happened real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` -real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"` +real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"` real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` VERSION_INFO="Configuration\n\ Host type: ${host}\n\ @@ -370,19 +348,6 @@ extern "C" char * strerror(int n); #endif -#ifdef HAVE_MKSTEMP -#ifndef HAVE_DECL_MKSTEMP -#if defined(__cplusplus) -extern "C" -#endif -int mkstemp(char*); -#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 #else @@ -402,64 +367,58 @@ int mkstemp(char*); #ifdef __CYGWIN__ # define BOOST_POSIX 1 +# define BOOST_POSIX_API 1 +# define BOOST_POSIX_PATH 1 #endif #if defined(HAVE_NEWAPIS_H) # define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 #endif +/* + * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t + * support compiled in: + * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9 + * And we are not interested at all what libc + * does: What we need is a 32bit wide wchar_t, and a libstdc++ that + * has the needed wchar_t support and uses UCS4. Whether it + * implements this with the help of libc, or whether it has own code + * does not matter for us, because we don't use libc directly (Georg) +*/ +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) +# define USE_WCHAR_T +#endif + #endif ]) ### Finish the work. -AC_CONFIG_FILES([Makefile m4/Makefile \ +AC_CONFIG_FILES([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 \ - boost/libs/signals/src/Makefile \ config/Makefile \ development/Makefile \ + development/MacOSX/Makefile \ + development/MacOSX/Info.plist \ + development/MacOSX/lyxrc.dist \ + development/MacOSX/spotlight/Makefile \ development/lyx.spec \ + intl/Makefile \ lib/Makefile \ lib/doc/Makefile \ lib/lyx2lyx/lyx2lyx_version.py \ lib/lyx2lyx/Makefile \ - intl/Makefile \ + m4/Makefile \ po/Makefile.in \ sourcedoc/Doxyfile \ sourcedoc/Makefile \ src/client/Makefile \ src/Makefile \ - src/version.C-tmp:src/version.C.in \ + src/version.cpp-tmp:src/version.cpp.in \ src/tex2lyx/Makefile \ - src/mathed/Makefile \ - src/graphics/Makefile \ - src/insets/Makefile \ src/support/Makefile \ - 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/xforms/forms/Makefile \ - src/frontends/gtk/Makefile \ - src/frontends/gtk/gimages/Makefile \ - src/frontends/gtk/glade/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 \ ]) AC_OUTPUT