This patch does the following: - check for iconv in configure.ac; we cannot count on gettext doing it for us in case we disable-nls. Give an error when it is not here
- after executing AM_ICONV define it to empty to make sure it is not expanded again in the gettext code (OK, this is a dirty trick, but it speeds up configure) - before setting up libtool, define AC_PROG_F77 to empty to make sure we do not check for fortran. This is done in gentoo, I believe. - at the end of configuration, display warnings before errors, and exit brutally if we show errors (currently, when running configure in a make session, make will not stop on errors). Lars, I suspect you will not like everything :) What do you want to keep? JMarc
Index: configure.ac =================================================================== --- configure.ac (revision 14676) +++ configure.ac (working copy) @@ -144,6 +144,8 @@ AC_SUBST(AIKSAURUS_LIBS) LYX_USE_INCLUDED_BOOST ### Setup libtool +m4_undefine([AC_PROG_F77]) +m4_defun([AC_PROG_F77],[]) AC_DISABLE_SHARED AC_LIBTOOL_WIN32_DLL #AM_PROG_LIBTOOL @@ -234,6 +236,15 @@ if echo $prefix |grep ' ' >/dev/null 2>/ prefix=`pwd`/installprefix fi +### We need iconv for unicode support +AM_ICONV +if test "$am_cv_func_iconv" = no; then + LYX_ERROR([Cannot find require library iconv]) +fi +dnl we do not want gettext to run this again. +m4_undefine([AM_ICONV]) +m4_defun([AM_ICONV],[]) + ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) Index: config/lyxinclude.m4 =================================================================== --- config/lyxinclude.m4 (revision 14676) +++ config/lyxinclude.m4 (working copy) @@ -73,6 +73,14 @@ LYX_ERROR([Cannot find $1. Please check dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR dnl has occured previously. AC_DEFUN([LYX_CHECK_ERRORS],[ +if test x$lyx_warning = xyes; then +cat <<EOF +=== The following minor problems have been detected by configure. +=== Please check the messages below before running 'make'. +=== (see the section 'Problems' in the INSTALL file) +$lyx_warning_txt +EOF +fi if test x$lyx_error = xyes; then cat <<EOF **** The following problems have been detected by configure. @@ -81,16 +89,9 @@ cat <<EOF $lyx_error_txt $lyx_warning_txt EOF +exit 1 else -if test x$lyx_warning = xyes; then -cat <<EOF -=== The following minor problems have been detected by configure. -=== Please check the messages below before running 'make'. -=== (see the section 'Problems' in the INSTALL file) -$lyx_warning_txt -EOF -fi cat <<EOF Configuration of LyX was successful. Type 'make' to compile the program,
