X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=a7e1bdf6ae946612daa9d32577db97bfddab39ad;hb=4f816fd13b3388b22a2f73ccfb2a369aa9dd2b3f;hp=f6f03e514f9892291534aa1eab6f34d4ac6aad34;hpb=5da9e207facd96bff5278f21806d5d6fa52117d0;p=lyx.git

diff --git a/configure.in b/configure.in
index f6f03e514f..a7e1bdf6ae 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,10 +11,8 @@ 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
@@ -78,7 +76,8 @@ 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
@@ -91,10 +90,11 @@ LYX_CXX_STL_STRING
 LYX_CXX_GOOD_STD_STRING
 LYX_CXX_NAMESPACES
 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.
@@ -135,6 +135,9 @@ 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")
@@ -159,29 +162,39 @@ AC_CHECK_FUNCS(XOpenIM)
 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="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)"
-    FRONTEND_LIBS="\$(KDE_LIBS)"
-    AC_DEFINE(KDEGUI);;
   xforms) 
   # for now don't set it for xforms as this is always entered
     FRONTEND=""
-    FRONTEND_GUILIB="\${top_builddir}/src/frontends/xforms/libxforms.la";;
+    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="\${top_builddir}/src/frontends/gnome/libgnome.la"
+    FRONTEND_GUILIB="gnome/libgnome.la"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
-    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)"
-    AC_DEFINE(GTKGUI);;
+    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
@@ -250,7 +263,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
@@ -261,6 +280,8 @@ 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_ENABLE(assertions,
   [  --enable-assertions     add runtime sanity checks in the program],,
@@ -278,19 +299,22 @@ fi
 ### Finish the work.
 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/xtl/Makefile \
        src/frontends/Makefile \
+       src/frontends/support/Makefile \
+       src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
-       src/frontends/kde/Makefile \
+       src/frontends/qt2/Makefile \
        src/frontends/gnome/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])