Few more update text-inset issues + some fixes, see ChangeLog.

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 2c3ff8beae952c7d6764e438fed64b9d00bba852..4a0dfa76c0d90f2443b24452fc9421a11a226df7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,15 @@ LYX_GET_VERSION(${srcdir}/src/version.h)
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
-AM_INIT_AUTOMAKE(lyx, $VERSION)
+AC_ARG_WITH(lyxname,
+  [  --with-lyxname          the name under which lyx will be installed],
+  [lyxname=$withval],[lyxname=lyx])
+
+AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # The list of languages known to LyX
 # This is needed by GNU gettext
-ALL_LINGUAS="ca cs da de es fi fr hu it nl no pl pt ru sl sv tr wa"
+ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sl sv tr wa"
 
 AC_PREFIX_PROGRAM(lyx)
 
@@ -38,6 +42,12 @@ if test "x$KPSEWHICH" = xkpsewhich ; then
     [Define this if you have the kpsewhich program working on your system.])
 fi
 
+# Work around a problem in automake 1.4: when invoking install-strip,
+# INSTALL_PROGRAM is changed to 'install -s', and since
+# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
+# which returns an error condition when stripping fails.
+INSTALL_SCRIPT='${INSTALL}'
+
 ### we will also need a C compiler to compile GNU gettext
 AC_PROG_CC
 
@@ -59,8 +69,7 @@ AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-### check the size of pointers and ints
-# the defaults are given for cross compilation.
+### Some checks on what the C++ compiler can(not) do
 LYX_CXX_MUTABLE
 LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
@@ -73,9 +82,12 @@ LYX_CXX_CHEADERS
 LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream)
+AC_CHECK_HEADERS(ostream istream sstream)
 LYX_CXX_STL_MODERN_STREAMS
 
+### We need a regex implementation, so we provide our own if none is found.
+LYX_REGEX
+
 ### Library Files
 dnl by testing these we check if it is ok to have
 dnl -lc and -lm as args to the compiler
@@ -108,6 +120,29 @@ if test x$lyx_use_liberty = xyes; then
   AC_CHECK_LIB(iberty,main)
 fi
 
+### Check which libsigc++ we're using
+LYX_WITH_SIGC
+
+### check which frontend we want to use
+LYX_USE_FRONTEND
+dnl The code below is not in a macro, because this would cause big
+dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.  
+case "$lyx_use_frontend" in 
+  kde) 
+    KDE_DO_IT_ALL
+    FRONTEND="kde"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/kde/libkde.la"
+    FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)"
+    FRONTEND_INCLUDES="\$(QT_INCLUDES) \$(KDE_INCLUDES)"
+    FRONTEND_LIBS="\$(KDE_LIBS)"
+    AC_DEFINE(KDEGUI);;
+  xforms) 
+    FRONTEND="xforms"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/xforms/libxforms.la";;
+  *)
+    LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+esac
+
 ### Check for X libraries
 # Check for the pt library (for SCO, needed for X)
 AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
@@ -188,12 +223,17 @@ AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo)
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
 
+dnl check whether we have to work around solaris broken putenv()
+LYX_FUNC_PUTENV_ARGTYPE
+
 # SunOS 4.1.3 does not have strerror and atexit
 AC_REPLACE_FUNCS(strerror atexit)
 
 ### and now some special lyx flags.
 AC_ARG_WITH(two-colors,[  --with-two-colors       use two color pixmaps],
-  [AC_DEFINE(TWO_COLOR_ICONS)
+  [AC_DEFINE(TWO_COLOR_ICONS,1,
+     [You might want to define TWO_COLOR_ICONS if you want to spare
+ your colormap.  This will use monochrome icons instead of colored ones.])
    lyx_flags="$lyx_flags two-colors"])
 AC_ARG_ENABLE(assertions,
   [  --enable-assertions     add runtime sanity checks in the program],,
@@ -209,7 +249,7 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
+AC_CONFIG_SUBDIRS(lib lib/reLyX sigc++)
 AC_OUTPUT([Makefile \
        development/lyx.spec \
        lib/Makefile \
@@ -219,6 +259,10 @@ AC_OUTPUT([Makefile \
        src/mathed/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
+       src/xtl/Makefile \
+       src/frontends/Makefile \
+       src/frontends/xforms/Makefile \
+       src/frontends/kde/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
 
@@ -238,4 +282,3 @@ EOF
 
 # Display a final warning if there has been a LYX_ERROR
 LYX_CHECK_ERRORS
-