remove noload/don't typeset

[lyx.git] / config / configure.in

diff --git a/config/configure.in b/config/configure.in
index 1a866295d835d3ab08ee7865232e4dc200b1c1f1..5bb3a79e5d84e9468c66dfb4c2f1fe9796fef71f 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -65,7 +65,7 @@ LYX_USE_FRONTEND
 ### Check for a C++ compiler
 LYX_PROG_CXX
 ### Some checks on what the C++ compiler can(not) do
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
 dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
@@ -154,16 +154,15 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_FUNCS(XOpenIM)
 
 ### check which frontend we want to use
-# We have to check for xforms anyway
-LYX_PATH_XPM
-LYX_PATH_XFORMS
 
 #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
   xforms)
-  # for now don't set it for xforms as this is always entered
+       LYX_PATH_XPM
+       LYX_PATH_XFORMS
+       LYX_USE_XFORMS_IMAGE_LOADER
        FRONTEND="xforms"
        FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
@@ -179,6 +178,9 @@ case "$lyx_use_frontend" in
     libforms version:             ${XFORMS_VERSION}\n"
        ;;
   gnome)
+    LYX_PATH_XPM
+    LYX_PATH_XFORMS
+    LYX_USE_XFORMS_IMAGE_LOADER
     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
     AC_SUBST(GNOME_FRONTEND_CFLAGS)
     AC_SUBST(GNOME_FRONTEND_LIBS)
@@ -207,14 +209,9 @@ LYX_ERROR(dnl
    the development tools.])
 fi
 
-### Check whether the xforms library has a viable image loader
-### For now, run this test always so config.h is unchanged by a change in
-### frontend
-LYX_USE_XFORMS_IMAGE_LOADER
-
 ### Setup GNU gettext
 dnl GNU gettext is written in C
-AC_LANG(C)
+AC_LANG_C
 # Some tests that may be useful for gettext
 AC_C_CONST
 AC_C_INLINE
@@ -227,7 +224,7 @@ esac
 
 AC_SUBST(LINGUAS)
 
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
 
 # some standard header files
 AC_HEADER_DIRENT
@@ -255,9 +252,9 @@ dnl This is a slight hack: the tests generated by autoconf 2.52 do not
 dnl work correctly because of some conflict with stdlib.h with g++ 2.96
 dnl We aim to remove this eventually, since we should test as much as
 dnl possible with the compiler which will use the functions (JMarc)
-AC_LANG(C)
+AC_LANG_C
 AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES