Allow people to exclude regex code, since it is huge (27k)

11 files changed, 66 insertions, 3 deletions

diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index 7a4dace33..2ef160fda 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -74,7 +74,7 @@ DO_C99_MATH = false
 # Set it to `true' otherwise.
 # Affects *printf and *scanf functions.
 # Also omits strto(u)ll, and (u)lltostr from the library if `false'.
-HAS_LONG_LONG = true
+HAS_LONG_LONG = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
 # Note: Currently only affects the ctype functions.  You must also generate
@@ -113,6 +113,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
@@ -123,7 +129,7 @@ INCLUDE_RPC = false
 INCLUDE_IPV6 = false
 
 # If you want to compile the library as PIC code, turn this on.
-DOPIC = false
+DOPIC = true
 
 
 
diff --git a/extra/Configs/Config.cross.arm.uclinux b/extra/Configs/Config.cross.arm.uclinux
index 17395afb2..3a122b1e0 100644
--- a/extra/Configs/Config.cross.arm.uclinux
+++ b/extra/Configs/Config.cross.arm.uclinux
@@ -109,6 +109,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index f587cdd12..74d7236e5 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -109,6 +109,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index 18ad5195c..24f81fb57 100644
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -109,6 +109,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.m68k.coff b/extra/Configs/Config.m68k.coff
index cc56dd37e..ed6e79c6e 100644
--- a/extra/Configs/Config.m68k.coff
+++ b/extra/Configs/Config.m68k.coff
@@ -109,6 +109,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 37c0f70b9..05544d7a2 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -108,6 +108,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index 37c0f70b9..05544d7a2 100644
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -108,6 +108,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index 64d36d4f6..64b1190c6 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -109,6 +109,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index dd4d8c90e..b4fcf58fd 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -133,6 +133,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/extra/Configs/Config.v850e b/extra/Configs/Config.v850e
index 94c7c0cba..e7bc97ab9 100644
--- a/extra/Configs/Config.v850e
+++ b/extra/Configs/Config.v850e
@@ -114,6 +114,12 @@ UNIFIED_SYSCALL = false
 # Do not enable this unless your kernel provides large file support.
 DOLFS = false
 
+# Posix regular expression code is really big -- 27k all by itself.
+# If you don't use regular expressions, turn this off and save space.
+# Of course, if you only staticly link, leave this on, since it will
+# only be included in your apps if you use regular expressions. 
+INCLUDE_REGEX=true
+
 # If you want to include RPC support, enable this.  RPC is almost never used 
 # for anything except NFS support, so unless you plan to use NFS, leave this
 # disabled.  This is off by default.
diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index dfa1bf9ea..2a43c9f2f 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -26,7 +26,10 @@ include $(TOPDIR)Rules.mak
 
 
 DIRS = assert ctype dirent file fnmatch glob internals lsearch \
-       mntent syslog time utmp tsearch locale regex sysvipc statfs
+       mntent syslog time utmp tsearch locale sysvipc statfs
+ifeq ($(strip $(INCLUDE_REGEX)),true)
+DIRS += regex
+endif
 
 all: libc.a