From: Alex J. <ale...@us...> - 2004-12-27 20:32:24
|
Update of /cvsroot/emc/rcslib/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22889 Modified Files: configure configure.in realtime.def.in nonrealtime.def.in Log Message: cleaned up the def.in files Index: realtime.def.in =================================================================== RCS file: /cvsroot/emc/rcslib/etc/realtime.def.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** realtime.def.in 27 Dec 2004 12:55:03 -0000 1.3 --- realtime.def.in 27 Dec 2004 20:31:58 -0000 1.4 *************** *** 1,2 **** --- 1,7 ---- + # + # @configure_input@ + # on @DATE@ + # + # The operating system version, as reported by 'os', if applicable. OS = linux *************** *** 8,13 **** RTAI=@RTAI@ - # CFLAGS :=@RTFLAGS@ - ifdef RTAI RTAI_PLAT=1 --- 13,16 ---- *************** *** 17,43 **** endif - BUILD_REALTIMEONLY=1 NO_CPLUSPLUS=1 ! WARN_FLAG= ! ! ifdef WARN_MAX ! WARN_FLAG=-Wall ! endif ! ! ifdef NO_WARN ! WARN_FLAG=-w ! endif ! ! ifdef OPTIMIZE ! ifndef OPTIMIZE_FLAG ! OPTIMIZE_FLAG = -O2 -ffast-math ! endif ! endif ! CFLAGS := @RTFLAGS@ $(CFLAGS) -DNO_STDIO_SUPPORT -I$(KERNEL_DIR)/include -D@HAVE_RTAI@ -D@HAVE_RTL@ -DPLATNAME=\"$(PLAT)\" -Dnocplusplus -Drealtimeonly -DLINUX -Dlinux $(OPTIMIZE_FLAG) ! CFLAGS += -I@RTDIR@/include # The library archiver and ranlib programs. --- 20,35 ---- endif BUILD_REALTIMEONLY=1 NO_CPLUSPLUS=1 ! # CFLAGS provided by the rt (discovered by ./configure) ! CFLAGS += @RTFLAGS@ ! # kernel source and realtime includes ! CFLAGS += -I$(KERNEL_DIR)/include -I@RTDIR@/include ! # specific defines for RTAI & RTLINUX ! CFLAGS += -DNO_STDIO_SUPPORT -D@HAVE_RTAI@ -D@HAVE_RTL@ -DPLATNAME=\"$(PLAT)\" ! CFLAGS += -Dnocplusplus -Drealtimeonly -DLINUX -Dlinux $(OPTIMIZE_FLAG) # The library archiver and ranlib programs. *************** *** 46,50 **** # The assembler. ! AS = as LD = gcc --- 38,42 ---- # The assembler. ! AS = @AS@ LD = gcc *************** *** 54,58 **** PLATLIB = $(RCSDIR)/plat/$(PLAT)/lib ! COPY_SOURCE_COMMAND = cp RCSLIB_LIBRARY_NAME = librcs.a --- 46,50 ---- PLATLIB = $(RCSDIR)/plat/$(PLAT)/lib ! COPY_SOURCE_COMMAND = @CP@ RCSLIB_LIBRARY_NAME = librcs.a Index: nonrealtime.def.in =================================================================== RCS file: /cvsroot/emc/rcslib/etc/nonrealtime.def.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nonrealtime.def.in 26 Dec 2004 20:30:52 -0000 1.1 --- nonrealtime.def.in 27 Dec 2004 20:31:58 -0000 1.2 *************** *** 1,4 **** # The operating system version, as reported by 'os', if applicable. ! OS = linux # Use "g++ -M" instead of makedepend. --- 1,10 ---- + # + # @configure_input@ + # on @DATE@ + # + # The operating system version, as reported by 'os', if applicable. ! OS = linux ! PLAT = nonrealtime # Use "g++ -M" instead of makedepend. *************** *** 12,16 **** CPLUSPLUS_EXTENSION = cc - # RT Linux header files are needed by the non-realtime linux apps sometimes # primarily for shmem definitions. --- 18,21 ---- *************** *** 48,52 **** endif ! CFLAGS = @CFLAGS@ $(RT_INCLUDE) -DLINUX -D$(PLAT) -DPLATNAME=\"$(PLAT)\" -L/usr/lib -Dlinux_2_4 -Dlinux -DHAVE_LIBDL -DLINUX_KERNEL_2_4 -fstrict-aliasing -I/usr/include/g++-2/ -D@HAVE_RTL@ -D@HAVE_RTAI@ $(OPT_XML_INC) $(DEBUG_MEMORY_FLAG) -DHAVE_FSYNC ifdef DEBUG_LINKING --- 53,66 ---- endif ! CFLAGS = @CFLAGS@ $(RT_INCLUDE) ! ! # plat definitions ! CFLAGS += -DLINUX -D$(PLAT) -DPLATNAME=\"$(PLAT)\" \ ! -Dlinux_2_4 -Dlinux -DHAVE_LIBDL $(DEBUG_MEMORY_FLAG) -DHAVE_FSYNC \ ! -L/usr/lib -fstrict-aliasing -I/usr/include/g++-2/ \ ! $(OPT_XML_INC) ! ! # Rtai & RTLinux specific defines ! CFLAGS += -D@HAVE_RTL@ -D@HAVE_RTAI@ ifdef DEBUG_LINKING *************** *** 76,89 **** # The assembler. ! AS = as LD = ld ! PLATBIN = $(RCSDIR)/plat/$(PLAT)/bin ! PLATLIB = $(RCSDIR)/plat/$(PLAT)/lib DYNAMIC_LINK_FLAG = -shared ! DYNAMIC_LIB_BUILD_TOOL=gcc ! COPY_SOURCE_COMMAND = cp RCSLIB_LIBRARY_NAME = librcs.a STRIP = strip --- 90,103 ---- # The assembler. ! AS = @AS@ LD = ld ! PLATBIN = $(RCSDIR)/plat/$(PLAT)/bin ! PLATLIB = $(RCSDIR)/plat/$(PLAT)/lib DYNAMIC_LINK_FLAG = -shared ! DYNAMIC_LIB_BUILD_TOOL = gcc ! COPY_SOURCE_COMMAND = @CP@ RCSLIB_LIBRARY_NAME = librcs.a STRIP = strip Index: configure =================================================================== RCS file: /cvsroot/emc/rcslib/etc/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure 27 Dec 2004 17:43:35 -0000 1.3 --- configure 27 Dec 2004 20:31:58 -0000 1.4 *************** *** 1,7 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59. # ! # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,8 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. [...2473 lines suppressed...] echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } ! echo $f;; *) # Relative ! if test -f "$f"; then ! # Build tree ! echo $f ! elif test -f "$srcdir/$f"; then ! # Source tree ! echo $srcdir/$f ! else ! # /dev/null tree ! { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } ! fi;; esac done` || { (exit 1); exit 1; } _ACEOF cat >>$CONFIG_STATUS <<_ACEOF Index: configure.in =================================================================== RCS file: /cvsroot/emc/rcslib/etc/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 27 Dec 2004 17:43:35 -0000 1.3 --- configure.in 27 Dec 2004 20:31:58 -0000 1.4 *************** *** 16,20 **** AC_PREREQ(2.13) #AC_INIT(EMC1, 0.1, emc...@li...) ! AC_INIT(..//src/rcs.hh) # EMC2 internationalisation package name: --- 16,20 ---- AC_PREREQ(2.13) #AC_INIT(EMC1, 0.1, emc...@li...) ! AC_INIT(../src/rcs.hh) # EMC2 internationalisation package name: *************** *** 351,354 **** --- 351,356 ---- AC_PROG_RANLIB AC_PATH_PROG(AR,ar, "", /bin:/usr/bin:/usr/local/bin) + AC_PATH_PROG(AS,as, "", /bin:/usr/bin:/usr/local/bin) + AC_PATH_PROG(CP,cp, "", /bin:/usr/bin:/usr/local/bin) ############################################################################## *************** *** 381,385 **** ############################################################################## ! # Section 5 - Check for tcl/tk support # # # # Test for tcl/tk headers fails if they are not in /usr/include # --- 383,387 ---- ############################################################################## ! # Section 4 - Check for tcl/tk support # # # # Test for tcl/tk headers fails if they are not in /usr/include # *************** *** 437,444 **** ############################################################################## ! # Section 6 - Miscelaneous support # # # ! # Subsection 6.1. - provides DATE to output it to the generated files # ! # Subsection 6.2. - user option to convince make to be quiet during make # ############################################################################## --- 439,446 ---- ############################################################################## ! # Section 5 - Miscelaneous support # # # ! # Subsection 5.1. - provides DATE to output it to the generated files # ! # Subsection 5.2. - user option to convince make to be quiet during make # ############################################################################## |