*** empty log message ***

diff --git a/Makefile.in b/Makefile.in
index c254f4aa38e234de39a788a089a8864cf5971a8a..804ba83084c27aad4cd14871c82d1ed28dee80a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,7 @@ ORTE_VERSION = @ORTE_VERSION@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 RTAI_CFLAGS = @RTAI_CFLAGS@
+RTLINUX_CC = @RTLINUX_CC@
 RTLINUX_CFLAGS = @RTLINUX_CFLAGS@
 STRIP = @STRIP@
 VERSION = @VERSION@
@@ -127,8 +128,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = ./orte/include/config.h.in Makefile.am Makefile.in \
        aclocal.m4 admin/compile admin/config.guess admin/config.sub \
-       admin/depcomp admin/install-sh admin/missing \
-       admin/mkinstalldirs configure configure.in modtool.in
+       admin/depcomp admin/install-sh admin/ltconfig admin/ltmain.sh \
+       admin/missing admin/mkinstalldirs configure configure.in \
+       modtool.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 

diff --git a/aclocal.m4 b/aclocal.m4
index c531f970ef28767b005c75158255ae707d0ae879..24f76d8af9ccae8c214198c6dbc0bee15584664e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1138,6 +1138,7 @@ AC_DEFUN(DS_RTLINUX,
                AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk])
                if [[ -d ${RTLINUX_DIR}/include ]] ; then
                         RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
+                        RTLINUX_CC=`sed -n -e 's/^CC *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
                else
                        AC_MSG_ERROR([incorrect RTLinux directory?])
                fi
@@ -1151,7 +1152,7 @@ AC_DEFUN(DS_RTLINUX,
                      ! -e "${RTLINUXUDP_DIR}/include/nictab.h" ]] ; then 
                        AC_MSG_ERROR([incorrect RTLinux UDP directory!!!])
                fi
-                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+                RT_GCCLIB_DIR=`${RTLINUX_CC} -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
                RTLINUX_CFLAGS="${RTLINUX_CFLAGS} -I${RTLINUXUDP_DIR}/include -I${RT_GCCLIB_DIR}/include -nostdinc"
                AC_MSG_RESULT([found])
                $1
@@ -1159,6 +1160,7 @@ AC_DEFUN(DS_RTLINUX,
                $2
        fi
        AC_SUBST(RTLINUX_CFLAGS)
+       AC_SUBST(RTLINUX_CC)
 ])
 
 AC_DEFUN(DS_RT,

diff --git a/admin/linux.m4 b/admin/linux.m4
index 3c698081dad6a596e87ba8c56c8c3bb897a3b5cf..a9b9313aa44c355879e4521dc58d396b4329e7e5 100644 (file)
--- a/admin/linux.m4
+++ b/admin/linux.m4
@@ -265,6 +265,7 @@ AC_DEFUN(DS_RTLINUX,
                AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk])
                if [[ -d ${RTLINUX_DIR}/include ]] ; then
                         RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
+                        RTLINUX_CC=`sed -n -e 's/^CC *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
                else
                        AC_MSG_ERROR([incorrect RTLinux directory?])
                fi
@@ -278,7 +279,7 @@ AC_DEFUN(DS_RTLINUX,
                      ! -e "${RTLINUXUDP_DIR}/include/nictab.h" ]] ; then 
                        AC_MSG_ERROR([incorrect RTLinux UDP directory!!!])
                fi
-                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+                RT_GCCLIB_DIR=`${RTLINUX_CC} -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
                RTLINUX_CFLAGS="${RTLINUX_CFLAGS} -I${RTLINUXUDP_DIR}/include -I${RT_GCCLIB_DIR}/include -nostdinc"
                AC_MSG_RESULT([found])
                $1
