Added lyx-func tabular-feature for menu structure.

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 25256d52415e527d4c62a87d2823bafab21876ed..90dec3eeaac3499e7ae52ac6eb74c8bfdae6a90d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -85,8 +85,6 @@ 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
@@ -161,20 +159,16 @@ 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
-
+  gnome)    
     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)"
+    FRONTEND="gnome"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la"
+    FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
+    FRONTEND_INCLUDES="\$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)"
     AC_DEFINE(GTKGUI);;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
@@ -284,7 +278,7 @@ AC_OUTPUT([Makefile \
        src/frontends/Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/kde/Makefile \
-       src/frontends/gtk/Makefile \
+       src/frontends/gnome/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])