X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=fbe9452a005c4a9086feaa18e2fe860ce7b962f1;hb=16a5be3ecce17f7a2c3e2e8fda096a6ca2ad6161;hp=ffebcc69b4836ff102a391d724f08144c8c297f2;hpb=71c78d1ce97dfddbdd9e3d6f33ba064f2d6b914a;p=lyx.git

diff --git a/configure.in b/configure.in
index ffebcc69b4..fbe9452a00 100644
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,17 @@ 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
@@ -77,12 +88,14 @@ 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_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)
 LYX_CXX_STL_MODERN_STREAMS
 
 ### We need a regex implementation, so we provide our own if none is found.
@@ -123,8 +136,30 @@ 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
+#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 
@@ -133,27 +168,26 @@ case "$lyx_use_frontend" in
     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);;
+    FRONTEND_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)"
+    FRONTEND_LIBS="\$(KDE_LIBS)";;
   xforms) 
-    FRONTEND="xforms"
+  # for now don't set it for xforms as this is always entered
+    FRONTEND=""
     FRONTEND_GUILIB="\${top_builddir}/src/frontends/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
+
+    FRONTEND="gnome"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la"
+    FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
+    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)";;
   *)
     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")
-# The real thing.
-AC_PATH_XTRA
-LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-## Check whether X is new enough to handle the input method stuff
-AC_CHECK_FUNCS(XOpenIM)
-
 ### 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
@@ -218,7 +252,8 @@ 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(memmove memset strchr putenv setenv mkfifo snprintf vsnprintf)
+AC_CHECK_FUNCS(mkstemp mktemp)
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
@@ -229,12 +264,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
@@ -249,20 +281,26 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX sigc++)
+AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \
        po/Makefile.in \
+       boost/Makefile \
        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/xforms/Makefile \
        src/frontends/kde/Makefile \
+       src/frontends/kde/moc/Makefile \
+       src/frontends/kde/dlg/Makefile \
+       src/frontends/kde/dlg/moc/Makefile \
+       src/frontends/gnome/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])