[Emc-commit] rcslib acinclude.m4,1.2.2.1,1.2.2.2 configure,1.3.2.8,1.3.2.9 configure.ac,1.3.2.7,1.3.2.8

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv17001

Modified Files:
      Tag: wps_multiplat_dev_branch
	acinclude.m4 configure configure.ac 
Log Message:
.

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/emc/rcslib/acinclude.m4,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** acinclude.m4	8 Aug 2003 14:21:05 -0000	1.2.2.1
--- acinclude.m4	29 Aug 2003 19:23:35 -0000	1.2.2.2
***************
*** 112,116 ****
  fi
  else
!     HAVE_RTL="NO  -- NOT Linux"
  fi
  AC_MSG_RESULT([$HAVE_RTL])
--- 112,116 ----
  fi
  else
!     HAVE_RTL="NO_NOT_LINUX"
  fi
  AC_MSG_RESULT([$HAVE_RTL])
***************
*** 144,151 ****
     ac_cv_have_rtlinux=$HAVE_RTLINUX
  ])
! if test x[$ac_cv_have_rtlinux] = xYES ; then	
  	   AC_DEFINE(HAVE_RTL,1,[Is this platfrom running a linux kernel with the rtlinux patch])
  fi
! AM_CONDITIONAL(HAVE_RTL,[test x[$ac_cv_have_rtlinux] = xYES])
  ])
  
--- 144,151 ----
     ac_cv_have_rtlinux=$HAVE_RTLINUX
  ])
! if test "x${ac_cv_have_rtlinux}" = "xYES" ; then	
  	   AC_DEFINE(HAVE_RTL,1,[Is this platfrom running a linux kernel with the rtlinux patch])
  fi
! AM_CONDITIONAL(HAVE_RTL,[test x"${ac_cv_have_rtlinux}" = "xYES" ])
  ])
  
***************
*** 163,167 ****
  fi
  else
!     HAVE_RTAI="NO  -- NOT Linux"
  fi
  AC_MSG_RESULT([$HAVE_RTAI])
--- 163,167 ----
  fi
  else
!     HAVE_RTAI="NO_NOT_LINUX"
  fi
  AC_MSG_RESULT([$HAVE_RTAI])
***************
*** 194,201 ****
     ac_cv_have_rtai=$HAVE_RTAI
  ])
! if test x[$ac_cv_have_rtai] = xYES ; then	
  	   AC_DEFINE(HAVE_RTAI,1,[Is this platfrom running a linux kernel with the rtai patch])
  fi
! AM_CONDITIONAL(HAVE_RTAI,[test x[$ac_cv_have_rtai] = xYES])
  ])
  
--- 194,201 ----
     ac_cv_have_rtai=$HAVE_RTAI
  ])
! if test "x${ac_cv_have_rtai}" = "xYES" ; then	
  	   AC_DEFINE(HAVE_RTAI,1,[Is this platfrom running a linux kernel with the rtai patch])
  fi
! AM_CONDITIONAL(HAVE_RTAI,[test "x${ac_cv_have_rtai}" = "xYES" ])
  ])
  

Index: configure
===================================================================
RCS file: /cvsroot/emc/rcslib/configure,v
retrieving revision 1.3.2.8
retrieving revision 1.3.2.9
diff -C2 -d -r1.3.2.8 -r1.3.2.9
*** configure	29 Aug 2003 14:07:27 -0000	1.3.2.8
--- configure	29 Aug 2003 19:23:35 -0000	1.3.2.9
***************
*** 1913,1917 ****
  echo "$as_me: with_rtl_rtai=${with_rtl_rtai}" >&6;}
  else
!   with_rtl_rtai=yes
  fi;
  
--- 1913,1917 ----
  echo "$as_me: with_rtl_rtai=${with_rtl_rtai}" >&6;}
  else
!   with_rtl_rtai=default_to_yes
  fi;
  
***************
*** 2271,2274 ****
--- 2271,2290 ----
  
  
+ 
+ if test "x${with_rtl_rtai}" = "xdefault_to_yes" ; then
+ 	if ( uname -s | grep -i linux ) >/dev/null 2>/dev/null ; then
+ 		with_rtl_rtai=yes;
+ 	fi
+ fi
+ 
+ if test "x${with_rtl_rtai}" = "xdefault_to_yes" ; then
+ 	with_rtl_rtai=no;
+ fi
+ 
+ if test "x${with_rtl_rtai}" = "xdefault_to_no" ; then
+ 	with_rtl_rtai=no;
+ fi
+ 
+ 
  if test "x${enable_nml_codegen}" = "xdefault_to_no" -a "x${enable_alljava}" = "xyes" ; then
     enable_nml_codegen=yes;
***************
*** 5715,5719 ****
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5717 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
--- 5731,5735 ----
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5733 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
***************
*** 6251,6255 ****
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:6253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
--- 6267,6271 ----
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:6269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
***************
*** 8044,8048 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 8046 "configure"
  #include "confdefs.h"
  
--- 8060,8064 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 8062 "configure"
  #include "confdefs.h"
  
***************
*** 8142,8146 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 8144 "configure"
  #include "confdefs.h"
  
--- 8158,8162 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 8160 "configure"
  #include "confdefs.h"
  

Index: configure.ac
===================================================================
RCS file: /cvsroot/emc/rcslib/configure.ac,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -C2 -d -r1.3.2.7 -r1.3.2.8
*** configure.ac	29 Aug 2003 14:07:28 -0000	1.3.2.7
--- configure.ac	29 Aug 2003 19:23:35 -0000	1.3.2.8
***************
*** 38,42 ****
  	[with_rtl_rtai=$withval;
  	AC_MSG_NOTICE([with_rtl_rtai=${with_rtl_rtai}])],
! 	[with_rtl_rtai=yes])
  
  AC_ARG_WITH(librt,
--- 38,42 ----
  	[with_rtl_rtai=$withval;
  	AC_MSG_NOTICE([with_rtl_rtai=${with_rtl_rtai}])],
! 	[with_rtl_rtai=default_to_yes])
  
  AC_ARG_WITH(librt,
***************
*** 298,301 ****
--- 298,317 ----
  	AC_MSG_NOTICE([enable_xsd2nmlh=$enableval])],
  	[enable_xsd2nmlh=default_to_yes])
+ 
+ 
+ 
+ if test "x${with_rtl_rtai}" = "xdefault_to_yes" ; then
+ 	if ( uname -s | grep -i linux ) >/dev/null 2>/dev/null ; then
+ 		with_rtl_rtai=yes;
+ 	fi
+ fi
+ 
+ if test "x${with_rtl_rtai}" = "xdefault_to_yes" ; then
+ 	with_rtl_rtai=no;
+ fi
+ 
+ if test "x${with_rtl_rtai}" = "xdefault_to_no" ; then
+ 	with_rtl_rtai=no;
+ fi