the export patch from Dekel

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 138610e4f5ef23ae0d0eda51cc356c0781003596..6a7c25ec51fe345493fefd0160356ef9a46d4e87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -61,8 +61,19 @@ 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
+AC_LANG_CPLUSPLUS
 LYX_PROG_CXX
 AC_PROG_CXXCPP
 AC_DISABLE_SHARED
@@ -124,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")
@@ -144,7 +158,7 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 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 
@@ -153,26 +167,23 @@ 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_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)"
     FRONTEND_LIBS="\$(KDE_LIBS)"
     AC_DEFINE(KDEGUI);;
   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";;
-  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="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)"
     AC_DEFINE(GTKGUI);;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
@@ -276,13 +287,14 @@ AC_OUTPUT([Makefile \
        po/Makefile.in \
        src/Makefile \
        src/mathed/Makefile \
+       src/graphics/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
        src/xtl/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])