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.140 by root, Mon Jan 3 03:05:46 2011 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
… …
6396 6396
6397 6397
6398 6398
6399 6399
6400for ac_header in \ 6400for ac_header in \
6401 sys/byteorder.h \
6402 sys/ioctl.h \ 6401 sys/ioctl.h \
6403 sys/sockio.h \ 6402 sys/sockio.h \
6404 sys/strredir.h \ 6403 sys/strredir.h \
6405 stdint.h \ 6404 stdint.h \
6406 wchar.h \ 6405 wchar.h \
… …
7743 7742
7744$as_echo "#define TTY_GID_SUPPORT 1" >>confdefs.h 7743$as_echo "#define TTY_GID_SUPPORT 1" >>confdefs.h
7745 7744
7746fi 7745fi
7747 7746
7748if test x$support_xft = xyes; then 7747if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
7748 rxvt_have_xrender=no
7749 # Extract the first word of "pkg-config", so it can be a program name with args. 7749 # Extract the first word of "pkg-config", so it can be a program name with args.
7750set dummy pkg-config; ac_word=$2 7750set dummy pkg-config; ac_word=$2
7751{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7751{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7752$as_echo_n "checking for $ac_word... " >&6; } 7752$as_echo_n "checking for $ac_word... " >&6; }
7753if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 7753if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
… …
7785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7786$as_echo "no" >&6; } 7786$as_echo "no" >&6; }
7787fi 7787fi
7788 7788
7789 7789
7790 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7791 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
7792 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
7793 rxvt_have_xrender=yes
7794
7795 save_LIBS="$LIBS"
7796 LIBS="$LIBS $X_LIBS"
7797 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
7798if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
7799
7800else
7801 rxvt_have_xrender=no
7802fi
7803
7804
7805 ac_fn_cxx_check_func "$LINENO" "XRenderFindStandardFormat" "ac_cv_func_XRenderFindStandardFormat"
7806if test "x$ac_cv_func_XRenderFindStandardFormat" = x""yes; then :
7807
7808else
7809 rxvt_have_xrender=no
7810fi
7811
7812 LIBS="$save_LIBS"
7813 fi
7814fi
7815
7816if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
7817 # Extract the first word of "pkg-config", so it can be a program name with args.
7818set dummy pkg-config; ac_word=$2
7819{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7820$as_echo_n "checking for $ac_word... " >&6; }
7821if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7822 $as_echo_n "(cached) " >&6
7823else
7824 case $PKG_CONFIG in
7825 [\\/]* | ?:[\\/]*)
7826 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7827 ;;
7828 *)
7829 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7830for as_dir in $PATH
7831do
7832 IFS=$as_save_IFS
7833 test -z "$as_dir" && as_dir=.
7834 for ac_exec_ext in '' $ac_executable_extensions; do
7835 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7836 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7837 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7838 break 2
7839 fi
7840done
7841 done
7842IFS=$as_save_IFS
7843
7844 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7845 ;;
7846esac
7847fi
7848PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7849if test -n "$PKG_CONFIG"; then
7850 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7851$as_echo "$PKG_CONFIG" >&6; }
7852else
7853 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7854$as_echo "no" >&6; }
7855fi
7856
7857
7790 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 7858 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
7791 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 7859 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
7792 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 7860 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
7793 else 7861 else
7794 # Extract the first word of "xft-config", so it can be a program name with args. 7862 # Extract the first word of "xft-config", so it can be a program name with args.
… …
7836 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 7904 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
7837 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 7905 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
7838 fi 7906 fi
7839 fi 7907 fi
7840 7908
7909 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
7910 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
7911 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
7912 fi
7913
7841 save_LIBS="$LIBS" 7914 save_LIBS="$LIBS"
7842 LIBS="$LIBS $X_LIBS" 7915 LIBS="$LIBS $X_LIBS"
7843 for ac_header in X11/Xft/Xft.h 7916 for ac_header in X11/Xft/Xft.h
7844do : 7917do :
7845 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" 7918 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
… …
7894 : 7967 :
7895else 7968else
7896 support_xft=no 7969 support_xft=no
7897fi 7970fi
7898 7971
7972 for ac_header in fontconfig/fontconfig.h
7973do :
7974 ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
7975if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
7976 cat >>confdefs.h <<_ACEOF
7977#define HAVE_FONTCONFIG_FONTCONFIG_H 1
7978_ACEOF
7979
7980else
7981 support_xft=no
7982fi
7983
7984done
7985
7986 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternGet in -lfontconfig" >&5
7987$as_echo_n "checking for FcPatternGet in -lfontconfig... " >&6; }
7988if test "${ac_cv_lib_fontconfig_FcPatternGet+set}" = set; then :
7989 $as_echo_n "(cached) " >&6
7990else
7991 ac_check_lib_save_LIBS=$LIBS
7992LIBS="-lfontconfig $LIBS"
7993cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7994/* end confdefs.h. */
7995
7996/* Override any GCC internal prototype to avoid an error.
7997 Use char because int might match the return type of a GCC
7998 builtin and then its argument prototype would still apply. */
7999#ifdef __cplusplus
8000extern "C"
8001#endif
8002char FcPatternGet ();
8003int
8004main ()
8005{
8006return FcPatternGet ();
8007 ;
8008 return 0;
8009}
8010_ACEOF
8011if ac_fn_cxx_try_link "$LINENO"; then :
8012 ac_cv_lib_fontconfig_FcPatternGet=yes
8013else
8014 ac_cv_lib_fontconfig_FcPatternGet=no
8015fi
8016rm -f core conftest.err conftest.$ac_objext \
8017 conftest$ac_exeext conftest.$ac_ext
8018LIBS=$ac_check_lib_save_LIBS
8019fi
8020{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternGet" >&5
8021$as_echo "$ac_cv_lib_fontconfig_FcPatternGet" >&6; }
8022if test "x$ac_cv_lib_fontconfig_FcPatternGet" = x""yes; then :
8023 :
8024else
8025 support_xft=no
8026fi
8027
7899 LIBS="$save_LIBS" 8028 LIBS="$save_LIBS"
7900 8029
7901 if test x$support_xft = xyes; then 8030 if test x$support_xft = xyes; then
7902 8031
7903$as_echo "#define XFT 1" >>confdefs.h 8032$as_echo "#define XFT 1" >>confdefs.h
7904 8033
7905 fi 8034 fi
7906fi 8035fi
8036if test x$support_styles = xyes; then
8037
8038$as_echo "#define ENABLE_STYLES 1" >>confdefs.h
8039
8040fi
8041if test x$support_iso14755 = xyes; then
8042
8043$as_echo "#define ISO_14755 1" >>confdefs.h
8044
8045fi
8046if test x$support_8bitctrls = xyes; then
8047
8048$as_echo "#define EIGHT_BIT_CONTROLS 1" >>confdefs.h
8049
8050fi
8051if test x$support_fading = xyes; then
8052
8053$as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h
8054
8055fi
7907if test x$support_inheritpixmap = xyes; then 8056if 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 8057 if test x$rxvt_have_xrender = xyes; then
7975 LIBS="$LIBS -lm" 8058 LIBS="$LIBS -lm"
7976 8059
7977$as_echo "#define XRENDER 1" >>confdefs.h 8060$as_echo "#define XRENDER 1" >>confdefs.h
7978 8061
7979 fi 8062 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 8063
8003$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h 8064$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h
8004 8065
8005fi 8066fi
8006if test x$support_keepscrolling = xno; then 8067if test x$support_keepscrolling = xno; then

Diff Legend

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