# include <unistd.h>
#endif"
-ac_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 AWK LINKER CXXCPP EGREP INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED ECHO CMP TBL TIC 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'
-ac_subst_files='MCOMMON'
+ac_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 LINKER CXXCPP EGREP INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED ECHO CMP TIC 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'
+ac_subst_files=''
# Initialize some variables set by options.
ac_init_help=
--enable-transparency enable transparent backgrounds
--enable-tinting enable tinting of transparent bg
--enable-fading enable colors fading when off focus
- --enable-menubar enable menubar
--enable-rxvt-scroll enable rxvt style scrollbar
--enable-next-scroll enable NeXT style scrollbar
--enable-xterm-scroll enable Xterm style scrollbar
--enable-perl enable embedded perl interpreter
--enable-plain-scroll enable plain style scrollbar
- --enable-half-shadow use half width/height shadow on rxvt scrollbar
--enable-xim XIM (X Input Method) protocol support
--enable-ttygid enable tty setting to group named "tty"
--disable-backspace-key disable handling of the backspace key
+
+ ac_config_headers="$ac_config_headers config.h:config.h.in"
+
+
ac_aux_dir=
-for ac_dir in autoconf $srcdir/autoconf; do
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit 1; }; }
fi
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- ac_config_headers="$ac_config_headers config.h:autoconf/config.h.in"
-
-
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
echo "configuring for rxvt $VERSION"
echo ""
+orig_CXXFLAGS="$CXXFLAGS"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$AWK" && break
-done
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
if test -z "$orig_CXXFLAGS"; then
- CXXFLAGS='-O'
if test x$GCC = xyes && test "x$GXX" = xyes; then
CXXFLAGS="-g -O3"
+ else
+ CXXFLAGS="-O"
fi
CFLAGS="$CXXFLAGS"
fi
support_fading=yes
support_keepscrolling=yes
support_selectionscrolling=yes
-support_menubar=no
support_mousewheel=yes
support_mouseslipwheel=yes
support_utmp=yes
support_keepscrolling=no
support_selectionscrolling=no
support_lastlog=no
- support_menubar=no
support_mousewheel=no
support_mouseslipwheel=no
support_text_blink=no
support_keepscrolling=yes
support_selectionscrolling=yes
support_lastlog=yes
- support_menubar=yes
support_mousewheel=yes
support_mouseslipwheel=yes
support_text_blink=yes
fi
fi;
-# Check whether --enable-menubar or --disable-menubar was given.
-if test "${enable_menubar+set}" = set; then
- enableval="$enable_menubar"
- if test x$enableval = xyes -o x$enableval = xno; then
- support_menubar=$enableval
- fi
-fi;
-
# Check whether --enable-rxvt-scroll or --disable-rxvt-scroll was given.
if test "${enable_rxvt_scroll+set}" = set; then
enableval="$enable_rxvt_scroll"
fi
fi;
-# Check whether --enable-half-shadow or --disable-half-shadow was given.
-if test "${enable_half_shadow+set}" = set; then
- enableval="$enable_half_shadow"
- if test x$enableval = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HALFSHADOW 1
-_ACEOF
-
- fi
-fi;
# Check whether --with-codesets or --without-codesets was given.
fi;
-
-cat >>confdefs.h <<\_ACEOF
-#define PROTOTYPES 1
-_ACEOF
-
-
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo "${ECHO_T}no" >&6
fi
-# Extract the first word of "tbl", so it can be a program name with args.
-set dummy tbl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_TBL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $TBL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_TBL="$TBL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_TBL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-TBL=$ac_cv_path_TBL
-
-if test -n "$TBL"; then
- echo "$as_me:$LINENO: result: $TBL" >&5
-echo "${ECHO_T}$TBL" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
# Extract the first word of "tic", so it can be a program name with args.
set dummy tic; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
-case "$host_alias" in
- *ultrix) ac_cv_func_setsid='no' ;;
- *) break;;
-esac
-
-
-
for ac_func in \
- atexit \
revoke \
unsetenv \
setutent \
seteuid \
+ setresuid \
setreuid \
- setsid \
- setpgrp \
- setpgid \
_getpty \
+ getpt \
posix_openpt \
grantpt \
unlockpt \
#define HAVE_UNIX_FDPASS 1
_ACEOF
+else
+ { { echo "$as_me:$LINENO: error: urxvt requires unix-compliant filehandle passing ability" >&5
+echo "$as_me: error: urxvt requires unix-compliant filehandle passing ability" >&2;}
+ { (exit 1); exit 1; }; }
fi
echo "$as_me:$LINENO: checking for broken XIM callback" >&5
fi
-if test x$ac_cv_func_posix_openpt = xno; then
+if test x$ac_cv_func_getpt = xno -a x$ac_cv_func_posix_openpt = xno; then
echo "$as_me:$LINENO: checking for openpty" >&5
echo $ECHO_N "checking for openpty... $ECHO_C" >&6
if test "${ac_cv_func_openpty+set}" = set; then
else
if test x$ac_cv_func_openpty = xyes -o x$ac_cv_lib_util_openpty = xyes; then
rxvt_cv_ptys=OPENPTY
+ else if test x$ac_cv_func_getpt = xyes; then
+ rxvt_cv_ptys=GLIBC
else if test x$ac_cv_func_posix_openpt = xyes; then
rxvt_cv_ptys=POSIX
else if test x$ac_cv_func__getpty = xyes; then
fi
fi
fi
+fi
fi
echo "$as_me:$LINENO: result: $rxvt_cv_ptys" >&5
echo "${ECHO_T}$rxvt_cv_ptys" >&6
+if test x$rxvt_cv_ptys = xGLIBC; then
+
+cat >>confdefs.h <<\_ACEOF
+#define PTYS_ARE_GETPT 1
+_ACEOF
+
+fi
if test x$rxvt_cv_ptys = xPOSIX; then
cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
-if test x$support_menubar = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define MENUBAR 1
-_ACEOF
-
-fi
if test x$support_frills = xyes; then
cat >>confdefs.h <<\_ACEOF
PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
else
- support_perl=no
- echo "$as_me:$LINENO: result: no, unable to link" >&5
-echo "${ECHO_T}no, unable to link" >&6
+ { { echo "$as_me:$LINENO: error: no, unable to link" >&5
+echo "$as_me: error: no, unable to link" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
- { { echo "$as_me:$LINENO: error: no working perl found" >&5
-echo "$as_me: error: no working perl found" >&2;}
- { (exit or perl not version >= 5.8); exit or perl not version >= 5.8; }; }
- support_perl=no
+ { { echo "$as_me:$LINENO: error: no working perl found, or perl not version >= 5.8" >&5
+echo "$as_me: error: no working perl found, or perl not version >= 5.8" >&2;}
+ { (exit 1); exit 1; }; }
fi
fi
-MCOMMON=./autoconf/Make.common
-
-
test "$program_prefix" != NONE &&
program_transform_name="s,^,$program_prefix,;$program_transform_name"
# Use a double $ so make ignores it.
include_time_h="/* #include <time.h> */"
fi
- ac_config_files="$ac_config_files autoconf/Make.common Makefile doc/Makefile src/Makefile src/rxvtlib.h"
+ ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/rxvtlib.h"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
do
case "$ac_config_target" in
# Handling of arguments.
- "autoconf/Make.common" ) CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;;
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/rxvtlib.h" ) CONFIG_FILES="$CONFIG_FILES src/rxvtlib.h" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:autoconf/config.h.in" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.h.in" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@AWK@,$AWK,;t t
s,@LINKER@,$LINKER,;t t
s,@CXXCPP@,$CXXCPP,;t t
s,@EGREP@,$EGREP,;t t
s,@SED@,$SED,;t t
s,@ECHO@,$ECHO,;t t
s,@CMP@,$CMP,;t t
-s,@TBL@,$TBL,;t t
s,@TIC@,$TIC,;t t
s,@X_CFLAGS@,$X_CFLAGS,;t t
s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
s,@include_time_h@,$include_time_h,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-/@MCOMMON@/r $MCOMMON
-s,@MCOMMON@,,;t t
CEOF
_ACEOF
projects / dana / urxvt.git / blobdiff