Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:
| 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
Perhaps add a comment about the trick.
| @@ -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])
'required'
| +fi
| +dnl we do not want gettext to run this again.
| +m4_undefine([AM_ICONV])
| +m4_defun([AM_ICONV],[])
I do not understand why this is needed.
(cache etc.)
| ### 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,
No problems with this.
--
Lgb
