Now "New..." and "New from template..." does not request a filename anymore!

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 3e7f2913aca5309459da998f08c893da07983454..25256d52415e527d4c62a87d2823bafab21876ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,7 @@ 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_STD_COUNT
@@ -84,6 +85,8 @@ dnl we disable rtti for now
 dnl LYX_CXX_RTTI
 AC_CHECK_HEADERS(ostream istream sstream)
 LYX_CXX_STL_MODERN_STREAMS
+dnl It seems this is needed by gtk/gnome stuff
+AC_LANG_C
 
 ### We need a regex implementation, so we provide our own if none is found.
 LYX_REGEX
@@ -135,7 +138,7 @@ LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
 # 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/'`
+  X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
 fi
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
@@ -158,6 +161,21 @@ case "$lyx_use_frontend" in
   xforms) 
     FRONTEND="xforms"
     FRONTEND_GUILIB="\${top_builddir}/src/frontends/xforms/libxforms.la";;
+  gtk)    
+    GNOME_INIT
+    GNOME_COMPILE_WARNINGS
+    GNOME_X_CHECKS
+
+    AM_PATH_GTKMM(1.2.1,,
+        AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
+    AM_PATH_GNOMEMM
+
+    FRONTEND="gtk"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/gtk/libgtk.la"
+    FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR) \$(GNOME_LIBDIR)"
+    FRONTEND_INCLUDES="\$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) \$(GNOME_INCLUDEDIR) \$(GTK_CFLAGS)"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) \$(GNOME_LIBS) \$(GTK_LIBS)"
+    AC_DEFINE(GTKGUI);;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
@@ -238,11 +256,6 @@ LYX_FUNC_PUTENV_ARGTYPE
 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,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
@@ -271,6 +284,7 @@ AC_OUTPUT([Makefile \
        src/frontends/Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/kde/Makefile \
+       src/frontends/gtk/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])