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

Comparing rxvt-unicode/configure (file contents):
Revision 1.83 by root, Sat Jan 21 18:34:25 2006 UTC vs.
Revision 1.86 by root, Sat Jan 21 22:34:05 2006 UTC

… …
307#endif 307#endif
308#if HAVE_UNISTD_H 308#if HAVE_UNISTD_H
309# include <unistd.h> 309# include <unistd.h>
310#endif" 310#endif"
311 311
312ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LINKER INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED ECHO CMP TIC CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define PERL PERLLIB PERLFLAGS PERLPRIVLIBEXP IF_PERL PERL_O DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' 312ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LINKER INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED ECHO CMP TIC CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define PKG_CONFIG XFT_CONFIG PERL PERLLIB PERLFLAGS PERLPRIVLIBEXP IF_PERL PERL_O DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS'
313ac_subst_files='' 313ac_subst_files=''
314 314
315# Initialize some variables set by options. 315# Initialize some variables set by options.
316ac_init_help= 316ac_init_help=
317ac_init_version=false 317ac_init_version=false
… …
3221if test "$ac_cv_search_strerror" != no; then 3221if test "$ac_cv_search_strerror" != no; then
3222 test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" 3222 test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
3223 3223
3224fi 3224fi
3225 3225
3226
3227ac_ext=c
3228ac_cpp='$CPP $CPPFLAGS'
3229ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3230ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3231ac_compiler_gnu=$ac_cv_c_compiler_gnu
3232
3233
3234LINKER="$CXX"
3235if test x$GCC = xyes && test x$GXX = xyes; then
3236 echo "$as_me:$LINENO: checking for main in -lsupc++" >&5
3237echo $ECHO_N "checking for main in -lsupc++... $ECHO_C" >&6
3238if test "${ac_cv_lib_supcpp_main+set}" = set; then
3239 echo $ECHO_N "(cached) $ECHO_C" >&6
3240else
3241 ac_check_lib_save_LIBS=$LIBS
3242LIBS="-lsupc++ $LIBS"
3243cat >conftest.$ac_ext <<_ACEOF
3244/* confdefs.h. */
3245_ACEOF
3246cat confdefs.h >>conftest.$ac_ext
3247cat >>conftest.$ac_ext <<_ACEOF
3248/* end confdefs.h. */
3249
3250
3251int
3252main ()
3253{
3254main ();
3255 ;
3256 return 0;
3257}
3258_ACEOF
3259rm -f conftest.$ac_objext conftest$ac_exeext
3260if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3261 (eval $ac_link) 2>conftest.er1
3262 ac_status=$?
3263 grep -v '^ *+' conftest.er1 >conftest.err
3264 rm -f conftest.er1
3265 cat conftest.err >&5
3266 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3267 (exit $ac_status); } &&
3268 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3269 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3270 (eval $ac_try) 2>&5
3271 ac_status=$?
3272 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3273 (exit $ac_status); }; } &&
3274 { ac_try='test -s conftest$ac_exeext'
3275 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3276 (eval $ac_try) 2>&5
3277 ac_status=$?
3278 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3279 (exit $ac_status); }; }; then
3280 ac_cv_lib_supcpp_main=yes
3281else
3282 echo "$as_me: failed program was:" >&5
3283sed 's/^/| /' conftest.$ac_ext >&5
3284
3285ac_cv_lib_supcpp_main=no
3286fi
3287rm -f conftest.err conftest.$ac_objext \
3288 conftest$ac_exeext conftest.$ac_ext
3289LIBS=$ac_check_lib_save_LIBS
3290fi
3291echo "$as_me:$LINENO: result: $ac_cv_lib_supcpp_main" >&5
3292echo "${ECHO_T}$ac_cv_lib_supcpp_main" >&6
3293if test $ac_cv_lib_supcpp_main = yes; then
3294
3295 LINKER="$CC"
3296 LIBS="$LIBS -lsupc++"
3297
3298fi
3299
3300fi
3301LINKER=$LINKER
3302
3303
3304ac_ext=cc 3226ac_ext=cc
3305ac_cpp='$CXXCPP $CPPFLAGS' 3227ac_cpp='$CXXCPP $CPPFLAGS'
3306ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3228ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3307ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3229ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3308ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3230ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
3309 3231
3232
3233if test x$GCC = xyes && test x$GXX = xyes; then
3234 echo "$as_me:$LINENO: checking for working libsupc++" >&5
3235echo $ECHO_N "checking for working libsupc++... $ECHO_C" >&6
3236 save_CXX="$CXX"
3237 save_LIBS="$LIBS"
3238 CXX="$CC"
3239 LIBS="$LIBS -lsupc++"
3240 LINKER="$CC"
3241
3242cat >conftest.$ac_ext <<_ACEOF
3243/* confdefs.h. */
3244_ACEOF
3245cat confdefs.h >>conftest.$ac_ext
3246cat >>conftest.$ac_ext <<_ACEOF
3247/* end confdefs.h. */
3248struct test { }; void f() try { throw new test; } catch (...) { throw; }
3249int
3250main ()
3251{
3252
3253 ;
3254 return 0;
3255}
3256_ACEOF
3257rm -f conftest.$ac_objext conftest$ac_exeext
3258if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3259 (eval $ac_link) 2>conftest.er1
3260 ac_status=$?
3261 grep -v '^ *+' conftest.er1 >conftest.err
3262 rm -f conftest.er1
3263 cat conftest.err >&5
3264 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3265 (exit $ac_status); } &&
3266 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3267 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3268 (eval $ac_try) 2>&5
3269 ac_status=$?
3270 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3271 (exit $ac_status); }; } &&
3272 { ac_try='test -s conftest$ac_exeext'
3273 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3274 (eval $ac_try) 2>&5
3275 ac_status=$?
3276 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3277 (exit $ac_status); }; }; then
3278 echo "$as_me:$LINENO: result: ok" >&5
3279echo "${ECHO_T}ok" >&6
3280else
3281 echo "$as_me: failed program was:" >&5
3282sed 's/^/| /' conftest.$ac_ext >&5
3283
3284
3285 echo "$as_me:$LINENO: result: no, making everything bigger and slower" >&5
3286echo "${ECHO_T}no, making everything bigger and slower" >&6
3287 LIBS="$save_LIBS"
3288 LINKER="$save_CXX"
3289
3290
3291fi
3292rm -f conftest.err conftest.$ac_objext \
3293 conftest$ac_exeext conftest.$ac_ext
3294 CXX="$save_CXX"
3295fi
3296LINKER=$LINKER
3297
3298
3299ac_ext=cc
3300ac_cpp='$CXXCPP $CPPFLAGS'
3301ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3302ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3303ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
3304
3310if test -z "$orig_CXXFLAGS"; then 3305if test -z "$orig_CXXFLAGS"; then
3311 if test x$GCC = xyes && test "x$GXX" = xyes; then 3306 if test x$GCC = xyes && test "x$GXX" = xyes; then
3312 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" 3307 CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs"
3313
3314cat >conftest.$ac_ext <<_ACEOF 3308 cat >conftest.$ac_ext <<_ACEOF
3315/* confdefs.h. */ 3309/* confdefs.h. */
3316_ACEOF 3310_ACEOF
3317cat confdefs.h >>conftest.$ac_ext 3311cat confdefs.h >>conftest.$ac_ext
3318cat >>conftest.$ac_ext <<_ACEOF 3312cat >>conftest.$ac_ext <<_ACEOF
3319/* end confdefs.h. */ 3313/* end confdefs.h. */
… …
11999_ACEOF 11993_ACEOF
12000cat confdefs.h >>conftest.$ac_ext 11994cat confdefs.h >>conftest.$ac_ext
12001cat >>conftest.$ac_ext <<_ACEOF 11995cat >>conftest.$ac_ext <<_ACEOF
12002/* end confdefs.h. */ 11996/* end confdefs.h. */
12003 11997
11998#include <cstddef> // broken bsds (is that redundant) need this
12004#include <sys/types.h> 11999#include <sys/types.h>
12005#include <sys/socket.h> 12000#include <sys/socket.h>
12001#include <sys/uio.h>
12006 12002
12007int 12003int
12008main () 12004main ()
12009{ 12005{
12010 12006
… …
12722 12718
12723fi 12719fi
12724 12720
12725 12721
12726if test x$support_xft = xyes; then 12722if test x$support_xft = xyes; then
12727 LIBS="$LIBS `pkg-config xft --libs`" 12723 # Extract the first word of "pkg-config", so it can be a program name with args.
12724set dummy pkg-config; ac_word=$2
12725echo "$as_me:$LINENO: checking for $ac_word" >&5
12726echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12727if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
12728 echo $ECHO_N "(cached) $ECHO_C" >&6
12729else
12730 case $PKG_CONFIG in
12731 [\\/]* | ?:[\\/]*)
12732 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
12733 ;;
12734 *)
12735 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12736for as_dir in $PATH
12737do
12738 IFS=$as_save_IFS
12739 test -z "$as_dir" && as_dir=.
12740 for ac_exec_ext in '' $ac_executable_extensions; do
12741 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12742 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
12743 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12744 break 2
12745 fi
12746done
12747done
12748
12749 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
12750 ;;
12751esac
12752fi
12753PKG_CONFIG=$ac_cv_path_PKG_CONFIG
12754
12755if test -n "$PKG_CONFIG"; then
12756 echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
12757echo "${ECHO_T}$PKG_CONFIG" >&6
12758else
12759 echo "$as_me:$LINENO: result: no" >&5
12760echo "${ECHO_T}no" >&6
12761fi
12762
12763 # Extract the first word of "xft-config", so it can be a program name with args.
12764set dummy xft-config; ac_word=$2
12765echo "$as_me:$LINENO: checking for $ac_word" >&5
12766echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
12767if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
12768 echo $ECHO_N "(cached) $ECHO_C" >&6
12769else
12770 case $XFT_CONFIG in
12771 [\\/]* | ?:[\\/]*)
12772 ac_cv_path_XFT_CONFIG="$XFT_CONFIG" # Let the user override the test with a path.
12773 ;;
12774 *)
12775 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12776for as_dir in $PATH
12777do
12778 IFS=$as_save_IFS
12779 test -z "$as_dir" && as_dir=.
12780 for ac_exec_ext in '' $ac_executable_extensions; do
12781 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12782 ac_cv_path_XFT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
12783 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12784 break 2
12785 fi
12786done
12787done
12788
12789 test -z "$ac_cv_path_XFT_CONFIG" && ac_cv_path_XFT_CONFIG="no"
12790 ;;
12791esac
12792fi
12793XFT_CONFIG=$ac_cv_path_XFT_CONFIG
12794
12795if test -n "$XFT_CONFIG"; then
12796 echo "$as_me:$LINENO: result: $XFT_CONFIG" >&5
12797echo "${ECHO_T}$XFT_CONFIG" >&6
12798else
12799 echo "$as_me:$LINENO: result: no" >&5
12800echo "${ECHO_T}no" >&6
12801fi
12802
12803 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
12804 LIBS="$LIBS `$PKG_CONFIG xft --libs`"
12728 CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" 12805 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
12806 else
12807 if test $XFT_CONFIG != no; then
12808 LIBS="$LIBS `$XFT_CONFIG --libs`"
12809 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
12810 fi
12811 fi
12729 12812
12730 12813
12731for ac_header in X11/Xft/Xft.h 12814for ac_header in X11/Xft/Xft.h
12732do 12815do
12733as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 12816as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
… …
14137s,@rxvt_uint16_typedef@,$rxvt_uint16_typedef,;t t 14220s,@rxvt_uint16_typedef@,$rxvt_uint16_typedef,;t t
14138s,@rxvt_int32_typedef@,$rxvt_int32_typedef,;t t 14221s,@rxvt_int32_typedef@,$rxvt_int32_typedef,;t t
14139s,@rxvt_uint32_typedef@,$rxvt_uint32_typedef,;t t 14222s,@rxvt_uint32_typedef@,$rxvt_uint32_typedef,;t t
14140s,@rxvt_intp_define@,$rxvt_intp_define,;t t 14223s,@rxvt_intp_define@,$rxvt_intp_define,;t t
14141s,@rxvt_u_intp_define@,$rxvt_u_intp_define,;t t 14224s,@rxvt_u_intp_define@,$rxvt_u_intp_define,;t t
14225s,@PKG_CONFIG@,$PKG_CONFIG,;t t
14226s,@XFT_CONFIG@,$XFT_CONFIG,;t t
14142s,@PERL@,$PERL,;t t 14227s,@PERL@,$PERL,;t t
14143s,@PERLLIB@,$PERLLIB,;t t 14228s,@PERLLIB@,$PERLLIB,;t t
14144s,@PERLFLAGS@,$PERLFLAGS,;t t 14229s,@PERLFLAGS@,$PERLFLAGS,;t t
14145s,@PERLPRIVLIBEXP@,$PERLPRIVLIBEXP,;t t 14230s,@PERLPRIVLIBEXP@,$PERLPRIVLIBEXP,;t t
14146s,@IF_PERL@,$IF_PERL,;t t 14231s,@IF_PERL@,$IF_PERL,;t t

Diff Legend

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