STLPort compile fix

[lyx.git] / lib / reLyX / acinclude.m4

diff --git a/lib/reLyX/acinclude.m4 b/lib/reLyX/acinclude.m4
index c694681a2014e0febc3d48d14006ebdedd62357c..a782d07774abe05ca59520f29752108d6257a5a6 100644 (file)
--- a/lib/reLyX/acinclude.m4
+++ b/lib/reLyX/acinclude.m4
@@ -1,7 +1,6 @@
 dnl Usage: RELYX_WARNING(message)  Displays the warning "message" and sets
-the
-dnl flag lyx_warning to yes.
-AC_DEFUN(RELYX_WARNING,[
+dnl the flag lyx_warning to yes.
+AC_DEFUN([RELYX_WARNING],[
 relyx_warning_txt="$relyx_warning_txt
 == $1
 "
@@ -9,17 +8,26 @@ relyx_warning=yes])
 
 
 dnl RELYX_SEARCH_PROG(VARIABLE-NAME,PROGRAMS-LIST,ACTION-IF-FOUND)
-dnl             
-define(RELYX_SEARCH_PROG,[dnl
+dnl
+define([RELYX_SEARCH_PROG],[dnl
+case "`uname -s 2> /dev/null`" in
+OS/2)
+  PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
+  PATH_IFS=';'
+  ;;
+*)
+  PATH_IFS=':'
+  ;;
+esac
 for ac_prog in $2 ; do
 # Extract the first word of "$ac_prog", so it can be a program name with
 # args.
   set dummy $ac_prog ; ac_word=$[2]
   if test ! -n "[$]$1"; then
-    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
     for ac_dir in $PATH; do
       test -z "$ac_dir" && ac_dir=.
-      if test -f [$ac_dir/$ac_word]; then
+      if test -f [$ac_dir/$ac_word] -o -f [$ac_dir/$ac_word$ac_exeext]; then
         $1="$ac_prog"
         break
       fi
@@ -39,7 +47,7 @@ done
 
 
 dnl Usage RELYX_PROG_PERL_OK
-AC_DEFUN(RELYX_PROG_PERL_OK,[
+AC_DEFUN([RELYX_PROG_PERL_OK],[
 if echo 'require 5.002;exit' | $ac_dir/$ac_prog 2>&5
 then
   PERL=$ac_dir/$ac_prog
@@ -48,9 +56,9 @@ else
 fi])
 
 dnl Usage RELYX_CHECK_PERL
-AC_DEFUN(RELYX_CHECK_PERL,[
+AC_DEFUN([RELYX_CHECK_PERL],[
 AC_MSG_CHECKING([for perl >= 5.002])
-RELYX_SEARCH_PROG(PERL, perl perl5 perl5.002 perl5.003 perl5.004,
+RELYX_SEARCH_PROG(PERL, perl perl5 perl5.6.1  perl5.6.0 perl5.005 perl5.004 perl5.003 perl5.002,
 RELYX_PROG_PERL_OK
 )
 if test -n "$PERL" ; then
@@ -68,11 +76,11 @@ fi
 AC_SUBST(PERL)])
 
 dnl Usage: RELYX_CHECK_ERRORS  Displays a warning message if a RELYX_ERROR
-dnl   has occured previously. 
-AC_DEFUN(RELYX_CHECK_ERRORS,[
+dnl   has occured previously.
+AC_DEFUN([RELYX_CHECK_ERRORS],[
 if test x$relyx_error = xyes; then
 cat <<EOF
-**** The following problems have been detected by configure. 
+**** The following problems have been detected by configure.
 **** Please check the messages below before running 'make'.
 **** (see the section 'Problems' in the INSTALL file)
 $relyx_error_txt
@@ -84,16 +92,10 @@ else
 
 if test x$relyx_warning = xyes; then
 cat <<EOF
-=== The following minor problems have been detected by configure. 
+=== 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)
 $relyx_warning_txt
 EOF
 fi
-cat <<EOF
-Configuration of LyX was successful.  
-Type 'make' to compile the program, 
-and then 'make install' to install it.
-EOF
 fi])
-