Cherry-pick 6dc2299: sqsh-3.0 new features and bugfixes. Closes: #891671.

1 files changed, 13 insertions, 13 deletions

diff --git a/conf.sh b/conf.sh
index 9f11399..eefe230 100755
--- a/conf.sh
+++ b/conf.sh
@@ -16,12 +16,12 @@
 # Note that it is not needed anymore in sqsh-2.5 to explicitly set the -DSYB_LP64
 # precompiler flag for 64 bit compilations. "configure" will set this flag for
 # 64 bit compilations automatically in the src/Makefile.
-export CC="gcc"
-export CPPFLAGS=""
+#export CC="gcc"
+#export CPPFLAGS=""
 # export CPPFLAGS="-DSYB_LP64"
-export CFLAGS="-g -O2 -Wall -m64"
-export LDFLAGS="-s -m64"
-./configure
+#export CFLAGS="-g -O2 -Wall -m64"
+#export LDFLAGS="-s -m64"
+#./configure
 
 #
 # Below are some additional examples
@@ -50,11 +50,11 @@ export LDFLAGS="-s -m64"
 #
 # An example with some paranoia compiler settings
 #
-# CC="gcc" \
-# CFLAGS="-g -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fomit-frame-pointer \
-# -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 \
-# -mtune=generic -fasynchronous-unwind-tables" \
-# LDFLAGS="-s -m64" \
-# ./configure --prefix=/usr/local --sysconfdir=/usr/local/etc --with-readline \
-#  --with-debug --without-devlib --without-static --with-gcc --with-x --with-motif
-#
+CC="gcc" \
+CFLAGS="-g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fomit-frame-pointer \
+-fexceptions -fstack-protector --param=ssp-buffer-size=4 \
+-mtune=generic -fasynchronous-unwind-tables" \
+LDFLAGS="" \
+./configure --prefix=/usr/local --sysconfdir=/usr/local/etc --with-readline \
+ --with-debug --without-devlib --without-static --with-gcc --with-x --with-motif
+