revert odd NSPR configure change that snuck in
authorChris Jones <jones.chris.g@gmail.com>
Wed, 04 Nov 2009 23:15:23 -0600
changeset 36046 d14de7c14b41b8568389607493742a3dae3dabf8
parent 36045 961bfa23f570114152557cee11d637b55d0d07a4
child 36047 23105dd43409027fbf4b62f215ea8504263e7f65
push id10694
push userbsmedberg@mozilla.com
push dateMon, 14 Dec 2009 15:23:10 +0000
treeherdermozilla-central@683dfdc4adf0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.3a1pre
revert odd NSPR configure change that snuck in
nsprpub/configure
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -6151,17 +6151,17 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex
 # Protect against Makefile macro expansion.
 cat > conftest.defs <<\EOF
 s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
 s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
 s%\[%\\&%g
 s%\]%\\&%g
 s%\$%$$%g
 EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` # Manually modified for MKS support.
 rm -f conftest.defs
 
 
 # Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
 
 echo creating $CONFIG_STATUS
 rm -f $CONFIG_STATUS