@@ -286,6 +287,7 @@ AC_DEFUN(DS_RTLINUX,
                $2
        fi
        AC_SUBST(RTLINUX_CFLAGS)
+       AC_SUBST(RTLINUX_CC)
 ])
 
 AC_DEFUN(DS_RT,

diff --git a/configure b/configure
index 93144c1ba8b4e900ec7f0aa0bda4778df9ee3d96..830b6eef2cc8dbff6dc903899d12984465c7f22f 100755 (executable)
--- a/configure
+++ b/configure
@@ -273,7 +273,7 @@ PACKAGE_VERSION='0.2.0'
 PACKAGE_STRING='orte 0.2.0'
 PACKAGE_BUGREPORT='petr.smolik@wo.cz'
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LINUX_DIR LINUX_ARCH LINUX_AFLAGS LINUX_LDFLAGS LINUX_ARFLAGS LINUX_CROSS_COMPILE LINUX_KERNELRELEASE LINUX_CFLAGS LINUX_CC LINUX_LD LINUX_AS LINUX_MODULE_EXT CONFIG_ORTE_KERNEL CONFIG_ORTE_KERNEL_TRUE CONFIG_ORTE_KERNEL_FALSE CONFIG_RTHAL_TRUE CONFIG_RTHAL_FALSE RTAI_CFLAGS CONFIG_RTLINUX_TRUE CONFIG_RTLINUX_FALSE RTLINUX_CFLAGS CONFIG_ORTE_RT USE_RTAI_TRUE USE_RTAI_FALSE USE_RTLINUX_TRUE USE_RTLINUX_FALSE CONFIG_ORTE_RT_TRUE CONFIG_ORTE_RT_FALSE ORTE_MAJOR_VERSION ORTE_MINOR_VERSION ORTE_MICRO_VERSION ORTE_VERSION CONFIG_ORTE_WIN_TRUE CONFIG_ORTE_WIN_FALSE CONFIG_ORTE_UNIX_TRUE CONFIG_ORTE_UNIX_FALSE moduledir modulePROGRAMS_INSTALL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE RANLIB ac_ct_RANLIB CPP EGREP INCLUDES LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LINUX_DIR LINUX_ARCH LINUX_AFLAGS LINUX_LDFLAGS LINUX_ARFLAGS LINUX_CROSS_COMPILE LINUX_KERNELRELEASE LINUX_CFLAGS LINUX_CC LINUX_LD LINUX_AS LINUX_MODULE_EXT CONFIG_ORTE_KERNEL CONFIG_ORTE_KERNEL_TRUE CONFIG_ORTE_KERNEL_FALSE CONFIG_RTHAL_TRUE CONFIG_RTHAL_FALSE RTAI_CFLAGS CONFIG_RTLINUX_TRUE CONFIG_RTLINUX_FALSE RTLINUX_CFLAGS RTLINUX_CC CONFIG_ORTE_RT USE_RTAI_TRUE USE_RTAI_FALSE USE_RTLINUX_TRUE USE_RTLINUX_FALSE CONFIG_ORTE_RT_TRUE CONFIG_ORTE_RT_FALSE ORTE_MAJOR_VERSION ORTE_MINOR_VERSION ORTE_MICRO_VERSION ORTE_VERSION CONFIG_ORTE_WIN_TRUE CONFIG_ORTE_WIN_FALSE CONFIG_ORTE_UNIX_TRUE CONFIG_ORTE_UNIX_FALSE moduledir modulePROGRAMS_INSTALL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE RANLIB ac_ct_RANLIB CPP EGREP INCLUDES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2112,6 +2112,7 @@ fi
 echo $ECHO_N "checking RTLinux directory ${RTLINUX_DIR} for rtl.mk... $ECHO_C" >&6
                if [ -d ${RTLINUX_DIR}/include ] ; then
                         RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
+                        RTLINUX_CC=`sed -n -e 's/^CC *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
                else
                        { { echo "$as_me:$LINENO: error: incorrect RTLinux directory?" >&5
 echo "$as_me: error: incorrect RTLinux directory?" >&2;}
@@ -2135,7 +2136,7 @@ echo $ECHO_N "checking RTLinux for UDP... $ECHO_C" >&6
 echo "$as_me: error: incorrect RTLinux UDP directory!!!" >&2;}
    { (exit 1); exit 1; }; }
                fi
-                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+                RT_GCCLIB_DIR=`${RTLINUX_CC} -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
                RTLINUX_CFLAGS="${RTLINUX_CFLAGS} -I${RTLINUXUDP_DIR}/include -I${RT_GCCLIB_DIR}/include -nostdinc"
                echo "$as_me:$LINENO: result: found" >&5
 echo "${ECHO_T}found" >&6
@@ -2145,6 +2146,7 @@ echo "${ECHO_T}found" >&6
        fi
 
 
+
        if test ${USE_RTAI} == "yes" -o ${USE_RTLINUX} == "yes" ; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -2254,6 +2256,22 @@ modulePROGRAMS_UNINSTALL="\$(top_builddir)/modtool --uninstall"
 
 
 
+###############################
+# CFLAGS
+CFLAGS="$CFLAGS -Wall"
+if test ${USE_RTLINUX} == 'yes' ; then
+  CFLAGS="$CFLAGS $RTLINUX_CFLAGS"
+  CC="$RTLINUX_CC"
+else
+  if test ${USE_RTAI} == 'yes' ; then
+    CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
+  else
+    if test -n ${CONFIG_ORTE_KERNEL} ; then
+      CFLAGS="$CFLAGS $LINUX_CFLAGS"
+    fi
+  fi
+fi
+
 ###############################
 # Checks for programs.
 ac_ext=c
@@ -3556,21 +3574,6 @@ fi
 
 
 
-###############################
-# CFLAGS
-CFLAGS="$CFLAGS -Wall"
-if test ${USE_RTLINUX} == 'yes' ; then
-  CFLAGS="$CFLAGS $RTLINUX_CFLAGS"
-else
-  if test ${USE_RTAI} == 'yes' ; then
-    CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
-  else
-    if test -n ${CONFIG_ORTE_KERNEL} ; then
-      CFLAGS="$CFLAGS $LINUX_CFLAGS"
-    fi
-  fi
-fi
-
 ###############################
 # Checks for header files.
 # user space
@@ -5824,6 +5827,7 @@ s,@RTAI_CFLAGS@,$RTAI_CFLAGS,;t t
 s,@CONFIG_RTLINUX_TRUE@,$CONFIG_RTLINUX_TRUE,;t t
 s,@CONFIG_RTLINUX_FALSE@,$CONFIG_RTLINUX_FALSE,;t t
 s,@RTLINUX_CFLAGS@,$RTLINUX_CFLAGS,;t t
+s,@RTLINUX_CC@,$RTLINUX_CC,;t t
 s,@CONFIG_ORTE_RT@,$CONFIG_ORTE_RT,;t t
 s,@USE_RTAI_TRUE@,$USE_RTAI_TRUE,;t t
 s,@USE_RTAI_FALSE@,$USE_RTAI_FALSE,;t t

diff --git a/configure.in b/configure.in
index d8cc9f764793ddb93c3cbc415c85e0a69f8fd9db..ac9a4e4631bde44e0c3c3e479fc9c0ad36a39db1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 #
-# $Id: configure.in,v 1.3 2004/02/11 00:38:24 ppisa Exp $
+# $Id: configure.in,v 1.4 2004/02/15 22:23:51 smolik Exp $
 
 # autoconf requirement
 
@@ -60,6 +60,22 @@ modulePROGRAMS_UNINSTALL="\$(top_builddir)/modtool --uninstall"
 AC_SUBST(moduledir)
 AC_SUBST(modulePROGRAMS_INSTALL)
 
+###############################
+# CFLAGS
+CFLAGS="$CFLAGS -Wall"
+if test ${USE_RTLINUX} == 'yes' ; then
+  CFLAGS="$CFLAGS $RTLINUX_CFLAGS"
+  CC="$RTLINUX_CC"
+else
+  if test ${USE_RTAI} == 'yes' ; then
+    CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
+  else
+    if test -n ${CONFIG_ORTE_KERNEL} ; then
+      CFLAGS="$CFLAGS $LINUX_CFLAGS"
+    fi
+  fi
+fi
+
 ###############################
 # Checks for programs.
 AC_PROG_CC
@@ -80,21 +96,6 @@ AH_VERBATIM([_GNU_SOURCE],[
 #endif
 ]) 
 
-###############################
-# CFLAGS
-CFLAGS="$CFLAGS -Wall"
-if test ${USE_RTLINUX} == 'yes' ; then
-  CFLAGS="$CFLAGS $RTLINUX_CFLAGS"
-else
-  if test ${USE_RTAI} == 'yes' ; then
-    CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
-  else
-    if test -n ${CONFIG_ORTE_KERNEL} ; then
-      CFLAGS="$CFLAGS $LINUX_CFLAGS"
-    fi
-  fi
-fi
-
 ###############################
 # Checks for header files.
 # user space
@@ -204,4 +205,4 @@ Configuration ORTE:
   
   See config.h for further configuration information.
 ------------------------------------------------------------------------"
-           
\ No newline at end of file
+