diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-05-30 14:04:00 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-05-30 14:04:00 +0000 |
| commit | 7565604dbfa0a202930ee6e4081421dc1730280f (patch) | |
| tree | a40d0a5ef18db0c7eb797ecb22df57e2db422c78 /configure.in | |
| parent | 987d9e05f2c502138ecf648d76c02886f0534740 (diff) | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in index c44d5fc9d..54960b0bc 100644 --- a/configure.in +++ b/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) |