Make sure native eol-style is set on all source files.
Fix some freetype-config and xprop issues in the configure script. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5166 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
987d9e05f2
commit
7565604dbf
11
configure.in
11
configure.in
@ -705,7 +705,7 @@ case $uname in
|
||||
if test x$enable_xft = xyes; then
|
||||
AC_PATH_PROG(FTCONFIG,freetype-config)
|
||||
|
||||
if test "x$FTCONFIG" != "x:"; then
|
||||
if test "x$FTCONFIG" != x; then
|
||||
CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
|
||||
CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
|
||||
|
||||
@ -725,9 +725,14 @@ case $uname in
|
||||
fi
|
||||
|
||||
dnl Check for overlay visuals...
|
||||
AC_PATH_PROG(XPROP, xprop)
|
||||
AC_CACHE_CHECK(for X overlay visuals, ac_cv_have_overlay,
|
||||
if xprop -root 2>/dev/null | grep -c "SERVER_OVERLAY_VISUALS" >/dev/null; then
|
||||
ac_cv_have_overlay=yes
|
||||
if test "x$XPROP" != x; then
|
||||
if $XPROP -root 2>/dev/null | grep -c "SERVER_OVERLAY_VISUALS" >/dev/null; then
|
||||
ac_cv_have_overlay=yes
|
||||
else
|
||||
ac_cv_have_overlay=no
|
||||
fi
|
||||
else
|
||||
ac_cv_have_overlay=no
|
||||
fi)
|
||||
|
Loading…
Reference in New Issue
Block a user