diff --git a/mozilla/config/glibcversion.sh b/mozilla/config/glibcversion.sh
index d44aafce124..a448cc5332d 100755
--- a/mozilla/config/glibcversion.sh
+++ b/mozilla/config/glibcversion.sh
@@ -18,27 +18,130 @@
 
 ##############################################################################
 ##
-## Name:		xmversion.sh - a fast way to get a motif lib's version
+## Name:		glibcversion.sh - Print __GLIBC__ version if gnu libc 2 is 
+##              found.
 ##
-## Description:	Print the major and minor version numbers for motif libs on
-##				the system that executes the script.  Could be tweaked
-##				to output more info.
-##
-##              More checks need to be added for more platforms.  
-##              Currently this script is only useful in Linux Universe
-##              where there are a many versions of motif.
+## Description:	This script is needed by the mozilla build system.  It needs
+##              to determine whether the current platform (mostly the 
+##              various linux "platforms") are based on the gnu libc2.  This
+##              information is later used in mozilla to determine whether 
+##              gnu libc 2 specific "features" need to be handled, such
+##              as broken locales.
 ##
 ## Author:		Ramiro Estrugo <ramiro@netscape.com>
 ##
 ##############################################################################
 
-TEST_GLIBC_PROG=./test_glibc
-TEST_GLIBC_SRC=test_glibc.c
+##
+## Command Line Flags Supported:
+##
+##  -g  | --is-glibc2:				Print True/False if detected __GLIBC__.
+##
+##  -v  | --print-version:			Print value of __GLIBC__ if found, or none.
+##
+##  -o  | --set-object-name:		Set object name for current system.
+##  -cc | --set-compiler:			Set compiler for building test program.
+##
 
-rm -f $TEST_GLIBC_PROG
-rm -f $TEST_GLIBC_SRC
 
-cat << EOF > test_glibc.c
+##
+## Constants
+##
+GLIBC_PROG_PREFIX=./get_glibc_info
+
+##
+## Defaults
+##
+GLIBC_PRINT_IS_GLIBC2=False
+
+GLIBC_PRINT_VERSION=False
+
+GLIBC_OBJECT_NAME=`uname`-`uname -r`
+GLIBC_CC=cc
+
+function glibc_usage()
+{
+echo
+echo "Usage:   `basename $0` [options]"
+echo
+echo "  -g,  --is-glibc2:          Print True/False if detected __GLIBC__."
+echo
+echo "  -v,  --print-version:      Print value of __GLIBC__ if found, or none."
+echo
+echo "  -o,  --set-object-name:    Set object name for current system."
+echo "  -cc, --set-compiler:       Set compiler for building test program."
+echo
+echo "  -h,  --help:               Print this blurb."
+echo
+echo "The default is '-v' if no options are given."
+echo
+}
+
+##
+## Parse the command line
+##
+while [ "$*" ]; do
+    case $1 in
+        -h | --help)
+            shift
+            glibc_usage
+			exit 0
+            ;;
+
+        -g | --is-glibc2)
+            shift
+            GLIBC_PRINT_IS_GLIBC2=True
+            ;;
+
+        -v | --print-version)
+            shift
+            GLIBC_PRINT_VERSION=True
+            ;;
+
+        -o | --set-object-name)
+            shift
+            GLIBC_OBJECT_NAME="$1"
+            shift
+            ;;
+
+        -cc | --set-compiler)
+            shift
+            GLIBC_CC="$1"
+            shift
+            ;;
+
+        -*)
+            echo "`basename $0`: invalid option '$1'"
+            shift
+            glibc_usage
+			exit 0
+            ;;
+    esac
+done
+
+##
+## Motif info program name
+##
+GLIBC_PROG="$GLIBC_PROG_PREFIX"_"$GLIBC_OBJECT_NAME"
+GLIBC_SRC="$GLIBC_PROG_PREFIX"_"$GLIBC_OBJECT_NAME.c"
+
+##
+## Cleanup the dummy test source/program
+##
+function glibc_cleanup()
+{
+	true
+
+#	rm -f $GLIBC_PROG
+#	rm -f $GLIBC_SRC
+
+}
+
+glibc_cleanup
+
+if [ ! -f $GLIBC_SRC ]
+then
+cat << EOF > $GLIBC_SRC
 #include <stdio.h>
 
 int main(int argc,char ** argv) 
@@ -52,29 +155,60 @@ int main(int argc,char ** argv)
 	return 0;
 }
 EOF
+fi
 
-if [ ! -f $TEST_GLIBC_SRC ]
+if [ ! -f $GLIBC_SRC ]
 then
 	echo
-	echo "Could not create test program source $TEST_GLIBC_SRC."
+	echo "Could not create test program source $GLIBC_SRC."
 	echo
 
+	glibc_cleanup
+
 	exit
 fi
 
-cc -o $TEST_GLIBC_PROG $TEST_GLIBC_SRC
+##
+## Compile the dummy test program if needed
+##
+if [ ! -x $GLIBC_PROG ]
+then
+	$GLIBC_CC -o $GLIBC_PROG $GLIBC_SRC
+fi
 
-if [ ! -x $TEST_GLIBC_PROG ]
+if [ ! -x $GLIBC_PROG ]
 then
 	echo
-	echo "Could not create test program $TEST_GLIBC_PROG."
+	echo "Could not create test program $GLIBC_PROG."
 	echo
 
+	glibc_cleanup
+
 	exit
 fi
 
-$TEST_GLIBC_PROG
+##
+## Execute the dummy test program
+##
+GLIBC_PROG_OUTPUT=`$GLIBC_PROG`
 
-rm -f $TEST_GLIBC_PROG
-rm -f $TEST_GLIBC_SRC
+##
+## -g | --is-glibc2
+##
+if [ "$GLIBC_PRINT_IS_GLIBC2" = "True" ]
+then
+	if [ "$GLIBC_PROG_OUTPUT" = "2" ]
+	then
+		echo True
+	else
+		echo False
+	fi
 
+	glibc_cleanup
+
+	exit 0
+fi
+
+echo $GLIBC_PROG_OUTPUT
+
+glibc_cleanup