changequote(, )dnl
VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
changequote([, ])dnl
AC_SUBST(VERSION)dnl
AC_SUBST(DATE)dnl
-AC_SUBST(LSMDATE)dnl
-AC_SUBST(LIBVERSION)dnl
echo ""
echo "configuring for rxvt $VERSION"
orig_CXXFLAGS="$CXXFLAGS"
dnl# Checks for programs.
-dnl AC_MAKE_SET
-
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
AC_PROG_INSTALL
AC_AIX
+AC_GNU_SOURCE
AC_ISC_POSIX
AC_LANG(C++)
CFLAGS="$CXXFLAGS"
fi
-AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
-
case $host in
*-*-solaris* )
AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris)
;;
esac
-dnl if test x$GXX = xyes; then
-dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
-dnl fi
-
dnl# FreeBSD needs to link libxpg4
AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])])
AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])])
AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])])
-dnl AC_ENABLE_SHARED(no)dnl# libtool
-dnl AC_ENABLE_STATIC(yes)dnl# libtool
-dnl AC_PROG_LIBTOOL()dnl# libtool
-
support_frills=yes
support_inheritpixmap=yes
support_fading=yes
support_scroll_rxvt=yes
support_scroll_next=yes
support_scroll_xterm=yes
-support_scroll_plain=yes
support_xim=yes
support_afterimage=yes
support_afterstep=yes
dnl# CHECKING COMMAND LINE OPTIONS
dnl# --------------------------------------------------------------------------
-if test "x$enable_shared" = xyes; then
- AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only)
- INSTALL_LIBRXVT=yes
-fi
-AC_SUBST(INSTALL_LIBRXVT)
-
AC_ARG_ENABLE(everything,
[ --enable-everything enable standard non-multichoice features
- NOTE: this option is order dependent
- NOTE: automatically enabled with --enable-shared],
+ NOTE: this option is order dependent],
[
if test x$enableval = xno; then
support_frills=no
support_scroll_rxvt=no
support_scroll_next=no
support_scroll_xterm=no
- support_scroll_plain=no
support_utmp=no
support_wtmp=no
support_xim=no
support_scroll_rxvt=yes
support_scroll_next=yes
support_scroll_xterm=yes
- support_scroll_plain=yes
support_utmp=yes
support_wtmp=yes
support_xim=yes
fi
])
+ASSERTIONS=no
+AC_ARG_ENABLE(assert,
+ [ --enable-assert enable assertions],
+ [if test x$enableval = xyes; then
+ ASSERTIONS=yes
+ fi])
+if test x$ASSERTIONS = xno; then
+ AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging))
+fi
+
WARNINGS=no
AC_ARG_ENABLE(warnings,
[ --enable-warnings turn on g++ warnings],
fi])
AC_ARG_ENABLE(afterimage,
- [ --enable-afterimage enable integration with libAfterImage for background images],
+ [ --enable-afterimage enable integration with libAfterImage for background images],
[if test x$enableval = xyes -o x$enableval = xno; then
support_afterimage=$enableval
fi])
support_scroll_xterm=$enableval
fi])
-AC_ARG_ENABLE(plain-scroll,
- [ --enable-plain-scroll enable plain style scrollbar],
- [if test x$enableval = xyes -o x$enableval = xno; then
- support_scroll_plain=$enableval
- fi])
-
AC_ARG_ENABLE(perl,
[ --enable-perl enable embedded perl interpreter],
[if test x$enableval = xyes -o x$enableval = xno; then
AC_PATH_PROG(TIC, tic, :)
-dnl# need a neat way to detect SVR4 or its features
-dnl# in src/command.c we use these functions:
-dnl# grantpt(), unlockpt(), ptsname(), which are defined in <sys/ptms.h>
-dnl# - but are these also defined for other systems?
-
-dnl# hack to find if this is SVR4 -- who knows?
-dnl## AC_MSG_CHECKING(for SVR4)
-dnl## AC_EGREP_CPP(yes,
-dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__)
-dnl## yes;
-dnl## #endif
-dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?))
-
AC_PATH_XTRA
AFTERIMAGE_CFLAGS=
dnl# --------------------------------------------------------------------------
dnl# CHECKING FOR HEADER FILES
dnl# --------------------------------------------------------------------------
-AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS( \
- assert.h \
- fcntl.h \
- stdarg.h \
- stdlib.h \
- string.h \
- termios.h \
- unistd.h \
sys/byteorder.h \
sys/ioctl.h \
- sys/select.h \
sys/sockio.h \
sys/strredir.h \
- sys/time.h \
stdint.h \
wchar.h \
cwchar \
- clocale \
)
-AC_HEADER_TIME
-
-dnl# check to allow both <termios.h> and <sys/ioctl.h>
-AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
-
AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
if test x$rxvt_cv_xpointer = xyes; then
AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef)
fi
-AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access,
+AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access,
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([
#define XLIB_ILLEGAL_ACCESS
Display *dpy;
dpy->xdefaults = (char *)0;
])],
- [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no]
+ [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no]
)])
-if test x$rxvt_xlib_illegal_access = xyes; then
+if test x$rxvt_cv_xlib_illegal_access = xyes; then
AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it)
fi
-AC_C_CONST
-AC_C_INLINE
-
-dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow.
-
dnl# --------------------------------------------------------------------------
dnl# CHECKING FOR MISSING TYPEDEFS
dnl# --------------------------------------------------------------------------
dnl# Missing typedefs and replacements
AC_TYPE_MODE_T
-dnl> AC_CHECK_TYPE(umode_t, int)
-dnl> AC_CHECK_TYPE(off_t, long)
AC_TYPE_PID_T
AC_TYPE_UID_T
-
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-dnl AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 8)
-AC_CHECK_SIZEOF(int *, 4)
-
-dnl# see usage below
-AC_DEFUN([RXVT_CHECK_SIZE],
- [AC_CACHE_CHECK([for $2], $1,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
-if test "$ac_cv_sizeof_char" -ge $3; then
- $1="$4 char"
-else
- if test "$ac_cv_sizeof_short" -ge $3; then
- $1="$4 short"
- else
- if test "$ac_cv_sizeof_int" -ge $3; then
- $1="$4 int"
- else
- if test "$ac_cv_sizeof_long" -ge $3; then
- $1="$4 long"
- else
- if test "$ac_cv_sizeof_long_long" -ge $3; then
- $1="$4 long long"
- else
- $1="$4 $5" # we _must_ have a (possibly wrong) default
- fi
- fi
- fi
- fi
-fi])])]
-if test x"$$1" != xyes; then
- $6="typedef $$1 $2;"
-else
- if test x"$4" = x; then
- $6="/* typedef $5 $2; */"
- else
- $6="/* typedef $4 $5 $2; */"
- fi
-fi dnl
-)
-dnl#
-dnl# Look for types the system may know about anyway.
-dnl#
-RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
-AC_SUBST(rxvt_int16_typedef)
-RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
-AC_SUBST(rxvt_uint16_typedef)
-RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
-AC_SUBST(rxvt_int32_typedef)
-RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
-AC_SUBST(rxvt_uint32_typedef)
-dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
-dnl AC_SUBST(rxvt_int64_typedef)
-dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
-dnl AC_SUBST(rxvt_uint64_typedef)
-dnl#
-dnl# Now look for another we use
-dnl#
-if test "$ac_cv_sizeof_int_p" -eq 8; then
- rxvt_intp_define="#define intp_t int64_t"
- rxvt_u_intp_define="#define u_intp_t u_int64_t"
-else
- if test "$ac_cv_sizeof_int_p" -eq 4; then
- rxvt_intp_define="#define intp_t int32_t"
- rxvt_u_intp_define="#define u_intp_t u_int32_t"
- else
- if test "$ac_cv_sizeof_int_p" -eq 2; then
- rxvt_intp_define="#define intp_t int16_t"
- rxvt_u_intp_define="#define u_intp_t u_int16_t"
- else
- rxvt_intp_define="#error set intp_t"
- rxvt_u_intp_define="#error set u_intp_t"
- fi
- fi
-fi
-AC_SUBST(rxvt_intp_define)
-AC_SUBST(rxvt_u_intp_define)
+AC_TYPE_INT16_T
+AC_TYPE_UINT16_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT32_T
dnl# --------------------------------------------------------------------------
dnl# CHECKING FOR LIBRARY FUNCTIONS
dnl# --------------------------------------------------------------------------
-AC_TYPE_SIGNAL
-dnl> AC_FUNC_VPRINTF
-
AC_CHECK_FUNCS(unsetenv)
UTMP_CHECK
:])])
if test x$rxvt_cv_func_xlocale = xyes; then
AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input)
- AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb,
+ AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb,
[AC_COMPILE_IFELSE([
#include <X11/Xlib.h>
XIMCallback cb;
cb.callback = im_destroy_cb;
}
- ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)])
+ ],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)])
- if test x$rxvt_broken_ximcb = xyes; then
+ if test x$rxvt_cv_broken_ximcb = xyes; then
AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.)
fi
fi
dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager)
dnl fi
+scrolltypes=plain
+AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
+
if test x$support_scroll_rxvt = xyes; then
AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars)
- scrolltypes="rxvt"
+ scrolltypes="$scrolltypes rxvt"
fi
if test x$support_scroll_next = xyes; then
AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars)
AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars)
scrolltypes="$scrolltypes xterm"
fi
-if test x$support_scroll_plain = xyes; then
- AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars)
- scrolltypes="$scrolltypes plain"
-fi
if test x$support_pointer_blank = xyes; then
AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing)
fi
save_LIBS="$LIBS"
CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
-],[
+]], [[
PerlInterpreter *perl = perl_alloc ();
-],[rxvt_perl_link=yes],[rxvt_perl_link=no])
+]])],[rxvt_perl_link=yes],[rxvt_perl_link=no])
CXXFLAGS="$save_CXXFLAGS"
LIBS="$save_LIBS"
AC_ARG_PROGRAM
-dnl# test for "sun" or "__sun__" before include sys_ioctl
-
-dnl# revert HAVE_BLAH_H into a "#include <blah.h>"
-AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl
-[if test "$$3" = "$4" -o "$$5" = "$6"; then
- $1="#include <$2>"
-else
- $1="/* #include <$2> */"
-fi dnl
-AC_SUBST($1)])
-
-RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
-RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
-
AC_CONFIG_FILES([Makefile \
doc/Makefile \
src/Makefile \
-src/rxvtlib.h \
])
AC_OUTPUT
projects / dana / urxvt.git / blobdiff