openbsd-ports/x11/flwm/patches/patch-configure
1999-12-31 22:59:20 +00:00

54 lines
2.1 KiB
Plaintext

--- configure.orig Fri Dec 31 17:44:14 1999
+++ configure Fri Dec 31 17:46:45 1999
@@ -1805,10 +1805,10 @@
if test -n "$GXX"; then
# GNU C compiler
# -Wno-return-type is necessary for Xlib header files on many systems:
- CFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
- CFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
- CXXFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
else
if test "`(uname) 2>/dev/null`" = IRIX; then
if expr "`(uname -r)`" \>= 6.2; then
@@ -1819,23 +1819,23 @@
# but -M is broken so use old compiler:
MAKEDEPEND="CC -M"
# -woff 3322 is necessary due to errors in Xlib headers on IRIX
- CFLAGS="-fullwarn -O2 $X_CFLAGS"
- CFLAGS_D="-fullwarn -gslim -DDEBUG $X_CFLAGS"
- CXXFLAGS="-fullwarn -woff 3322 -O2 $X_CFLAGS"
- CXXFLAGS_D="-fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -fullwarn -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -fullwarn -gslim -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -fullwarn -woff 3322 -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
else
# old Irix compiler:
- CFLAGS="-O2 $X_CFLAGS"
- CFLAGS_D="-g -DDEBUG $X_CFLAGS"
- CXXFLAGS="+w +pp -O2 $X_CFLAGS"
- CXXFLAGS_D="+w +pp -g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -O2 $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS +w +pp -O2 $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS +w +pp -g -DDEBUG $X_CFLAGS"
fi
else
# generic C compiler:
- CFLAGS="-O $X_CFLAGS"
- CFLAGS_D="-g -DDEBUG $X_CFLAGS"
- CXXFLAGS="-O $X_CFLAGS"
- CXXFLAGS_D="-g -DDEBUG $X_CFLAGS"
+ CFLAGS="$CFLAGS -O $X_CFLAGS"
+ CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
+ CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
fi
fi