X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=6d854b9f2ab6fde825a2d9359ddc5b123c42ae72;hb=76dc838dfeb27c94530226010b8f47afce7e5367;hp=8650aa044b130ba62fe59e6b0da5f17326be141c;hpb=8caaf338c387c5496d94b57363d657055a243e78;p=lyx.git diff --git a/configure.ac b/configure.ac index 8650aa044b..6d854b9f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx]) +AC_SUBST(LYX_DATE, ["Wed, Nov 15, 2006"]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) AC_CONFIG_HEADERS([src/config.h]) @@ -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 @@ -143,7 +147,15 @@ AC_SUBST(AIKSAURUS_LIBS) LYX_USE_INCLUDED_BOOST +# Needed for our char_type +AC_CHECK_SIZEOF(wchar_t) + ### Setup libtool +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_LIBTOOL_WIN32_DLL #AM_PROG_LIBTOOL @@ -167,48 +179,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,6 +214,12 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then prefix=`pwd`/installprefix fi +### We need iconv for unicode support +AM_ICONV +if test "$am_cv_func_iconv" = no; then + LYX_ERROR([Cannot find required library iconv]) +fi + ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) @@ -260,7 +236,7 @@ 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 @@ -284,7 +260,7 @@ 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 @@ -309,7 +285,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\ @@ -399,12 +375,18 @@ 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 +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 +# define LIBC_WCTYPE_USES_UCS4 +#endif + #endif ]) @@ -443,17 +425,6 @@ AC_CONFIG_FILES([Makefile m4/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/ui/Makefile \ ])