X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=6292c85ec6fc7634f7a5277faf8da1de19ec9bc7;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=0b3cb7544e8fa273242123beb916d814a90eccf9;hpb=f77b81570d321cc96d4ace3b13d92c013de25958;p=lyx.git

diff --git a/configure.in b/configure.in
index 0b3cb7544e..6292c85ec6 100644
--- 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,16 +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
-    FRONTEND="xforms"
-    FRONTEND_GUILIB="xforms/*.lo"
-    FRONTEND_INCLUDES="-I\$(srcdir)/xforms";;
-  gnome)    
+	LYX_PATH_XPM
+	LYX_PATH_XFORMS
+	FRONTEND="xforms"
+	FRONTEND_GUILIB="xforms/*.lo"
+	FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
+	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 ******************************
@@ -200,47 +208,55 @@ 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
     QT2_DO_IT_ALL
-    FRONTEND="xforms qt2"
-    FRONTEND_GUILIB="qt2/*.lo"
+    FRONTEND="qt2"
+    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
-    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
-    FRONTEND_LIBS="\$(QT2_LIBS)";;
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
+    FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
 ### Check for xforms and xpm (only if X has been found).
-if test "$have_x" = yes ; then
+if test "$have_x" = no ; then
 # We surely need these two libraries and want to check carefully the
-# version numbers... 
-LYX_PATH_XPM
-LYX_PATH_XFORMS
-FRONTEND_INFO=`cat <<EOF
-    libXpm version:               ${XPM_VERSION}\n\
-    libforms version:             ${XFORMS_VERSION}\n
-`
-
-AC_SUBST(LYX_LIBS)
-else
+# version numbers...
+#LYX_PATH_XPM
+#LYX_PATH_XFORMS
+#FRONTEND_INFO=`cat <<EOF
+#    libXpm version:               ${XPM_VERSION}\n\
+#    libforms version:             ${XFORMS_VERSION}\n
+#`
+#
+#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
 
+### 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
+LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
+
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_C
@@ -249,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
 
@@ -334,6 +350,7 @@ AC_SUBST(VERSION_INFO)
 AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
        boost/Makefile \
+       config/Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \
@@ -348,7 +365,9 @@ AC_OUTPUT([Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
+       src/frontends/xforms/forms/Makefile \
        src/frontends/qt2/Makefile \
+       src/frontends/qt2/xforms/Makefile \
        src/frontends/qt2/moc/Makefile \
        src/frontends/qt2/ui/Makefile \
        src/frontends/qt2/ui/moc/Makefile \
@@ -357,7 +376,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