mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-31 10:46:16 +00:00
94abe2a5a9
Work around an incompatibility between fltk (a dependency) and libXft version 2 which results in flwm getting a SIGSEGV at startup. This basically prevents the vertical labels from being drawn in the vertical title bar on the left of the window. Otherwise there is no change in functionality. I tried using newer versions of fltk but they either had the same problem or were so new that flwm could not be linked.
50 lines
1.7 KiB
Plaintext
50 lines
1.7 KiB
Plaintext
--- configure.orig Wed Jan 5 05:14:02 2000
|
|
+++ configure Tue Sep 19 20:43:39 2000
|
|
@@ -681,9 +681,9 @@
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
- CFLAGS="-g -O2"
|
|
+ CFLAGS="$CXXFLAGS"
|
|
else
|
|
- CFLAGS="-O2"
|
|
+ CFLAGS="$CXXFLAGS"
|
|
fi
|
|
else
|
|
GCC=
|
|
@@ -813,9 +813,9 @@
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
elif test $ac_cv_prog_cxx_g = yes; then
|
|
- CXXFLAGS="-g -O2"
|
|
+ CXXFLAGS="$CXXFLAGS"
|
|
else
|
|
- CXXFLAGS="-O2"
|
|
+ CXXFLAGS="$CXXFLAGS"
|
|
fi
|
|
else
|
|
GXX=
|
|
@@ -1805,9 +1805,9 @@
|
|
if test -n "$GXX"; then
|
|
# GNU C compiler
|
|
# -Wno-return-type is necessary for Xlib header files on many systems:
|
|
- CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
|
|
+ CFLAGS="$CFLAGS -Wall -Wno-return-type $CFLAGS $X_CFLAGS"
|
|
CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
|
|
- CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
|
|
+ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
|
|
CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
|
|
else
|
|
if test "`(uname) 2>/dev/null`" = IRIX; then
|
|
--- configure.orig Fri Aug 27 21:44:46 2004
|
|
+++ configure Fri Aug 27 21:49:27 2004
|
|
@@ -1807,7 +1807,7 @@
|
|
# -Wno-return-type is necessary for Xlib header files on many systems:
|
|
CFLAGS="$CFLAGS -Wall -Wno-return-type $CFLAGS $X_CFLAGS"
|
|
CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
|
|
- CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
|
|
+ CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $includedir $CXXFLAGS $X_CFLAGS"
|
|
CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
|
|
else
|
|
if test "`(uname) 2>/dev/null`" = IRIX; then
|