Archive/flwm
1
0
Fork 0
mirror of https://git.code.sf.net/p/flwm/flwm synced 2025-12-11 23:06:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Option to compile using fltk2 added to configure. The code requires the

Browse Source 
very newest fltk2 from the development svn repository (as of Aug 2 2007)
This commit is contained in:
Bill Spitzak
2007-08-02 14:26:46 +00:00
parent f6f5ce641d
commit aa276ead5c
5 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure.in
View File

@ -11,6 +11,14 @@ echo "Ignoring libraries \"$X_PRE_LIBS\" requested by configure."
dnl# LIBS="$LIBS$X_LIBS$X_PRE_LIBS"
LIBS="$LIBS$X_LIBS"
AC_ARG_ENABLE(fltk2,[ --enable-fltk2 use fltk2 (default=no)])
if test x$enable_fltk2 = xyes; then
LIBS="-lfltk2 -lXft -lXinerama -lXi $LIBS"
CXXFLAGS="$CXXFLAGS -I/usr/local/include/fltk/compat"
else
LIBS="-lfltk -lXft -lXinerama $LIBS"
fi
MAKEDEPEND="\$(CXX) -M"
dnl# add warnings and optimization to compiler switches:
@ -18,10 +26,8 @@ dnl# do this last so messing with switches does not break tests
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_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"
CFLAGS="$CFLAGS -Wall -Wno-return-type $X_CFLAGS"
CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $X_CFLAGS"
else
if test "`(uname) 2>/dev/null`" = IRIX; then
if expr "`(uname -r)`" \>= 6.2; then
@ -33,27 +39,19 @@ if test "`(uname) 2>/dev/null`" = IRIX; then
MAKEDEPEND="CC -M"
# -woff 3322 is necessary due to errors in Xlib headers on IRIX
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="$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="$CFLAGS -O $X_CFLAGS"
CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
fi
fi
AC_SUBST(MAKEDEPEND)
AC_SUBST(CFLAGS_D)
AC_SUBST(CXXFLAGS_D)
dnl# AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude)