Fix bug 2068 and do some cleanup

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0bcbd26ebc7d57fc6c8a3b585c6329be5fb27afd..b91706d8c2f7f1b7c86d6b9a3aa89edb92374a8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,11 @@ AC_SUBST(AIKSAURUS_LIBS)
 LYX_USE_INCLUDED_BOOST
 
 ### Setup libtool
+dnl Dirty trick ahead: disable libtool checking for a fortran compiler
+dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699
+dnl Note that this will reportedly not be needed with libtool 2.0
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
@@ -180,11 +185,11 @@ for frontend in $FRONTENDS ; do
     libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
          ;;
 
-    qt)
+    qt3)
          QT_DO_IT_ALL
-         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
+         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt3\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt3"
-         RPM_FRONTEND="qt"
+         RPM_FRONTEND="qt3"
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
       Qt version:\t\t${QT_VERSION}\n"
@@ -234,6 +239,12 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
   prefix=`pwd`/installprefix
 fi
 
+### We need iconv for unicode support
+AM_ICONV
+if test "$am_cv_func_iconv" = no; then
+  LYX_ERROR([Cannot find required library iconv])
+fi
+
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_PUSH(C)