fix typo that put too many include paths for most people

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 10e7839325c6b61dd9d3c60147ef14a8c12eca30..c4337bff6f805d9a5c5b68771e2b7f9b8bd00a4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,12 +15,12 @@ AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
 LYX_VERSION_SUFFIX
- 
+
 AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # The list of languages known to LyX
 # This is needed by GNU gettext
-ALL_LINGUAS="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 no pl pt ro ru sk sl sv tr wa"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -69,14 +69,14 @@ case "$lyx_use_frontend" in
     GNOME_INIT
     GNOME_COMPILE_WARNINGS
     GNOME_X_CHECKS
-esac 
+esac
 
 ### Check for a C++ compiler
 LYX_PROG_CXX
 ### Some checks on what the C++ compiler can(not) do
 AC_LANG_CPLUSPLUS
 dnl we do not need that currently (and probably all our supported
-dnl compiler allow that)  
+dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
 LYX_CXX_STL_STRING
@@ -119,7 +119,7 @@ AC_CHECK_LIB(Aiksaurus, main,
        [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
         AIKSAURUS_LIBS="-lAiksaurus -lbz2"
        ],,"-lbz2")
-fi 
+fi
 AC_SUBST(AIKSAURUS_LIBS)
 
 ### Add extra directories to check for libraries.
@@ -137,7 +137,7 @@ LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${
 LYX_LOOP_DIR($lyx_cv_extra_prefix,[
 LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
- 
+
 ### Check for the -liberty library
 test "x$GXX" = xyes && lyx_use_liberty=yes
 AC_ARG_WITH(liberty,
@@ -161,8 +161,6 @@ LYX_WITH_SIGC
 CHECK_WITH_PSPELL
 
 ### Check for X libraries
-dnl # Check for the pt library (for SCO, needed for X)
-dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
 # The real thing.
 AC_PATH_XTRA
 LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
@@ -182,24 +180,26 @@ AC_CHECK_FUNCS(XOpenIM)
 ### 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 
-  xforms) 
+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
        FRONTEND="xforms"
        FRONTEND_GUILIB="xforms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
-       FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@"
+       FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@"
        FRONTEND_INFO=`cat <<EOF
     libXpm version:               ${XPM_VERSION}\n\
     libforms version:             ${XFORMS_VERSION}\n
 `
        ;;
   gnome)
+    LYX_PATH_XPM
+    LYX_PATH_XFORMS
     AM_PATH_GTKMM(1.2.1,,
-        AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
+       AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
     AM_PATH_GNOMEMM
 
 dnl ******************************
@@ -208,17 +208,17 @@ dnl ******************************
 dnl Ensure gnome-config is available...
        AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
        AC_MSG_CHECKING(for Glade libraries)
-       if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
-       AC_MSG_RESULT(found)
+       if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then
+       AC_MSG_RESULT(found)
        else
            AC_MSG_ERROR(Did not find libGlade installed)
        fi
-               
+
     FRONTEND="xforms gnome"
     FRONTEND_GUILIB="gnome/*.lo"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
-    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
-    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
+    FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
+    FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
        LYX_PATH_XPM
        LYX_PATH_XFORMS
@@ -235,7 +235,7 @@ esac
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = no ; then
 # We surely need these two libraries and want to check carefully the
-# version numbers... 
+# version numbers...
 #LYX_PATH_XPM
 #LYX_PATH_XFORMS
 #FRONTEND_INFO=`cat <<EOF
@@ -246,8 +246,8 @@ if test "$have_x" = no ; then
 #AC_SUBST(LYX_LIBS)
 #else
 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 
+[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
 
@@ -255,11 +255,7 @@ fi
 ### For now, run this test always so config.h is unchanged by a change in
 ### frontend
 LYX_USE_XFORMS_IMAGE_LOADER
-
-### If the gui cannot load images itself, then we default to the
-### very simple one in graphics/GraphicsImageXPM.[Ch]
-AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
-               test x$lyx_use_xforms_image_loader = xno)
+LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
 
 ### Setup GNU gettext
 dnl GNU gettext is written in C
@@ -269,8 +265,8 @@ AC_C_CONST
 AC_C_INLINE
 # Do the real setup now
 AM_GNU_GETTEXT
-# a hack for those who try to change LyX, but do not have gettext installed 
-case  "${XGETTEXT}" in 
+# a hack for those who try to change LyX, but do not have gettext installed
+case  "${XGETTEXT}" in
  *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
 esac
 
@@ -378,7 +374,7 @@ AC_OUTPUT([Makefile \
 
 # show version information
 echo
-printf "$VERSION_INFO" 
+printf "$VERSION_INFO"
 echo
 
 # Display a final warning if there has been a LYX_ERROR