ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/configure
(Generate patch)

Comparing rxvt-unicode/configure (file contents):
Revision 1.159 by root, Fri Mar 1 12:50:44 2013 UTC vs.
Revision 1.160 by root, Sun Oct 27 16:20:55 2013 UTC

7626 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`" 7626 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
7627 fi 7627 fi
7628 7628
7629 save_LIBS="$LIBS" 7629 save_LIBS="$LIBS"
7630 LIBS="$LIBS $X_LIBS" 7630 LIBS="$LIBS $X_LIBS"
7631 for ac_header in X11/Xft/Xft.h 7631 for ac_header in X11/Xft/Xft.h fontconfig/fontconfig.h
7632do : 7632do :
7633 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7633 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" 7634ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
7634if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then : 7635if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7635 cat >>confdefs.h <<_ACEOF 7636 cat >>confdefs.h <<_ACEOF
7636#define HAVE_X11_XFT_XFT_H 1 7637#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7637_ACEOF 7638_ACEOF
7638 7639
7639else 7640else
7640 support_xft=no 7641 support_xft=no
7641fi 7642fi
7642 7643
7643done 7644done
7644 7645
7645 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftDrawString32 in -lXft" >&5 7646 for ac_func in XftDrawString32 FcPatternGet
7646$as_echo_n "checking for XftDrawString32 in -lXft... " >&6; } 7647do :
7647if ${ac_cv_lib_Xft_XftDrawString32+:} false; then : 7648 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
7648 $as_echo_n "(cached) " >&6 7649ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
7649else 7650if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
7650 ac_check_lib_save_LIBS=$LIBS 7651 cat >>confdefs.h <<_ACEOF
7651LIBS="-lXft $LIBS" 7652#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
7652cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7653/* end confdefs.h. */
7654
7655/* Override any GCC internal prototype to avoid an error.
7656 Use char because int might match the return type of a GCC
7657 builtin and then its argument prototype would still apply. */
7658#ifdef __cplusplus
7659extern "C"
7660#endif
7661char XftDrawString32 ();
7662int
7663main ()
7664{
7665return XftDrawString32 ();
7666 ;
7667 return 0;
7668}
7669_ACEOF 7653_ACEOF
7670if ac_fn_cxx_try_link "$LINENO"; then : 7654
7671 ac_cv_lib_Xft_XftDrawString32=yes
7672else
7673 ac_cv_lib_Xft_XftDrawString32=no
7674fi
7675rm -f core conftest.err conftest.$ac_objext \
7676 conftest$ac_exeext conftest.$ac_ext
7677LIBS=$ac_check_lib_save_LIBS
7678fi
7679{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftDrawString32" >&5
7680$as_echo "$ac_cv_lib_Xft_XftDrawString32" >&6; }
7681if test "x$ac_cv_lib_Xft_XftDrawString32" = xyes; then :
7682 :
7683else 7655else
7684 support_xft=no 7656 support_xft=no
7685fi 7657fi
7686
7687 for ac_header in fontconfig/fontconfig.h
7688do :
7689 ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
7690if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then :
7691 cat >>confdefs.h <<_ACEOF
7692#define HAVE_FONTCONFIG_FONTCONFIG_H 1
7693_ACEOF
7694
7695else
7696 support_xft=no
7697fi
7698
7699done 7658done
7700
7701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternGet in -lfontconfig" >&5
7702$as_echo_n "checking for FcPatternGet in -lfontconfig... " >&6; }
7703if ${ac_cv_lib_fontconfig_FcPatternGet+:} false; then :
7704 $as_echo_n "(cached) " >&6
7705else
7706 ac_check_lib_save_LIBS=$LIBS
7707LIBS="-lfontconfig $LIBS"
7708cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7709/* end confdefs.h. */
7710
7711/* Override any GCC internal prototype to avoid an error.
7712 Use char because int might match the return type of a GCC
7713 builtin and then its argument prototype would still apply. */
7714#ifdef __cplusplus
7715extern "C"
7716#endif
7717char FcPatternGet ();
7718int
7719main ()
7720{
7721return FcPatternGet ();
7722 ;
7723 return 0;
7724}
7725_ACEOF
7726if ac_fn_cxx_try_link "$LINENO"; then :
7727 ac_cv_lib_fontconfig_FcPatternGet=yes
7728else
7729 ac_cv_lib_fontconfig_FcPatternGet=no
7730fi
7731rm -f core conftest.err conftest.$ac_objext \
7732 conftest$ac_exeext conftest.$ac_ext
7733LIBS=$ac_check_lib_save_LIBS
7734fi
7735{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternGet" >&5
7736$as_echo "$ac_cv_lib_fontconfig_FcPatternGet" >&6; }
7737if test "x$ac_cv_lib_fontconfig_FcPatternGet" = xyes; then :
7738 :
7739else
7740 support_xft=no
7741fi
7742 7659
7743 LIBS="$save_LIBS" 7660 LIBS="$save_LIBS"
7744 7661
7745 if test x$support_xft = xyes; then 7662 if test x$support_xft = xyes; then
7746 7663

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines