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

Comparing rxvt-unicode/configure (file contents):
Revision 1.137 by root, Sat Nov 13 00:48:11 2010 UTC vs.
Revision 1.139 by root, Mon Dec 13 17:04:24 2010 UTC

… …
6281fi 6281fi
6282 6282
6283 6283
6284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5 6284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5
6285$as_echo_n "checking for gdk-pixbuf... " >&6; } 6285$as_echo_n "checking for gdk-pixbuf... " >&6; }
6286 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 6286 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
6287 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 6287 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
6288 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 6288 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
6289 support_pixbuf=yes 6289 support_pixbuf=yes
6290 fi 6290 fi
6291 6291
6292 if test x$support_pixbuf = xyes; then 6292 if test x$support_pixbuf = xyes; then
6293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 6293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
… …
7743 7743
7744$as_echo "#define TTY_GID_SUPPORT 1" >>confdefs.h 7744$as_echo "#define TTY_GID_SUPPORT 1" >>confdefs.h
7745 7745
7746fi 7746fi
7747 7747
7748if test x$support_xft = xyes; then 7748if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
7749 rxvt_have_xrender=no
7749 # Extract the first word of "pkg-config", so it can be a program name with args. 7750 # Extract the first word of "pkg-config", so it can be a program name with args.
7750set dummy pkg-config; ac_word=$2 7751set dummy pkg-config; ac_word=$2
7751{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7752{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7752$as_echo_n "checking for $ac_word... " >&6; } 7753$as_echo_n "checking for $ac_word... " >&6; }
7753if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 7754if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
… …
7785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7786 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7786$as_echo "no" >&6; } 7787$as_echo "no" >&6; }
7787fi 7788fi
7788 7789
7789 7790
7791 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7792 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
7793 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
7794 rxvt_have_xrender=yes
7795
7796 save_LIBS="$LIBS"
7797 LIBS="$LIBS $X_LIBS"
7798 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
7799if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
7800
7801else
7802 rxvt_have_xrender=no
7803fi
7804
7805
7806 ac_fn_cxx_check_func "$LINENO" "XRenderFindStandardFormat" "ac_cv_func_XRenderFindStandardFormat"
7807if test "x$ac_cv_func_XRenderFindStandardFormat" = x""yes; then :
7808
7809else
7810 rxvt_have_xrender=no
7811fi
7812
7813 LIBS="$save_LIBS"
7814 fi
7815fi
7816
7817if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
7818 # Extract the first word of "pkg-config", so it can be a program name with args.
7819set dummy pkg-config; ac_word=$2
7820{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7821$as_echo_n "checking for $ac_word... " >&6; }
7822if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7823 $as_echo_n "(cached) " >&6
7824else
7825 case $PKG_CONFIG in
7826 [\\/]* | ?:[\\/]*)
7827 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7828 ;;
7829 *)
7830 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7831for as_dir in $PATH
7832do
7833 IFS=$as_save_IFS
7834 test -z "$as_dir" && as_dir=.
7835 for ac_exec_ext in '' $ac_executable_extensions; do
7836 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7837 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7838 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7839 break 2
7840 fi
7841done
7842 done
7843IFS=$as_save_IFS
7844
7845 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7846 ;;
7847esac
7848fi
7849PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7850if test -n "$PKG_CONFIG"; then
7851 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7852$as_echo "$PKG_CONFIG" >&6; }
7853else
7854 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7855$as_echo "no" >&6; }
7856fi
7857
7858
7790 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 7859 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
7791 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 7860 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
7792 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 7861 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
7793 else 7862 else
7794 # Extract the first word of "xft-config", so it can be a program name with args. 7863 # Extract the first word of "xft-config", so it can be a program name with args.
… …
7836 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 7905 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
7837 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 7906 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
7838 fi 7907 fi
7839 fi 7908 fi
7840 7909
7910 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
7911 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
7912 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
7913 fi
7914
7841 save_LIBS="$LIBS" 7915 save_LIBS="$LIBS"
7842 LIBS="$LIBS $X_LIBS" 7916 LIBS="$LIBS $X_LIBS"
7843 for ac_header in X11/Xft/Xft.h 7917 for ac_header in X11/Xft/Xft.h
7844do : 7918do :
7845 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" 7919 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
… …
7894 : 7968 :
7895else 7969else
7896 support_xft=no 7970 support_xft=no
7897fi 7971fi
7898 7972
7973 for ac_header in fontconfig/fontconfig.h
7974do :
7975 ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
7976if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
7977 cat >>confdefs.h <<_ACEOF
7978#define HAVE_FONTCONFIG_FONTCONFIG_H 1
7979_ACEOF
7980
7981else
7982 support_xft=no
7983fi
7984
7985done
7986
7987 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternGet in -lfontconfig" >&5
7988$as_echo_n "checking for FcPatternGet in -lfontconfig... " >&6; }
7989if test "${ac_cv_lib_fontconfig_FcPatternGet+set}" = set; then :
7990 $as_echo_n "(cached) " >&6
7991else
7992 ac_check_lib_save_LIBS=$LIBS
7993LIBS="-lfontconfig $LIBS"
7994cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7995/* end confdefs.h. */
7996
7997/* Override any GCC internal prototype to avoid an error.
7998 Use char because int might match the return type of a GCC
7999 builtin and then its argument prototype would still apply. */
8000#ifdef __cplusplus
8001extern "C"
8002#endif
8003char FcPatternGet ();
8004int
8005main ()
8006{
8007return FcPatternGet ();
8008 ;
8009 return 0;
8010}
8011_ACEOF
8012if ac_fn_cxx_try_link "$LINENO"; then :
8013 ac_cv_lib_fontconfig_FcPatternGet=yes
8014else
8015 ac_cv_lib_fontconfig_FcPatternGet=no
8016fi
8017rm -f core conftest.err conftest.$ac_objext \
8018 conftest$ac_exeext conftest.$ac_ext
8019LIBS=$ac_check_lib_save_LIBS
8020fi
8021{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternGet" >&5
8022$as_echo "$ac_cv_lib_fontconfig_FcPatternGet" >&6; }
8023if test "x$ac_cv_lib_fontconfig_FcPatternGet" = x""yes; then :
8024 :
8025else
8026 support_xft=no
8027fi
8028
7899 LIBS="$save_LIBS" 8029 LIBS="$save_LIBS"
7900 8030
7901 if test x$support_xft = xyes; then 8031 if test x$support_xft = xyes; then
7902 8032
7903$as_echo "#define XFT 1" >>confdefs.h 8033$as_echo "#define XFT 1" >>confdefs.h
7904 8034
7905 fi 8035 fi
7906fi 8036fi
8037if test x$support_styles = xyes; then
8038
8039$as_echo "#define ENABLE_STYLES 1" >>confdefs.h
8040
8041fi
8042if test x$support_iso14755 = xyes; then
8043
8044$as_echo "#define ISO_14755 1" >>confdefs.h
8045
8046fi
8047if test x$support_8bitctrls = xyes; then
8048
8049$as_echo "#define EIGHT_BIT_CONTROLS 1" >>confdefs.h
8050
8051fi
8052if test x$support_fading = xyes; then
8053
8054$as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h
8055
8056fi
7907if test x$support_inheritpixmap = xyes; then 8057if test x$support_inheritpixmap = xyes; then
7908 support_xrender=yes
7909 # Extract the first word of "pkg-config", so it can be a program name with args.
7910set dummy pkg-config; ac_word=$2
7911{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7912$as_echo_n "checking for $ac_word... " >&6; }
7913if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7914 $as_echo_n "(cached) " >&6
7915else
7916 case $PKG_CONFIG in
7917 [\\/]* | ?:[\\/]*)
7918 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7919 ;;
7920 *)
7921 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7922for as_dir in $PATH
7923do
7924 IFS=$as_save_IFS
7925 test -z "$as_dir" && as_dir=.
7926 for ac_exec_ext in '' $ac_executable_extensions; do
7927 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7928 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7929 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7930 break 2
7931 fi
7932done
7933 done
7934IFS=$as_save_IFS
7935
7936 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7937 ;;
7938esac
7939fi
7940PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7941if test -n "$PKG_CONFIG"; then
7942 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7943$as_echo "$PKG_CONFIG" >&6; }
7944else
7945 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7946$as_echo "no" >&6; }
7947fi
7948
7949
7950 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7951 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
7952 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
7953
7954 save_LIBS="$LIBS"
7955 LIBS="$LIBS $X_LIBS"
7956 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
7957if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
7958
7959else
7960 support_xrender=no
7961fi
7962
7963
7964 ac_fn_cxx_check_func "$LINENO" "XRenderFindStandardFormat" "ac_cv_func_XRenderFindStandardFormat"
7965if test "x$ac_cv_func_XRenderFindStandardFormat" = x""yes; then :
7966
7967else
7968 support_xrender=no
7969fi
7970
7971 LIBS="$save_LIBS"
7972 fi
7973
7974 if test x$support_xrender = xyes; then 8058 if test x$rxvt_have_xrender = xyes; then
7975 LIBS="$LIBS -lm" 8059 LIBS="$LIBS -lm"
7976 8060
7977$as_echo "#define XRENDER 1" >>confdefs.h 8061$as_echo "#define XRENDER 1" >>confdefs.h
7978 8062
7979 fi 8063 fi
7980fi
7981if test x$support_styles = xyes; then
7982
7983$as_echo "#define ENABLE_STYLES 1" >>confdefs.h
7984
7985fi
7986if test x$support_iso14755 = xyes; then
7987
7988$as_echo "#define ISO_14755 1" >>confdefs.h
7989
7990fi
7991if test x$support_8bitctrls = xyes; then
7992
7993$as_echo "#define EIGHT_BIT_CONTROLS 1" >>confdefs.h
7994
7995fi
7996if test x$support_fading = xyes; then
7997
7998$as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h
7999
8000fi
8001if test x$support_inheritpixmap = xyes; then
8002 8064
8003$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h 8065$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h
8004 8066
8005fi 8067fi
8006if test x$support_keepscrolling = xno; then 8068if test x$support_keepscrolling = xno; then

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines