stuff
git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@303 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
parent
c38b91b557
commit
cda1f84bcc
|
@ -14,6 +14,7 @@ AC_PROG_YACC
|
||||||
case "$(uname -s)" in
|
case "$(uname -s)" in
|
||||||
Linux | *BSD)
|
Linux | *BSD)
|
||||||
LIBS="$LIBS -lutil -lcrypt"
|
LIBS="$LIBS -lutil -lcrypt"
|
||||||
|
AC_DEFINE(NOSTREAMS, 1, [Use SVR4 streams support in ttyrec.])
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
@ -29,10 +30,11 @@ AC_ARG_ENABLE(enable-virus,
|
||||||
[AC_SUBST(EDITOR, virus.c)], [AC_SUBST(EDITOR, ee.c)])
|
[AC_SUBST(EDITOR, virus.c)], [AC_SUBST(EDITOR, ee.c)])
|
||||||
|
|
||||||
AC_ARG_WITH(config-file,
|
AC_ARG_WITH(config-file,
|
||||||
[AS_HELP_STRING([--with-config-file=PATH], [Define the path to the default configuration file.])]
|
[AS_HELP_STRING([--with-config-file=PATH], [Define the path to the default configuration file.])],
|
||||||
[configfile=$withval], [configfile=/etc/dgamelaunch.conf])
|
[configfile=$withval], [configfile="/etc/dgamelaunch.conf"])
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED(DEFCONFIG, "$configfile", [Path to the default config file.])
|
AC_DEFINE_UNQUOTED(DEFCONFIG, "$configfile", [Path to the default config file.])
|
||||||
|
|
||||||
|
AC_CHECK_FUNCS(openpty)
|
||||||
AC_CONFIG_FILES(Makefile)
|
AC_CONFIG_FILES(Makefile)
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -129,7 +129,7 @@ mysetenv (const char* name, const char* value, int overwrite)
|
||||||
void
|
void
|
||||||
ttyrec_getpty ()
|
ttyrec_getpty ()
|
||||||
{
|
{
|
||||||
#ifdef USE_OPENPTY
|
#ifdef HAVE_OPENPTY
|
||||||
if (openpty (&master, &slave, NULL, NULL, NULL) == -1)
|
if (openpty (&master, &slave, NULL, NULL, NULL) == -1)
|
||||||
graceful_exit (62);
|
graceful_exit (62);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -7,12 +7,6 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
/* Default - should work everywhere */
|
|
||||||
#if defined(__linux__) || defined(BSD)
|
|
||||||
# define USE_OPENPTY
|
|
||||||
# define NOSTREAMS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARRAY_SIZE
|
#ifndef ARRAY_SIZE
|
||||||
# define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
|
# define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue