[commit] r2303 - in trunk: config user user/diffutils user/diffutils/src

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: dslinux_sonny_jim
Date: Wed Jul 23 23:42:34 2008
New Revision: 2303

Log:
Integrating diffutils into the build system

Added:
   trunk/user/diffutils/
   trunk/user/diffutils/Makefile
   trunk/user/diffutils/src/
      - copied from r2302, /tags/diffutils/diffutils-2.8/
Modified:
   trunk/config/Configure.help
   trunk/config/config.in
   trunk/user/Makefile

Modified: trunk/config/Configure.help
==============================================================================
--- trunk/config/Configure.help	(original)
+++ trunk/config/Configure.help	Wed Jul 23 23:42:34 2008
@@ -3963,6 +3963,12 @@
 CONFIG_USER_CONSOLETOOLS_VTTOOLS
   A set of tools for controlling VT's
 
+CONFIG_USER_DIFFUTILS_CMP
+  You can use the cmp command to show the offsets and line numbers where two files differ.
+
+CONFIG_USER_DIFFUTILS_DIFF
+  You can use the diff command to show differences between two files, 
+  or each corresponding file in two directories. 
 #
 # END of proprietary config help
 #

Modified: trunk/config/config.in
==============================================================================
--- trunk/config/config.in	(original)
+++ trunk/config/config.in	Wed Jul 23 23:42:34 2008
@@ -798,6 +798,7 @@
 	define_bool CONFIG_LIB_PTHREAD y
 fi
 bool 'clock'			CONFIG_USER_CLOCK_CLOCK
+bool 'cmp'			CONFIG_USER_DIFFUTILS_CMP
 bool 'consoletools'		CONFIG_USER_CONSOLETOOLS_CONSOLETOOLS
 if [ "$CONFIG_USER_CONSOLETOOLS_CONSOLETOOLS" = "y" ]; then
 	bool 'fontfiletools'	CONFIG_USER_CONSOLETOOLS_FONTFILETOOLS
@@ -815,6 +816,7 @@
 bool '   American'		CONFIG_USER_DICTIONARY_AMERICAN
 bool '   British'		CONFIG_USER_DICTIONARY_BRITISH
 fi
+bool 'diff'			CONFIG_USER_DIFFUTILS_DIFF
 bool 'de2ts-cal'		CONFIG_USER_DE2TSCAL_DE2TSCAL
 bool 'dlditool'			CONFIG_USER_DLDITOOL_DLDITOOL
 bool 'expat-examples'		CONFIG_USER_EXPAT_EXAMPLES
@@ -890,6 +892,10 @@
 	bool '    funzip'		CONFIG_USER_UNZIP_FUNZIP
 fi
 bool 'unzoo'			CONFIG_USER_UNZOO_UNZOO
+bool 'warp'			CONFIG_USER_WARP
+if [ "$CONFIG_USER_WARP" = "y" ]; then
+       define_bool CONFIG_LIB_SDL y
+fi
 bool 'zmodem utils'		CONFIG_USER_LRZSZ_LRZSZ
 
 if [ "$CONFIG_USER_LRZSZ_LRZSZ" = "y" ]; then

Modified: trunk/user/Makefile
==============================================================================
--- trunk/user/Makefile	(original)
+++ trunk/user/Makefile	Wed Jul 23 23:42:34 2008
@@ -62,6 +62,8 @@
 dir_$(CONFIG_USER_CAN_EXAMPLES)             += can4linux
 dir_$(CONFIG_USER_CONSOLETOOLS_CONSOLETOOLS) += console-tools
 dir_$(CONFIG_USER_CPSCAN) 	            += cpscan
+dir_$(CONFIG_USER_DIFFUTILS_CMP)	    += diffutils
+dir_$(CONFIG_USER_DIFFUTILS_DIFF)	    += diffutils
 dir_$(CONFIG_USER_DICTIONARY_AMERICAN)		+= dict-words
 dir_$(CONFIG_USER_DICTIONARY_BRITISH)		+= dict-words
 dir_$(CONFIG_USER_CAN_HORCH)                += horch