| 1 | --- configure Tue Mar 23 21:57:32 2004 |
|---|
| 2 | +++ configure.orig Thu Sep 4 13:17:19 2003 |
|---|
| 3 | @@ -24734,7 +24734,7 @@ |
|---|
| 4 | |
|---|
| 5 | if $have_freetype ; then |
|---|
| 6 | gtk_save_cppflags="$CPPFLAGS" |
|---|
| 7 | - CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS" |
|---|
| 8 | + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" |
|---|
| 9 | |
|---|
| 10 | echo "$as_me:$LINENO: checking For sufficiently new FreeType (at least 2.0.1)" >&5 |
|---|
| 11 | echo $ECHO_N "checking For sufficiently new FreeType (at least 2.0.1)... $ECHO_C" >&6 |
|---|
| 12 | @@ -24746,8 +24746,7 @@ |
|---|
| 13 | cat >>conftest.$ac_ext <<_ACEOF |
|---|
| 14 | /* end confdefs.h. */ |
|---|
| 15 | |
|---|
| 16 | -#include <ft2build.h> |
|---|
| 17 | -#include FT_FREETYPE_H |
|---|
| 18 | +#include <freetype/freetype.h> |
|---|
| 19 | #include FT_ERRORS_H |
|---|
| 20 | |
|---|
| 21 | int |
|---|
| 22 | @@ -26788,9 +26787,7 @@ |
|---|
| 23 | fi |
|---|
| 24 | echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 |
|---|
| 25 | echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 |
|---|
| 26 | -## Disable Xinerama. |
|---|
| 27 | -#if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then |
|---|
| 28 | -if test no = yes; then |
|---|
| 29 | +if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then |
|---|
| 30 | x_extra_libs="-lXinerama $x_extra_libs" |
|---|
| 31 | if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then |
|---|
| 32 | x_extra_libs="-lXext $x_extra_libs" |
|---|
