A new FileName class + use by the graphics inset.

[lyx.git] / config / configure.in

diff --git a/config/configure.in b/config/configure.in
index bc9caf7a690c52184a83ca4c504fe60151c4c8b6..336edfcf714760481394e89cd91a5e1249f53be2 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -11,6 +11,7 @@ PACKAGE=lyx${program_suffix}
 VERSION="1.4.0cvs"
 LYX_CHECK_VERSION
 
+AM_MAINTAINER_MODE
 AC_CANONICAL_SYSTEM
 
 LYX_VERSION_SUFFIX
@@ -19,7 +20,7 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # The list of languages known to LyX
 # This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
+ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -122,6 +123,13 @@ AC_CHECK_LIB(Aiksaurus, main,
        [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
         AIKSAURUS_LIBS="-lAiksaurus -lbz2"
        ],,"-lbz2")
+AC_CHECK_HEADER(Aiksaurus.h,[
+  ac_cv_header_aiksaurus_h=yes
+  lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
+AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
+  ac_cv_header_aiksaurus_h=yes
+  lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
+AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
 fi
 AC_SUBST(AIKSAURUS_LIBS)
 
@@ -141,10 +149,16 @@ fi
 CHECK_WITH_CYGWIN
 
 ### Check for X libraries
-# The real thing.
 AC_PATH_XTRA
-LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+case $have_x in
+  yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+       CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
+  no) LYX_ERROR(dnl
+[Cannot find X window libraries and/or headers. Check your installation.
+  If you use a Linux system, check that you have installed
+  the development tools.]);;
+  disable) ;;
+esac
 
 ### check which frontend we want to use
 
@@ -196,14 +210,6 @@ dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
-### Check for xforms and xpm (only if X has been found).
-if test "$have_x" = no ; then
-LYX_ERROR(dnl
-[Cannot find X window libraries and/or headers. Check your installation.
-   If you use a Linux system, check that you have installed
-   the development tools.])
-fi
-
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_C
@@ -304,6 +310,8 @@ AC_OUTPUT([Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
+       src/frontends/xforms/lyx_forms.h \
+       src/frontends/xforms/lyx_xpm.h \
        src/frontends/xforms/forms/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/qt2/moc/Makefile \