old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mon Feb 11 11:15:36 2002 Michael Jennings (mej) 

Fixed quoting in the configure script.


SVN revision: 5916
This commit is contained in:
Michael Jennings 2002-02-11 16:17:09 +00:00
parent 2e4967aec3
commit df8f0ee6ad
3 changed files with 175 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4487,3 +4487,7 @@ Mon Feb 4 21:13:44 2002 Michael Jennings (mej)
Finally got around to fixing the icon loader.... Finally got around to fixing the icon loader....
---------------------------------------------------------------------- ----------------------------------------------------------------------
Mon Feb 11 11:15:36 2002 Michael Jennings (mej)
Fixed quoting in the configure script.
----------------------------------------------------------------------

173
configure.ac
View File

@ -1,4 +1,7 @@
dnl# $Id: configure.in,v 1.56 2001/10/21 13:21:04 mej Exp $ dnl# $Id: configure.in,v 1.59 2002/02/03 20:53:05 mej Exp $
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
export PATH
AC_INIT(src/feature.h) AC_INIT(src/feature.h)
AM_INIT_AUTOMAKE(Eterm, 0.9.2) AM_INIT_AUTOMAKE(Eterm, 0.9.2)
@ -50,12 +53,12 @@ if test -z "${CFLAGS}"; then
CFLAGS="$CCOPTS" CFLAGS="$CCOPTS"
fi fi
AC_ARG_WITH(cc, [ --with-cc=compiler force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], AC_ARG_WITH(cc, [ --with-cc=compiler force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], [
CC=$withval, CC=$withval,
if test -z "$CC"; then if test -z "$CC"; then
CC=check CC=check
fi fi
) ])
if test "$CC" = "check"; then if test "$CC" = "check"; then
dnl# Check for Pentium compiler dnl# Check for Pentium compiler
@ -134,8 +137,8 @@ AC_CHECK_PROG(AR, ar, ar, false)
AC_CHECK_PROG(MV, mv, mv, true) AC_CHECK_PROG(MV, mv, mv, true)
AC_CHECK_PROG(TIC, tic, tic, true) AC_CHECK_PROG(TIC, tic, tic, true)
AC_LN_S AC_LN_S
AC_PATH_PROG(PERL, perl, /usr/bin/perl, $PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin) AC_PATH_PROG(PERL, perl, perl)
AC_PATH_PROG(AWK, awk, /usr/bin/awk, $PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin) AC_PROG_AWK
export PERL AWK export PERL AWK
AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(int, 4)
@ -198,7 +201,7 @@ dnl# Utility stuff
dnl# dnl#
dnl# Did they want debugging? dnl# Did they want debugging?
AC_MSG_CHECKING(for debugging level) AC_MSG_CHECKING(for debugging level)
AC_ARG_WITH(debugging, [ --with-debugging[=num] enable debugging output, num is an integer 0-9], AC_ARG_WITH(debugging, [ --with-debugging[=num] enable debugging output, num is an integer 0-9], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
withval=4 withval=4
else else
@ -210,9 +213,9 @@ AC_ARG_WITH(debugging, [ --with-debugging[=num] enable debugging output, num i
else else
echo "no debugging" echo "no debugging"
AC_DEFINE_UNQUOTED(DEBUG, 0) AC_DEFINE_UNQUOTED(DEBUG, 0)
fi, echo "4" fi], [echo "4"
AC_DEFINE_UNQUOTED(DEBUG, 4) AC_DEFINE_UNQUOTED(DEBUG, 4)
) ])
AC_CHECK_FUNC(ptsname, AC_CHECK_FUNC(ptsname,
HAVE_PTSNAME=yes HAVE_PTSNAME=yes
@ -239,13 +242,13 @@ if test -c /dev/ptyp128 ; then
PTY_MECH="SCO $PTY_MECH" PTY_MECH="SCO $PTY_MECH"
fi fi
if test "X$PTY_MECH" = "X"; then if test "X$PTY_MECH" = "X"; then
AC_MSG_RESULT(generic pty's only) AC_MSG_RESULT(generic only)
else else
AC_MSG_RESULT($PTY_MECH) AC_MSG_RESULT($PTY_MECH)
fi fi
AC_MSG_CHECKING(for pty group) AC_MSG_CHECKING(for pty group)
AC_ARG_WITH(pty-group, AC_ARG_WITH(pty-group,
[ --with-pty-group[=gid] specify the group that should own pty files], [ --with-pty-group[=gid] specify the group that should own pty files], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'` PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'`
if test ! -z "$PTY_GRP_NAME"; then if test ! -z "$PTY_GRP_NAME"; then
@ -260,7 +263,7 @@ AC_ARG_WITH(pty-group,
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
AC_DEFINE_UNQUOTED(PTY_GRP_NAME, "$withval") AC_DEFINE_UNQUOTED(PTY_GRP_NAME, "$withval")
fi fi
, ], [
PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'` PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'`
if test ! -z "$PTY_GRP_NAME"; then if test ! -z "$PTY_GRP_NAME"; then
AC_MSG_RESULT($PTY_GRP_NAME) AC_MSG_RESULT($PTY_GRP_NAME)
@ -268,9 +271,9 @@ AC_ARG_WITH(pty-group,
else else
AC_MSG_RESULT(none) AC_MSG_RESULT(none)
fi fi
) ])
AC_MSG_CHECKING(for saved uids) AC_MSG_CHECKING(for saved uids)
AC_ARG_WITH(saved-uids, [ --with(out)-saved-uids specify that your OS has (does not have) saved uids, default is to guess], AC_ARG_WITH(saved-uids, [ --with(out)-saved-uids specify that your OS has (does not have) saved uids, default is to guess], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
AC_MSG_RESULT(user specified yes) AC_MSG_RESULT(user specified yes)
HAVE_SAVED_UIDS=1 HAVE_SAVED_UIDS=1
@ -278,7 +281,7 @@ AC_ARG_WITH(saved-uids, [ --with(out)-saved-uids specify that your OS has (doe
AC_MSG_RESULT(user specified no) AC_MSG_RESULT(user specified no)
HAVE_SAVED_UIDS=0 HAVE_SAVED_UIDS=0
fi fi
) ])
if test "x$HAVE_SAVED_UIDS" = "x"; then if test "x$HAVE_SAVED_UIDS" = "x"; then
case `uname -s` in case `uname -s` in
Linux | linux | GNU*Linux) HAVE_SAVED_UIDS=1 ;; Linux | linux | GNU*Linux) HAVE_SAVED_UIDS=1 ;;
@ -334,44 +337,45 @@ dnl# FEATURES
dnl# dnl#
AC_MSG_CHECKING(if Pablo support is wanted) AC_MSG_CHECKING(if Pablo support is wanted)
AC_ARG_WITH(pablo, AC_ARG_WITH(pablo,
[ --with-pablo[=DIR] compile with Pablo I/O Tracing support (using Pablo prefix DIR)], [ --with-pablo[=DIR] compile with Pablo I/O Tracing support (using Pablo prefix DIR)], [
if test "$withval" != "no"; then if test "$withval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
if test "$withval" != "yes"; then if test "$withval" != "yes"; then
CPPFLAGS="$CPPFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
fi fi
AC_CHECK_HEADER(IOTrace.h, AC_CHECK_HEADER(IOTrace.h, [
AC_CHECK_LIB(PabloTraceExt, initIOTrace, AC_CHECK_LIB(PabloTraceExt, initIOTrace, [
AC_DEFINE(IOTRACE) AC_DEFINE(IOTRACE)
LIBS="$LIBS -lPabloTraceExt -lPabloTrace" LIBS="$LIBS -lPabloTraceExt -lPabloTrace"
echo "Pablo support enabled. Headers in ${withval}/include. Libraries in ${withval}/lib." echo "Pablo support enabled. Headers in ${withval}/include. Libraries in ${withval}/lib."
, ], [
echo "*** ERROR: Pablo support was requested but the Pablo libraries could not be" echo "*** ERROR: Pablo support was requested but the Pablo libraries could not be"
echo "*** found. Please check config.log for further information." echo "*** found. Please check config.log for further information."
echo "*** Pablo support will NOT be included." echo "*** Pablo support will NOT be included."
, -lPabloTrace) ], -lPabloTrace)
, ], [
echo "*** ERROR: Pablo support was requested but the Pablo header files could not be" echo "*** ERROR: Pablo support was requested but the Pablo header files could not be"
echo "*** found. Please check the value you passed to --with-pablo." echo "*** found. Please check the value you passed to --with-pablo."
echo "*** Pablo support will NOT be included.") echo "*** Pablo support will NOT be included."
])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no)
) )
AC_MSG_CHECKING(if profiling macros should be included) AC_MSG_CHECKING(if profiling macros should be included)
AC_ARG_ENABLE(profile, AC_ARG_ENABLE(profile,
[ --enable-profile compile with code profiling macros enabled], [ --enable-profile compile with code profiling macros enabled], [
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(ENABLE_PROFILE) AC_DEFINE(ENABLE_PROFILE)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no)
) )
AC_MSG_CHECKING(for pixmap support) AC_MSG_CHECKING(for pixmap support)
AC_ARG_WITH(imlib, AC_ARG_WITH(imlib,
[ --with-imlib[=DIR] compile with Imlib support (Imlib residing in DIR/lib) (default)], [ --with-imlib[=DIR] compile with Imlib support (Imlib residing in DIR/lib) (default)], [
if test "$withval" != "no"; then if test "$withval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
if test "$withval" != "yes"; then if test "$withval" != "yes"; then
@ -387,47 +391,47 @@ AC_ARG_WITH(imlib,
AC_WARN(*** is generally a bad idea since it really doesn't save ***) AC_WARN(*** is generally a bad idea since it really doesn't save ***)
AC_WARN(*** much memory. And the developers almost never test that ***) AC_WARN(*** much memory. And the developers almost never test that ***)
AC_WARN(*** configuration. So I'd reconsider if I were you.... ***) AC_WARN(*** configuration. So I'd reconsider if I were you.... ***)
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
USE_IMLIB=1 USE_IMLIB=1
) ])
if test $USE_IMLIB -eq 1 ; then if test $USE_IMLIB -eq 1 ; then
AC_CHECK_LIB(dl, dlopen, GRLIBS="-ldl", , $GRLIBS) AC_CHECK_LIB(dl, dlopen, GRLIBS="-ldl", , $GRLIBS)
AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $GRLIBS) AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $GRLIBS)
AC_CHECK_LIB(Imlib2, imlib_create_image, AC_CHECK_LIB(Imlib2, imlib_create_image, [
GRLIBS="-lImlib2 $GRLIBS" GRLIBS="-lImlib2 $GRLIBS"
AC_DEFINE(HAVE_LIBIMLIB2) AC_DEFINE(HAVE_LIBIMLIB2)
AC_DEFINE(PIXMAP_SUPPORT) AC_DEFINE(PIXMAP_SUPPORT)
AC_DEFINE(BACKING_STORE) AC_DEFINE(BACKING_STORE)
, ], [
AC_WARN(*** Pixmap support has been disabled because Imlib2 was not found ***) AC_WARN(*** Pixmap support has been disabled because Imlib2 was not found ***)
AC_WARN(*** or could not be linked. Eterm should still work, but it will ***) AC_WARN(*** or could not be linked. Eterm should still work, but it will ***)
AC_WARN(*** not be very happy. Check config.log for more detailed ***) AC_WARN(*** not be very happy. Check config.log for more detailed ***)
AC_WARN(*** information on why my attempt to link with Imlib2 failed. ***) AC_WARN(*** information on why my attempt to link with Imlib2 failed. ***)
, $GRLIBS) ], $GRLIBS)
fi fi
AC_MSG_CHECKING(for transparency support) AC_MSG_CHECKING(for transparency support)
AC_ARG_ENABLE(trans, AC_ARG_ENABLE(trans,
[ --enable-trans compile with transparency support], [ --enable-trans compile with transparency support], [
if test "$enableval" != "no"; then if test "$enableval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(PIXMAP_OFFSET) AC_DEFINE(PIXMAP_OFFSET)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(PIXMAP_OFFSET) AC_DEFINE(PIXMAP_OFFSET)
) ])
AC_MSG_CHECKING(for MMX support) AC_MSG_CHECKING(for MMX support)
HAVE_MMX="" HAVE_MMX=""
AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], [
test "x$enableval" = "xyes" && HAVE_MMX="yes" test "x$enableval" = "xyes" && HAVE_MMX="yes"
, ], [
if test x$build_os = xlinux-gnu; then if test x$build_os = xlinux-gnu; then
grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes" grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
fi fi
) ])
if test "x$HAVE_MMX" = "xyes"; then if test "x$HAVE_MMX" = "xyes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MMX) AC_DEFINE(HAVE_MMX)
@ -439,11 +443,15 @@ AM_CONDITIONAL(HAVE_MMX, test "x$HAVE_MMX" = "xyes")
dnl# dnl#
dnl# LibAST dnl# LibAST
dnl# dnl#
AC_CHECK_LIB(ast, libast_malloc, FOUND_LIBAST=1, FOUND_LIBAST=0, $GRLIBS) AC_CHECK_PROG(LIBAST_CONFIG, libast-config, libast-config, false)
if test "$FOUND_LIBAST" -eq "1"; then if test "$LIBAST_CONFIG" = "false"; then
AC_CHECK_PROG(LIBAST_CONFIG, libast-config, libast-config, false) FOUND_LIBAST=0
test "$LIBAST_CONFIG" = "false" && FOUND_LIBAST=0 else
FOUND_LIBAST=1
CPPFLAGS="$CPPFLAGS `$LIBAST_CONFIG --cppflags`"
LDFLAGS="$LDFLAGS `$LIBAST_CONFIG --ldflags`"
fi fi
AC_CHECK_LIB(ast, libast_malloc, FOUND_LIBAST=1, FOUND_LIBAST=0, $GRLIBS)
if test "$FOUND_LIBAST" -ne "1"; then if test "$FOUND_LIBAST" -ne "1"; then
echo "ERROR: You need the LibAST package to build Eterm. If you already have it,"; echo "ERROR: You need the LibAST package to build Eterm. If you already have it,";
@ -476,8 +484,6 @@ if test "$FOUND_LIBAST" -eq "1"; then
GRLIBS="-last $GRLIBS" GRLIBS="-last $GRLIBS"
AC_DEFINE(HAVE_LIBAST) AC_DEFINE(HAVE_LIBAST)
test "$prefix" = "NONE" && prefix="`$LIBAST_CONFIG --prefix`" test "$prefix" = "NONE" && prefix="`$LIBAST_CONFIG --prefix`"
CPPFLAGS="$CPPFLAGS `$LIBAST_CONFIG --cppflags`"
LDFLAGS="$LDFLAGS `$LIBAST_CONFIG --ldflags`"
SUPPORT_FLAGS="`$LIBAST_CONFIG --support`" SUPPORT_FLAGS="`$LIBAST_CONFIG --support`"
for i in $SUPPORT_FLAGS ; do for i in $SUPPORT_FLAGS ; do
case $i in case $i in
@ -499,7 +505,7 @@ fi
AC_MSG_CHECKING(for utmp support) AC_MSG_CHECKING(for utmp support)
AC_ARG_ENABLE(utmp, AC_ARG_ENABLE(utmp,
[ --enable-utmp compile with utmp support], [ --enable-utmp compile with utmp support], [
if test "$enableval" != "no"; then if test "$enableval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
UTMP=1 UTMP=1
@ -507,31 +513,35 @@ AC_ARG_ENABLE(utmp,
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
UTMP=0 UTMP=0
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(UTMP_SUPPORT) AC_DEFINE(UTMP_SUPPORT)
UTMP=1 UTMP=1
) ])
if test $UTMP -eq 1; then if test $UTMP -eq 1; then
AC_CHECK_LIB(utempter, addToUtmp) AC_CHECK_LIB(utempter, addToUtmp)
fi fi
AC_MSG_CHECKING(for backspace key configuration) AC_MSG_CHECKING(for backspace key configuration)
AC_ARG_WITH(backspace, AC_ARG_WITH(backspace,
[ --with-backspace=KEY force backspace to send KEY (KEY is either \"bs\" for ^H or \"del\" for ^?)], [ --with-backspace=KEY force backspace to send KEY (KEY is either \"bs\" for ^H or \"del\" for ^?)], [
if test "$withval" = "bs"; then if test "$withval" = "bs"; then
AC_MSG_RESULT(forcing Backspace to send Ctrl-H) AC_MSG_RESULT(forcing Backspace to send Ctrl-H)
AC_DEFINE(FORCE_BACKSPACE) AC_DEFINE(FORCE_BACKSPACE)
elif test "$withval" = "del"; then elif test "$withval" = "del"; then
AC_MSG_RESULT(forcing Backspace to send Ctrl-?) AC_MSG_RESULT(forcing Backspace to send Ctrl-?)
AC_DEFINE(FORCE_DELETE) AC_DEFINE(FORCE_DELETE)
elif test "$withval" = "detect" -o "$withval" = "auto"; then
AC_MSG_RESULT(attempt to auto-detect)
else else
AC_MSG_RESULT(default) AC_MSG_RESULT(default)
fi, AC_MSG_RESULT(default) AC_DEFINE(FORCE_BACKSPACE)
) fi], [AC_MSG_RESULT(default)
AC_DEFINE(FORCE_BACKSPACE)
])
AC_MSG_CHECKING(for delete key configuration) AC_MSG_CHECKING(for delete key configuration)
AC_ARG_WITH(delete, AC_ARG_WITH(delete,
[ --with-delete=SETTING force delete to SETTING (\"server\" to use the X server value always, [ --with-delete=SETTING force delete to SETTING (\"server\" to use the X server value always,
\"execute\" to send the old default execute escape sequence, \"execute\" to send the old default execute escape sequence,
or a quoted string to use a specific string)], or a quoted string to use a specific string)], [
if test "$withval" = "server"; then if test "$withval" = "server"; then
AC_MSG_RESULT(X server value) AC_MSG_RESULT(X server value)
AC_DEFINE(NO_DELETE_KEY) AC_DEFINE(NO_DELETE_KEY)
@ -540,17 +550,19 @@ AC_ARG_WITH(delete,
AC_DEFINE(NO_DELETE_KEY) AC_DEFINE(NO_DELETE_KEY)
elif test "$withval" = "execute"; then elif test "$withval" = "execute"; then
AC_MSG_RESULT(send execute sequence) AC_MSG_RESULT(send execute sequence)
elif test "$withval" = "del"; then
AC_MSG_RESULT(send Ctrl-?)
AC_DEFINE_UNQUOTED(KS_DELETE, "\177")
else else
AC_MSG_RESULT(forcing Delete to send "$withval") AC_MSG_RESULT(forcing Delete to send "$withval")
AC_DEFINE_UNQUOTED(KS_DELETE, "$withval") AC_DEFINE_UNQUOTED(KS_DELETE, "$withval")
fi, AC_MSG_RESULT(default) fi], AC_MSG_RESULT(default)
AC_DEFINE_UNQUOTED(KS_DELETE, "\177")
) )
XTERM_HOME="\033\133H" XTERM_HOME="\033\133H"
LINUX_HOME="\033\1331~" LINUX_HOME="\033\1331~"
AC_MSG_CHECKING(for home key configuration) AC_MSG_CHECKING(for home key configuration)
AC_ARG_WITH(home, AC_ARG_WITH(home,
[ --with-home=SEQUENCE specify which sequence to use for the Home key ("xterm", "linux", or "vt102")], [ --with-home=SEQUENCE specify which sequence to use for the Home key ("xterm", "linux", or "vt102")], [
if test "$withval" = "xterm"; then if test "$withval" = "xterm"; then
AC_MSG_RESULT(emulate xterm) AC_MSG_RESULT(emulate xterm)
AC_DEFINE_UNQUOTED(KS_HOME, "$XTERM_HOME") AC_DEFINE_UNQUOTED(KS_HOME, "$XTERM_HOME")
@ -559,13 +571,13 @@ AC_ARG_WITH(home,
AC_DEFINE_UNQUOTED(KS_HOME, "$LINUX_HOME") AC_DEFINE_UNQUOTED(KS_HOME, "$LINUX_HOME")
else else
AC_MSG_RESULT(default vt102) AC_MSG_RESULT(default vt102)
fi, AC_MSG_RESULT(default) fi], AC_MSG_RESULT(default)
) )
XTERM_END="\033\133F" XTERM_END="\033\133F"
LINUX_END="\033\1334~" LINUX_END="\033\1334~"
AC_MSG_CHECKING(for end key configuration) AC_MSG_CHECKING(for end key configuration)
AC_ARG_WITH(end, AC_ARG_WITH(end,
[ --with-end=SEQUENCE specify which sequence to use for the End key ("xterm", "linux", or "vt102")], [ --with-end=SEQUENCE specify which sequence to use for the End key ("xterm", "linux", or "vt102")], [
if test "$withval" = "xterm"; then if test "$withval" = "xterm"; then
AC_MSG_RESULT(emulate xterm) AC_MSG_RESULT(emulate xterm)
AC_DEFINE_UNQUOTED(KS_END, "$XTERM_END") AC_DEFINE_UNQUOTED(KS_END, "$XTERM_END")
@ -574,37 +586,37 @@ AC_ARG_WITH(end,
AC_DEFINE_UNQUOTED(KS_END, "$LINUX_END") AC_DEFINE_UNQUOTED(KS_END, "$LINUX_END")
else else
AC_MSG_RESULT(default vt102) AC_MSG_RESULT(default vt102)
fi, AC_MSG_RESULT(default) fi], AC_MSG_RESULT(default)
) )
AC_MSG_CHECKING(if mousewheel support should be enabled) AC_MSG_CHECKING(if mousewheel support should be enabled)
AC_ARG_WITH(mousewheel, AC_ARG_WITH(mousewheel,
[ --without-mousewheel disable built-in mousewheel support], [ --without-mousewheel disable built-in mousewheel support], [
if test "$withval" = "no"; then if test "$withval" = "no"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(MOUSEWHEEL) AC_DEFINE(MOUSEWHEEL)
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(MOUSEWHEEL) AC_DEFINE(MOUSEWHEEL)
) ])
MULTICHAR_ENCODING="" MULTICHAR_ENCODING=""
AC_MSG_CHECKING(for multi-charset support) AC_MSG_CHECKING(for multi-charset support)
AC_ARG_ENABLE(multi-charset, AC_ARG_ENABLE(multi-charset,
[ --enable-multi-charset compile with multibyte font support], [ --enable-multi-charset compile with multibyte font support], [
if test "$enableval" = "no"; then if test "$enableval" = "no"; then
MULTI_CHARSET_TYPE="" MULTI_CHARSET_TYPE=""
elif test "$enableval" = "yes"; then elif test "$enableval" = "yes"; then
MULTI_CHARSET_TYPE="unicode" MULTI_CHARSET_TYPE="unicode"
else else
MULTI_CHARSET_TYPE="$enableval" MULTI_CHARSET_TYPE="$enableval"
fi, fi], [
if (xlsfonts | grep 10646 >&5 2>&5); then if (xlsfonts | grep 10646 >&5 2>&5); then
MULTI_CHARSET_TYPE="unicode" MULTI_CHARSET_TYPE="unicode"
else else
MULTI_CHARSET_TYPE="" MULTI_CHARSET_TYPE=""
fi fi
) ])
if test "x$MULTI_CHARSET_TYPE" != "x"; then if test "x$MULTI_CHARSET_TYPE" != "x"; then
if test "$MULTI_CHARSET_TYPE" = "kanji"; then if test "$MULTI_CHARSET_TYPE" = "kanji"; then
@ -717,7 +729,7 @@ export MFONT0 MFONT1 MFONT2 MFONT3 MFONT4 MULTICHAR_ENCODING
AC_MSG_CHECKING(for XIM support) AC_MSG_CHECKING(for XIM support)
AC_ARG_ENABLE(xim, AC_ARG_ENABLE(xim,
[ --enable-xim compile with XIM support (default)], [ --enable-xim compile with XIM support (default)], [
if test "$enableval" = "no"; then if test "$enableval" = "no"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
XIM="FALSE" XIM="FALSE"
@ -725,47 +737,49 @@ AC_ARG_ENABLE(xim,
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(USE_XIM) AC_DEFINE(USE_XIM)
XIM="TRUE" XIM="TRUE"
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(USE_XIM) AC_DEFINE(USE_XIM)
XIM="TRUE" XIM="TRUE"
) ])
AC_MSG_CHECKING(for Greek keyboard support) AC_MSG_CHECKING(for Greek keyboard support)
AC_ARG_ENABLE(greek, AC_ARG_ENABLE(greek,
[ --enable-greek compile with support for Greek keyboards], [ --enable-greek compile with support for Greek keyboards], [
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(GREEK_SUPPORT) AC_DEFINE(GREEK_SUPPORT)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no)
) )
CONFIG_BUFF_SIZE=20480 CONFIG_BUFF_SIZE=20480
AC_MSG_CHECKING(for the buffer size of the config file parser) AC_MSG_CHECKING(for the buffer size of the config file parser)
AC_ARG_WITH(config-buffer-size, AC_ARG_WITH(config-buffer-size,
[ --with-config-buffer-size [ --with-config-buffer-size
specifies the size of the buffer Eterm uses for parsing the config file (default is 20 Kb)], specifies the size of the buffer Eterm uses for parsing the config file (default is 20 Kb)], [
if test "$withval" != "yes" -a "$withval" != "no"; then if test "$withval" != "yes" -a "$withval" != "no"; then
CONFIG_BUFF_SIZE=$withval CONFIG_BUFF_SIZE=$withval
fi) fi
])
AC_MSG_RESULT($CONFIG_BUFF_SIZE bytes) AC_MSG_RESULT($CONFIG_BUFF_SIZE bytes)
AC_DEFINE_UNQUOTED(CONFIG_BUFF, $CONFIG_BUFF_SIZE) AC_DEFINE_UNQUOTED(CONFIG_BUFF, $CONFIG_BUFF_SIZE)
AC_ARG_WITH(terminfo, AC_ARG_WITH(terminfo,
[ --without-terminfo do not compile the Eterm terminfo file], [ --without-terminfo do not compile the Eterm terminfo file], [
if test "$withval" = "no"; then if test "$withval" = "no"; then
TIC=true TIC=true
fi) fi
])
AC_ARG_WITH(theme-update, AC_ARG_WITH(theme-update,
[ --with-theme-update existing themes will be forceably removed and new ones installed], [ --with-theme-update existing themes will be forceably removed and new ones installed], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
REMOVE_THEMES=yes REMOVE_THEMES=yes
else else
REMOVE_THEMES=no REMOVE_THEMES=no
fi, REMOVE_THEMES=no fi], [REMOVE_THEMES=no
) ])
AC_SUBST(REMOVE_THEMES) AC_SUBST(REMOVE_THEMES)
dnl# AC_MSG_CHECKING(which threads library to use) dnl# AC_MSG_CHECKING(which threads library to use)
@ -799,12 +813,12 @@ if test "$exec_prefix" = "NONE"; then
fi fi
dnl Stack Tracing toys dnl Stack Tracing toys
AC_ARG_ENABLE(stack-trace, [ --disable-stack-trace disable stack trace on abnormal termination], AC_ARG_ENABLE(stack-trace, [ --disable-stack-trace disable stack trace on abnormal termination], [
if test "$enableval" = "no"; then if test "$enableval" = "no"; then
AC_DEFINE(NO_STACK_TRACE) AC_DEFINE(NO_STACK_TRACE)
NO_STACK_TRACE=1 NO_STACK_TRACE=1
fi fi
) ])
if test "$NO_STACK_TRACE" != "1"; then if test "$NO_STACK_TRACE" != "1"; then
AC_PATH_PROG(DBX, dbx, no) AC_PATH_PROG(DBX, dbx, no)
@ -839,10 +853,11 @@ else
fi fi
dnl# Enable/disable humor dnl# Enable/disable humor
AC_ARG_WITH(sense-of-humor, [ --without-sense-of-humor Specify this if you have no sense of humor], AC_ARG_WITH(sense-of-humor, [ --without-sense-of-humor Specify this if you have no sense of humor], [
if test "$withval" = "no"; then if test "$withval" = "no"; then
HUMOR=none HUMOR=none
fi) fi
])
if test -z "$HUMOR"; then if test -z "$HUMOR"; then
AC_CHECK_LIB(Kenny, life_signs, , [ AC_CHECK_LIB(Kenny, life_signs, , [
@ -886,8 +901,8 @@ basedir=.
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_OUTPUT(Makefile bg/Makefile doc/Makefile utils/Makefile pix/Makefile AC_OUTPUT([Makefile bg/Makefile doc/Makefile utils/Makefile pix/Makefile
src/Makefile themes/Makefile) src/Makefile themes/Makefile])
# Mega evals to make sure all the relative variables get resolved. # Mega evals to make sure all the relative variables get resolved.
BINDIR=`eval eval eval eval echo ${bindir}` BINDIR=`eval eval eval eval echo ${bindir}`

145
configure.in
View File

@ -53,12 +53,12 @@ if test -z "${CFLAGS}"; then
CFLAGS="$CCOPTS" CFLAGS="$CCOPTS"
fi fi
AC_ARG_WITH(cc, [ --with-cc=compiler force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], AC_ARG_WITH(cc, [ --with-cc=compiler force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], [
CC=$withval, CC=$withval,
if test -z "$CC"; then if test -z "$CC"; then
CC=check CC=check
fi fi
) ])
if test "$CC" = "check"; then if test "$CC" = "check"; then
dnl# Check for Pentium compiler dnl# Check for Pentium compiler
@ -108,6 +108,11 @@ fi
AC_PROG_INSTALL AC_PROG_INSTALL
ASFLAGS="$ASFLAGS -I../"
AS=$CC
AC_SUBST(ASFLAGS)
AC_SUBST(AS)
dnl# Check for host system type dnl# Check for host system type
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -196,7 +201,7 @@ dnl# Utility stuff
dnl# dnl#
dnl# Did they want debugging? dnl# Did they want debugging?
AC_MSG_CHECKING(for debugging level) AC_MSG_CHECKING(for debugging level)
AC_ARG_WITH(debugging, [ --with-debugging[=num] enable debugging output, num is an integer 0-9], AC_ARG_WITH(debugging, [ --with-debugging[=num] enable debugging output, num is an integer 0-9], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
withval=4 withval=4
else else
@ -208,9 +213,9 @@ AC_ARG_WITH(debugging, [ --with-debugging[=num] enable debugging output, num i
else else
echo "no debugging" echo "no debugging"
AC_DEFINE_UNQUOTED(DEBUG, 0) AC_DEFINE_UNQUOTED(DEBUG, 0)
fi, echo "4" fi], [echo "4"
AC_DEFINE_UNQUOTED(DEBUG, 4) AC_DEFINE_UNQUOTED(DEBUG, 4)
) ])
AC_CHECK_FUNC(ptsname, AC_CHECK_FUNC(ptsname,
HAVE_PTSNAME=yes HAVE_PTSNAME=yes
@ -243,7 +248,7 @@ else
fi fi
AC_MSG_CHECKING(for pty group) AC_MSG_CHECKING(for pty group)
AC_ARG_WITH(pty-group, AC_ARG_WITH(pty-group,
[ --with-pty-group[=gid] specify the group that should own pty files], [ --with-pty-group[=gid] specify the group that should own pty files], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'` PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'`
if test ! -z "$PTY_GRP_NAME"; then if test ! -z "$PTY_GRP_NAME"; then
@ -258,7 +263,7 @@ AC_ARG_WITH(pty-group,
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
AC_DEFINE_UNQUOTED(PTY_GRP_NAME, "$withval") AC_DEFINE_UNQUOTED(PTY_GRP_NAME, "$withval")
fi fi
, ], [
PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'` PTY_GRP_NAME=`ls -1l /dev/pty* 2>/dev/null | head -n 1 | awk '{print $4}'`
if test ! -z "$PTY_GRP_NAME"; then if test ! -z "$PTY_GRP_NAME"; then
AC_MSG_RESULT($PTY_GRP_NAME) AC_MSG_RESULT($PTY_GRP_NAME)
@ -266,9 +271,9 @@ AC_ARG_WITH(pty-group,
else else
AC_MSG_RESULT(none) AC_MSG_RESULT(none)
fi fi
) ])
AC_MSG_CHECKING(for saved uids) AC_MSG_CHECKING(for saved uids)
AC_ARG_WITH(saved-uids, [ --with(out)-saved-uids specify that your OS has (does not have) saved uids, default is to guess], AC_ARG_WITH(saved-uids, [ --with(out)-saved-uids specify that your OS has (does not have) saved uids, default is to guess], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
AC_MSG_RESULT(user specified yes) AC_MSG_RESULT(user specified yes)
HAVE_SAVED_UIDS=1 HAVE_SAVED_UIDS=1
@ -276,7 +281,7 @@ AC_ARG_WITH(saved-uids, [ --with(out)-saved-uids specify that your OS has (doe
AC_MSG_RESULT(user specified no) AC_MSG_RESULT(user specified no)
HAVE_SAVED_UIDS=0 HAVE_SAVED_UIDS=0
fi fi
) ])
if test "x$HAVE_SAVED_UIDS" = "x"; then if test "x$HAVE_SAVED_UIDS" = "x"; then
case `uname -s` in case `uname -s` in
Linux | linux | GNU*Linux) HAVE_SAVED_UIDS=1 ;; Linux | linux | GNU*Linux) HAVE_SAVED_UIDS=1 ;;
@ -332,44 +337,45 @@ dnl# FEATURES
dnl# dnl#
AC_MSG_CHECKING(if Pablo support is wanted) AC_MSG_CHECKING(if Pablo support is wanted)
AC_ARG_WITH(pablo, AC_ARG_WITH(pablo,
[ --with-pablo[=DIR] compile with Pablo I/O Tracing support (using Pablo prefix DIR)], [ --with-pablo[=DIR] compile with Pablo I/O Tracing support (using Pablo prefix DIR)], [
if test "$withval" != "no"; then if test "$withval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
if test "$withval" != "yes"; then if test "$withval" != "yes"; then
CPPFLAGS="$CPPFLAGS -I${withval}/include" CPPFLAGS="$CPPFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib" LDFLAGS="$LDFLAGS -L${withval}/lib"
fi fi
AC_CHECK_HEADER(IOTrace.h, AC_CHECK_HEADER(IOTrace.h, [
AC_CHECK_LIB(PabloTraceExt, initIOTrace, AC_CHECK_LIB(PabloTraceExt, initIOTrace, [
AC_DEFINE(IOTRACE) AC_DEFINE(IOTRACE)
LIBS="$LIBS -lPabloTraceExt -lPabloTrace" LIBS="$LIBS -lPabloTraceExt -lPabloTrace"
echo "Pablo support enabled. Headers in ${withval}/include. Libraries in ${withval}/lib." echo "Pablo support enabled. Headers in ${withval}/include. Libraries in ${withval}/lib."
, ], [
echo "*** ERROR: Pablo support was requested but the Pablo libraries could not be" echo "*** ERROR: Pablo support was requested but the Pablo libraries could not be"
echo "*** found. Please check config.log for further information." echo "*** found. Please check config.log for further information."
echo "*** Pablo support will NOT be included." echo "*** Pablo support will NOT be included."
, -lPabloTrace) ], -lPabloTrace)
, ], [
echo "*** ERROR: Pablo support was requested but the Pablo header files could not be" echo "*** ERROR: Pablo support was requested but the Pablo header files could not be"
echo "*** found. Please check the value you passed to --with-pablo." echo "*** found. Please check the value you passed to --with-pablo."
echo "*** Pablo support will NOT be included.") echo "*** Pablo support will NOT be included."
])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no)
) )
AC_MSG_CHECKING(if profiling macros should be included) AC_MSG_CHECKING(if profiling macros should be included)
AC_ARG_ENABLE(profile, AC_ARG_ENABLE(profile,
[ --enable-profile compile with code profiling macros enabled], [ --enable-profile compile with code profiling macros enabled], [
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(ENABLE_PROFILE) AC_DEFINE(ENABLE_PROFILE)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no)
) )
AC_MSG_CHECKING(for pixmap support) AC_MSG_CHECKING(for pixmap support)
AC_ARG_WITH(imlib, AC_ARG_WITH(imlib,
[ --with-imlib[=DIR] compile with Imlib support (Imlib residing in DIR/lib) (default)], [ --with-imlib[=DIR] compile with Imlib support (Imlib residing in DIR/lib) (default)], [
if test "$withval" != "no"; then if test "$withval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
if test "$withval" != "yes"; then if test "$withval" != "yes"; then
@ -385,47 +391,47 @@ AC_ARG_WITH(imlib,
AC_WARN(*** is generally a bad idea since it really doesn't save ***) AC_WARN(*** is generally a bad idea since it really doesn't save ***)
AC_WARN(*** much memory. And the developers almost never test that ***) AC_WARN(*** much memory. And the developers almost never test that ***)
AC_WARN(*** configuration. So I'd reconsider if I were you.... ***) AC_WARN(*** configuration. So I'd reconsider if I were you.... ***)
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
USE_IMLIB=1 USE_IMLIB=1
) ])
if test $USE_IMLIB -eq 1 ; then if test $USE_IMLIB -eq 1 ; then
AC_CHECK_LIB(dl, dlopen, GRLIBS="-ldl", , $GRLIBS) AC_CHECK_LIB(dl, dlopen, GRLIBS="-ldl", , $GRLIBS)
AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $GRLIBS) AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $GRLIBS)
AC_CHECK_LIB(Imlib2, imlib_create_image, AC_CHECK_LIB(Imlib2, imlib_create_image, [
GRLIBS="-lImlib2 $GRLIBS" GRLIBS="-lImlib2 $GRLIBS"
AC_DEFINE(HAVE_LIBIMLIB2) AC_DEFINE(HAVE_LIBIMLIB2)
AC_DEFINE(PIXMAP_SUPPORT) AC_DEFINE(PIXMAP_SUPPORT)
AC_DEFINE(BACKING_STORE) AC_DEFINE(BACKING_STORE)
, ], [
AC_WARN(*** Pixmap support has been disabled because Imlib2 was not found ***) AC_WARN(*** Pixmap support has been disabled because Imlib2 was not found ***)
AC_WARN(*** or could not be linked. Eterm should still work, but it will ***) AC_WARN(*** or could not be linked. Eterm should still work, but it will ***)
AC_WARN(*** not be very happy. Check config.log for more detailed ***) AC_WARN(*** not be very happy. Check config.log for more detailed ***)
AC_WARN(*** information on why my attempt to link with Imlib2 failed. ***) AC_WARN(*** information on why my attempt to link with Imlib2 failed. ***)
, $GRLIBS) ], $GRLIBS)
fi fi
AC_MSG_CHECKING(for transparency support) AC_MSG_CHECKING(for transparency support)
AC_ARG_ENABLE(trans, AC_ARG_ENABLE(trans,
[ --enable-trans compile with transparency support], [ --enable-trans compile with transparency support], [
if test "$enableval" != "no"; then if test "$enableval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(PIXMAP_OFFSET) AC_DEFINE(PIXMAP_OFFSET)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(PIXMAP_OFFSET) AC_DEFINE(PIXMAP_OFFSET)
) ])
AC_MSG_CHECKING(for MMX support) AC_MSG_CHECKING(for MMX support)
HAVE_MMX="" HAVE_MMX=""
AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], [
test "x$enableval" = "xyes" && HAVE_MMX="yes" test "x$enableval" = "xyes" && HAVE_MMX="yes"
, ], [
if test x$build_os = xlinux-gnu; then if test x$build_os = xlinux-gnu; then
grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes" grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
fi fi
) ])
if test "x$HAVE_MMX" = "xyes"; then if test "x$HAVE_MMX" = "xyes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MMX) AC_DEFINE(HAVE_MMX)
@ -499,7 +505,7 @@ fi
AC_MSG_CHECKING(for utmp support) AC_MSG_CHECKING(for utmp support)
AC_ARG_ENABLE(utmp, AC_ARG_ENABLE(utmp,
[ --enable-utmp compile with utmp support], [ --enable-utmp compile with utmp support], [
if test "$enableval" != "no"; then if test "$enableval" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
UTMP=1 UTMP=1
@ -507,16 +513,16 @@ AC_ARG_ENABLE(utmp,
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
UTMP=0 UTMP=0
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(UTMP_SUPPORT) AC_DEFINE(UTMP_SUPPORT)
UTMP=1 UTMP=1
) ])
if test $UTMP -eq 1; then if test $UTMP -eq 1; then
AC_CHECK_LIB(utempter, addToUtmp) AC_CHECK_LIB(utempter, addToUtmp)
fi fi
AC_MSG_CHECKING(for backspace key configuration) AC_MSG_CHECKING(for backspace key configuration)
AC_ARG_WITH(backspace, AC_ARG_WITH(backspace,
[ --with-backspace=KEY force backspace to send KEY (KEY is either \"bs\" for ^H or \"del\" for ^?)], [ --with-backspace=KEY force backspace to send KEY (KEY is either \"bs\" for ^H or \"del\" for ^?)], [
if test "$withval" = "bs"; then if test "$withval" = "bs"; then
AC_MSG_RESULT(forcing Backspace to send Ctrl-H) AC_MSG_RESULT(forcing Backspace to send Ctrl-H)
AC_DEFINE(FORCE_BACKSPACE) AC_DEFINE(FORCE_BACKSPACE)
@ -528,14 +534,14 @@ AC_ARG_WITH(backspace,
else else
AC_MSG_RESULT(default) AC_MSG_RESULT(default)
AC_DEFINE(FORCE_BACKSPACE) AC_DEFINE(FORCE_BACKSPACE)
fi, AC_MSG_RESULT(default) fi], [AC_MSG_RESULT(default)
AC_DEFINE(FORCE_BACKSPACE) AC_DEFINE(FORCE_BACKSPACE)
) ])
AC_MSG_CHECKING(for delete key configuration) AC_MSG_CHECKING(for delete key configuration)
AC_ARG_WITH(delete, AC_ARG_WITH(delete,
[ --with-delete=SETTING force delete to SETTING (\"server\" to use the X server value always, [ --with-delete=SETTING force delete to SETTING (\"server\" to use the X server value always,
\"execute\" to send the old default execute escape sequence, \"execute\" to send the old default execute escape sequence,
or a quoted string to use a specific string)], or a quoted string to use a specific string)], [
if test "$withval" = "server"; then if test "$withval" = "server"; then
AC_MSG_RESULT(X server value) AC_MSG_RESULT(X server value)
AC_DEFINE(NO_DELETE_KEY) AC_DEFINE(NO_DELETE_KEY)
@ -550,13 +556,13 @@ AC_ARG_WITH(delete,
else else
AC_MSG_RESULT(forcing Delete to send "$withval") AC_MSG_RESULT(forcing Delete to send "$withval")
AC_DEFINE_UNQUOTED(KS_DELETE, "$withval") AC_DEFINE_UNQUOTED(KS_DELETE, "$withval")
fi, AC_MSG_RESULT(default) fi], AC_MSG_RESULT(default)
) )
XTERM_HOME="\033\133H" XTERM_HOME="\033\133H"
LINUX_HOME="\033\1331~" LINUX_HOME="\033\1331~"
AC_MSG_CHECKING(for home key configuration) AC_MSG_CHECKING(for home key configuration)
AC_ARG_WITH(home, AC_ARG_WITH(home,
[ --with-home=SEQUENCE specify which sequence to use for the Home key ("xterm", "linux", or "vt102")], [ --with-home=SEQUENCE specify which sequence to use for the Home key ("xterm", "linux", or "vt102")], [
if test "$withval" = "xterm"; then if test "$withval" = "xterm"; then
AC_MSG_RESULT(emulate xterm) AC_MSG_RESULT(emulate xterm)
AC_DEFINE_UNQUOTED(KS_HOME, "$XTERM_HOME") AC_DEFINE_UNQUOTED(KS_HOME, "$XTERM_HOME")
@ -565,13 +571,13 @@ AC_ARG_WITH(home,
AC_DEFINE_UNQUOTED(KS_HOME, "$LINUX_HOME") AC_DEFINE_UNQUOTED(KS_HOME, "$LINUX_HOME")
else else
AC_MSG_RESULT(default vt102) AC_MSG_RESULT(default vt102)
fi, AC_MSG_RESULT(default) fi], AC_MSG_RESULT(default)
) )
XTERM_END="\033\133F" XTERM_END="\033\133F"
LINUX_END="\033\1334~" LINUX_END="\033\1334~"
AC_MSG_CHECKING(for end key configuration) AC_MSG_CHECKING(for end key configuration)
AC_ARG_WITH(end, AC_ARG_WITH(end,
[ --with-end=SEQUENCE specify which sequence to use for the End key ("xterm", "linux", or "vt102")], [ --with-end=SEQUENCE specify which sequence to use for the End key ("xterm", "linux", or "vt102")], [
if test "$withval" = "xterm"; then if test "$withval" = "xterm"; then
AC_MSG_RESULT(emulate xterm) AC_MSG_RESULT(emulate xterm)
AC_DEFINE_UNQUOTED(KS_END, "$XTERM_END") AC_DEFINE_UNQUOTED(KS_END, "$XTERM_END")
@ -580,37 +586,37 @@ AC_ARG_WITH(end,
AC_DEFINE_UNQUOTED(KS_END, "$LINUX_END") AC_DEFINE_UNQUOTED(KS_END, "$LINUX_END")
else else
AC_MSG_RESULT(default vt102) AC_MSG_RESULT(default vt102)
fi, AC_MSG_RESULT(default) fi], AC_MSG_RESULT(default)
) )
AC_MSG_CHECKING(if mousewheel support should be enabled) AC_MSG_CHECKING(if mousewheel support should be enabled)
AC_ARG_WITH(mousewheel, AC_ARG_WITH(mousewheel,
[ --without-mousewheel disable built-in mousewheel support], [ --without-mousewheel disable built-in mousewheel support], [
if test "$withval" = "no"; then if test "$withval" = "no"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(MOUSEWHEEL) AC_DEFINE(MOUSEWHEEL)
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(MOUSEWHEEL) AC_DEFINE(MOUSEWHEEL)
) ])
MULTICHAR_ENCODING="" MULTICHAR_ENCODING=""
AC_MSG_CHECKING(for multi-charset support) AC_MSG_CHECKING(for multi-charset support)
AC_ARG_ENABLE(multi-charset, AC_ARG_ENABLE(multi-charset,
[ --enable-multi-charset compile with multibyte font support], [ --enable-multi-charset compile with multibyte font support], [
if test "$enableval" = "no"; then if test "$enableval" = "no"; then
MULTI_CHARSET_TYPE="" MULTI_CHARSET_TYPE=""
elif test "$enableval" = "yes"; then elif test "$enableval" = "yes"; then
MULTI_CHARSET_TYPE="unicode" MULTI_CHARSET_TYPE="unicode"
else else
MULTI_CHARSET_TYPE="$enableval" MULTI_CHARSET_TYPE="$enableval"
fi, fi], [
if (xlsfonts | grep 10646 >&5 2>&5); then if (xlsfonts | grep 10646 >&5 2>&5); then
MULTI_CHARSET_TYPE="unicode" MULTI_CHARSET_TYPE="unicode"
else else
MULTI_CHARSET_TYPE="" MULTI_CHARSET_TYPE=""
fi fi
) ])
if test "x$MULTI_CHARSET_TYPE" != "x"; then if test "x$MULTI_CHARSET_TYPE" != "x"; then
if test "$MULTI_CHARSET_TYPE" = "kanji"; then if test "$MULTI_CHARSET_TYPE" = "kanji"; then
@ -723,7 +729,7 @@ export MFONT0 MFONT1 MFONT2 MFONT3 MFONT4 MULTICHAR_ENCODING
AC_MSG_CHECKING(for XIM support) AC_MSG_CHECKING(for XIM support)
AC_ARG_ENABLE(xim, AC_ARG_ENABLE(xim,
[ --enable-xim compile with XIM support (default)], [ --enable-xim compile with XIM support (default)], [
if test "$enableval" = "no"; then if test "$enableval" = "no"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
XIM="FALSE" XIM="FALSE"
@ -731,47 +737,49 @@ AC_ARG_ENABLE(xim,
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(USE_XIM) AC_DEFINE(USE_XIM)
XIM="TRUE" XIM="TRUE"
fi, AC_MSG_RESULT(yes) fi], [AC_MSG_RESULT(yes)
AC_DEFINE(USE_XIM) AC_DEFINE(USE_XIM)
XIM="TRUE" XIM="TRUE"
) ])
AC_MSG_CHECKING(for Greek keyboard support) AC_MSG_CHECKING(for Greek keyboard support)
AC_ARG_ENABLE(greek, AC_ARG_ENABLE(greek,
[ --enable-greek compile with support for Greek keyboards], [ --enable-greek compile with support for Greek keyboards], [
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(GREEK_SUPPORT) AC_DEFINE(GREEK_SUPPORT)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi, AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no)
) )
CONFIG_BUFF_SIZE=20480 CONFIG_BUFF_SIZE=20480
AC_MSG_CHECKING(for the buffer size of the config file parser) AC_MSG_CHECKING(for the buffer size of the config file parser)
AC_ARG_WITH(config-buffer-size, AC_ARG_WITH(config-buffer-size,
[ --with-config-buffer-size [ --with-config-buffer-size
specifies the size of the buffer Eterm uses for parsing the config file (default is 20 Kb)], specifies the size of the buffer Eterm uses for parsing the config file (default is 20 Kb)], [
if test "$withval" != "yes" -a "$withval" != "no"; then if test "$withval" != "yes" -a "$withval" != "no"; then
CONFIG_BUFF_SIZE=$withval CONFIG_BUFF_SIZE=$withval
fi) fi
])
AC_MSG_RESULT($CONFIG_BUFF_SIZE bytes) AC_MSG_RESULT($CONFIG_BUFF_SIZE bytes)
AC_DEFINE_UNQUOTED(CONFIG_BUFF, $CONFIG_BUFF_SIZE) AC_DEFINE_UNQUOTED(CONFIG_BUFF, $CONFIG_BUFF_SIZE)
AC_ARG_WITH(terminfo, AC_ARG_WITH(terminfo,
[ --without-terminfo do not compile the Eterm terminfo file], [ --without-terminfo do not compile the Eterm terminfo file], [
if test "$withval" = "no"; then if test "$withval" = "no"; then
TIC=true TIC=true
fi) fi
])
AC_ARG_WITH(theme-update, AC_ARG_WITH(theme-update,
[ --with-theme-update existing themes will be forceably removed and new ones installed], [ --with-theme-update existing themes will be forceably removed and new ones installed], [
if test "$withval" = "yes"; then if test "$withval" = "yes"; then
REMOVE_THEMES=yes REMOVE_THEMES=yes
else else
REMOVE_THEMES=no REMOVE_THEMES=no
fi, REMOVE_THEMES=no fi], [REMOVE_THEMES=no
) ])
AC_SUBST(REMOVE_THEMES) AC_SUBST(REMOVE_THEMES)
dnl# AC_MSG_CHECKING(which threads library to use) dnl# AC_MSG_CHECKING(which threads library to use)
@ -805,12 +813,12 @@ if test "$exec_prefix" = "NONE"; then
fi fi
dnl Stack Tracing toys dnl Stack Tracing toys
AC_ARG_ENABLE(stack-trace, [ --disable-stack-trace disable stack trace on abnormal termination], AC_ARG_ENABLE(stack-trace, [ --disable-stack-trace disable stack trace on abnormal termination], [
if test "$enableval" = "no"; then if test "$enableval" = "no"; then
AC_DEFINE(NO_STACK_TRACE) AC_DEFINE(NO_STACK_TRACE)
NO_STACK_TRACE=1 NO_STACK_TRACE=1
fi fi
) ])
if test "$NO_STACK_TRACE" != "1"; then if test "$NO_STACK_TRACE" != "1"; then
AC_PATH_PROG(DBX, dbx, no) AC_PATH_PROG(DBX, dbx, no)
@ -845,10 +853,11 @@ else
fi fi
dnl# Enable/disable humor dnl# Enable/disable humor
AC_ARG_WITH(sense-of-humor, [ --without-sense-of-humor Specify this if you have no sense of humor], AC_ARG_WITH(sense-of-humor, [ --without-sense-of-humor Specify this if you have no sense of humor], [
if test "$withval" = "no"; then if test "$withval" = "no"; then
HUMOR=none HUMOR=none
fi) fi
])
if test -z "$HUMOR"; then if test -z "$HUMOR"; then
AC_CHECK_LIB(Kenny, life_signs, , [ AC_CHECK_LIB(Kenny, life_signs, , [
@ -892,8 +901,8 @@ basedir=.
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_OUTPUT(Makefile bg/Makefile doc/Makefile utils/Makefile pix/Makefile AC_OUTPUT([Makefile bg/Makefile doc/Makefile utils/Makefile pix/Makefile
src/Makefile themes/Makefile) src/Makefile themes/Makefile])
# Mega evals to make sure all the relative variables get resolved. # Mega evals to make sure all the relative variables get resolved.
BINDIR=`eval eval eval eval echo ${bindir}` BINDIR=`eval eval eval eval echo ${bindir}`