X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=d9fe16d7ece0e2501ecdf26918c38201bace0487;hb=13dcd3f8e29352d6234b4ee93b16e4aab645cadb;hp=2c6f427863da17751798b63b06dadead46cdacf7;hpb=1fd5e5ed974338edef45216c3e3a3f678b180676;p=lyx.git

diff --git a/configure.in b/configure.in
index 2c6f427863..d9fe16d7ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(src/lyx.C)
+AC_INIT(src/main.C)
 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
 AM_CONFIG_HEADER(src/config.h)
 dnl This is a trick to make autoheader do the right thing
@@ -11,15 +11,13 @@ LYX_GET_VERSION(${srcdir}/src/version.h)
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
-AC_ARG_WITH(lyxname,
-  [  --with-lyxname          the name under which lyx will be installed],
-  [lyxname=$withval],[lyxname=lyx])
-
+LYX_VERSION_SUFFIX
+ 
 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)
 
@@ -42,6 +40,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
 
@@ -55,28 +59,39 @@ LYX_SCO
 ### Check for program extensions (.exe or nothing)
 AC_EXEEXT
 
+### 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
+  gnome)
+    GNOME_INIT
+    GNOME_COMPILE_WARNINGS
+    GNOME_X_CHECKS
+esac 
+
 ### Check for a C++ compiler
 AC_LANG_CPLUSPLUS
 LYX_PROG_CXX
 AC_PROG_CXXCPP
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+#AM_PROG_LIBTOOL
+LYX_PROG_LIBTOOL
 
 ### Some checks on what the C++ compiler can(not) do
-LYX_CXX_MUTABLE
-LYX_CXX_PARTIAL
+dnl we do not need that currently (and probably all our supported
+dnl compiler allow that)  
+dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-dnl we do not use stl stack, or at least not on gcc 2.7, which was the 
-dnl cause for this test. 
-dnl LYX_CXX_STL_STACK
 LYX_CXX_STL_STRING
-LYX_CXX_NAMESPACES
+LYX_CXX_GOOD_STD_STRING
 LYX_CXX_CHEADERS
+LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream)
+AC_CHECK_HEADERS(ostream istream sstream locale limits)
 LYX_CXX_STL_MODERN_STREAMS
 
 ### We need a regex implementation, so we provide our own if none is found.
@@ -114,17 +129,73 @@ if test x$lyx_use_liberty = xyes; then
   AC_CHECK_LIB(iberty,main)
 fi
 
+### Check which libsigc++ we're using
+LYX_WITH_SIGC
+
+### Check if we want pspell libraries
+CHECK_WITH_PSPELL
+
 ### 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")
 # The real thing.
 AC_PATH_XTRA
 LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+# Since solaris X headers use int as implicit return type and modern
+# gcc's do not like that, let's use -isystem instead of -I.
+# We should test for gcc version and see whether it supports -isystem,
+# but since at least gcc 2.6.x supports it and it is still too old for
+# us, it seems we are safe.
+if test -n "$GXX" ; then
+  X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
+fi
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
 ## Check whether X is new enough to handle the input method stuff
 AC_CHECK_FUNCS(XOpenIM)
 
+### 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 
+  xforms) 
+  # for now don't set it for xforms as this is always entered
+    FRONTEND=""
+    FRONTEND_GUILIB="xforms/libxforms.la";;
+  gnome)    
+    AM_PATH_GTKMM(1.2.1,,
+        AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
+    AM_PATH_GNOMEMM
+
+dnl ******************************
+dnl LibGlade checking
+dnl ******************************
+dnl Ensure gnome-config is available...
+	AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+	AC_MSG_CHECKING(for Glade libraries)
+	if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
+    	AC_MSG_RESULT(found)
+	else
+	    AC_MSG_ERROR(Did not find libGlade installed)
+	fi
+		
+    FRONTEND="gnome"
+    FRONTEND_GUILIB="gnome/libgnome.la"
+    FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
+    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
+  qt2)
+    QT2_DO_IT_ALL
+    FRONTEND="qt2"
+    FRONTEND_GUILIB="qt2/libqt2.la"
+    FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
+    FRONTEND_LIBS="\$(QT2_LIBS)";;
+  *)
+    LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+esac
+
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = yes ; then
 # We surely need these two libraries and want to check carefully the
@@ -159,7 +230,7 @@ AC_LANG_CPLUSPLUS
 # some standard header files
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h)
 
 # some annoying header files
 #LYX_PATH_HEADER(stl_string_fwd.h)
@@ -189,7 +260,13 @@ if test "x$lyx_broken_headers" = "xyes"; then
   AC_DEFINE(BROKEN_HEADERS, 1,
     [Define on SunOS 4 and SCO, were some functions are missing from the headers])
 fi
-AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo)
+AC_CHECK_FUNCS(snprintf vsnprintf)
+LYX_CHECK_DECL(snprintf, stdio.h)
+LYX_CHECK_DECL(vsnprintf, stdio.h)
+LYX_CHECK_DECL(istreambuf_iterator, iterator)
+
+AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo \
+  mkstemp mktemp)
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
@@ -200,12 +277,9 @@ LYX_FUNC_PUTENV_ARGTYPE
 # SunOS 4.1.3 does not have strerror and atexit
 AC_REPLACE_FUNCS(strerror atexit)
 
+LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
+
 ### and now some special lyx flags.
-AC_ARG_WITH(two-colors,[  --with-two-colors       use two color pixmaps],
-  [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],,
   [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
@@ -220,16 +294,25 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
+AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
+       boost/Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \
        po/Makefile.in \
+       sourcedoc/Doxyfile \
        src/Makefile \
        src/mathed/Makefile \
+       src/graphics/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
+       src/frontends/Makefile \
+       src/frontends/support/Makefile \
+       src/frontends/controllers/Makefile \
+       src/frontends/xforms/Makefile \
+       src/frontends/qt2/Makefile \
+       src/frontends/gnome/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
 
@@ -249,4 +332,3 @@ EOF
 
 # Display a final warning if there has been a LYX_ERROR
 LYX_CHECK_ERRORS
-