Commit fc23133a authored by Vincent Bernat's avatar Vincent Bernat

Imported Upstream version 3.07

parent 54099349
......@@ -3,13 +3,12 @@ Xnee / AUTHORS
Authors:
--------
Henrik Sandklef hesa@gnu.org
Jon-Erling Dahl joda@gadgeteer.nu
Henrik Sandklef hesa@gnu.org (libxnee, cnee, pnee, most of gnee)
Jon-Erling Dahl joda@gadgeteer.nu (parts of gnee)
Contributors (code fixes, comments etc):
Contributors (code fix ideas, comments etc):
---------------------------------------
Janice Waddick
Juan F. Codagnone
Lars Brinkhoff
Ton van Vliet
......@@ -20,3 +19,5 @@ Bianchi Roberto
Thomas Riga
Stuart Guthrie
Volker Stolz
Fabian Keil
Tuukka Pasanen
\ No newline at end of file
This diff is collapsed.
......@@ -140,6 +140,7 @@ FGREP = @FGREP@
FOO_DIR = @FOO_DIR@
GNOME_APPLET_DIR = @GNOME_APPLET_DIR@
GREP = @GREP@
GTKCONF = @GTKCONF@
GUI_DIR = @GUI_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
Changes in coming version 3.06 ('Dio')
Changes in version 3.07
==============================
* New features:
Supports recording xnd replaying of XInput device events
* Forced replaying of X11 core events can be done
* Backward compatible with olde session files
Experimental and undocumented features (read the source):
* replay backend
* xswine - new swinput backend for Xnee
* Build changes:
--enable-man
Checks for makeinfo once, uses result many times
Can build guis and manual without all doc stuff
--disable-xinput2
By default Xnee is built with XI support
Looks for gtk-config when configuring
Checks for makeinfo once, uses result many times
Can build guis and manual without all doc stuff
* Issues
Human printout of X Input events needs more work
Need to make X Input code be totally ifdefed away
* New options:
--force-core-replay,-fcr
Discard recorded X Input device data,
use recorded core device data
--disable-xinput-events
Disable recording of XInput events
* Fixed bugs as reported on ubuntuforums:
http://ubuntuforums.org/showthread.php?t=1253453&highlight=xnee
savannah bug: #30134 "Missing xnee.xpm in gnee"
savannah bug: #30136 "Configure misses to check for gnome.h"
Reported problems on N900 are fixed
* Patches from Tuukka Pasanen, Fabian Keil
Changes in version 3.06 ('Dio')
==============================
* New logo:
......
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
[m4_warning([this file was generated for autoconf 2.65.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......
......@@ -122,6 +122,7 @@ FGREP = @FGREP@
FOO_DIR = @FOO_DIR@
GNOME_APPLET_DIR = @GNOME_APPLET_DIR@
GREP = @GREP@
GTKCONF = @GTKCONF@
GUI_DIR = @GUI_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......
......@@ -3,7 +3,8 @@
*
* Xnee enables recording and replaying of X protocol data
*
* Copyright (C) 1999, 2000, 2001, 2002, 2003 Henrik Sandklef
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* 2010 Henrik Sandklef
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -108,7 +109,11 @@ enum {
CNEE_DEMONSTRATION_OPTION_KEY ,
XNEE_KEYBOARD_OPTION_KEY ,
XNEE_MOUSE_OPTION_KEY ,
CNEE_SYNTAX_CHECKER_KEY
CNEE_SYNTAX_CHECKER_KEY ,
CNEE_GET_XINPUT_EVENT_BASE ,
CNEE_DISABLE_XINPUT_EVENTS ,
CNEE_REPLAY_BACKEND ,
CNEE_FORCE_CORE_REPLAY
} ;
......
......@@ -55,7 +55,20 @@ PEDANTIC_FLAGS =
endif
AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include ${PEDANTIC_FLAGS} ${X_CFLAGS} -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG} ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG}
if XNEE_XINPUT_SUPPORT
XNEE_XINPUT_SUPPORT_FLAGS = -DXNEE_XINPUT_SUPPORT
else
XNEE_XINPUT_SUPPORT_FLAGS =
endif
if XNEE_XINPUT_SUPPORT
XNEE_XINPUT_SUPPORT_FLAGS = -DXNEE_XINPUT_SUPPORT
else
XNEE_XINPUT_SUPPORT_FLAGS =
endif
AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include ${PEDANTIC_FLAGS} ${X_CFLAGS} -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG} ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG} ${XNEE_XINPUT_SUPPORT_FLAGS} ${XNEE_XINPUT_SUPPORT_FLAGS}
cnee_LDADD = -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL}
if BUILD_STATIC
......
......@@ -136,6 +136,7 @@ FGREP = @FGREP@
FOO_DIR = @FOO_DIR@
GNOME_APPLET_DIR = @GNOME_APPLET_DIR@
GREP = @GREP@
GTKCONF = @GTKCONF@
GUI_DIR = @GUI_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -273,7 +274,9 @@ LIBXNEE_DIR = ../../libxnee
@BUF_VERBOSE_TRUE@BUF_VERBOSE_FLAG = -DUSE_BUF_VERBOSE
@PEDANTIC_FALSE@PEDANTIC_FLAGS =
@PEDANTIC_TRUE@PEDANTIC_FLAGS = -W -Wall -pedantic -pedantic-errors -Werror -Wno-format
AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include ${PEDANTIC_FLAGS} ${X_CFLAGS} -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG} ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG}
@XNEE_XINPUT_SUPPORT_FALSE@XNEE_XINPUT_SUPPORT_FLAGS =
@XNEE_XINPUT_SUPPORT_TRUE@XNEE_XINPUT_SUPPORT_FLAGS = -DXNEE_XINPUT_SUPPORT
AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include ${PEDANTIC_FLAGS} ${X_CFLAGS} -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG} ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG} ${XNEE_XINPUT_SUPPORT_FLAGS} ${XNEE_XINPUT_SUPPORT_FLAGS}
cnee_LDADD = -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL}
@BUILD_STATIC_FALSE@STATIC_FLAGS =
@BUILD_STATIC_TRUE@STATIC_FLAGS = -static
......
......@@ -246,6 +246,18 @@ Let Xnee take you on a demonstration ride
.TP
.B "--check-syntax,- cs "
Check syntax of the command line and/or project file (no exec)
.TP
.B "--get-xinput-event-base,- gxeb "
Get the event base for Xinput Extension
.TP
.B "--disable-xinput-events,- dxe "
Disable recording of XInput events
.TP
.B "--replay-backend,- rb "
<backend>
.TP
.B "--force-core-replay,- fcr "
Discard record X Input device data, use recorded core device data
.SH "COMMENTS"
.TP
.B "file_name"
......@@ -287,7 +299,7 @@ This is free software; see the source for copying conditions. There is NO wa
.SH "SEE ALSO"
.BR cnee(info), xnee(info), xev (1)
.SH "VERSION"
xnee man page, version 3.06
xnee man page, version 3.07
.SH "NOTES"
This page describes
.B cnee.
......
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename cnee.info
@set EDITION 3.06
@set VERSION 3.06
@set EDITION 3.07
@set VERSION 3.07
@settitle cnee Manual
@setchapternewpage off
@c %**end o
......@@ -12,7 +12,7 @@
@end ifinfo
cnee (part of the xnee project) can record and replay an X session. cnee also has the ability to distribute events to multiple displays.
Current version of xnee is 3.06
Current version of xnee is 3.07
@menu
* Options:: Options
* Examples:: Examples
......@@ -233,6 +233,18 @@ Let Xnee take you on a demonstration ride
@code{--check-syntax,- cs }
Check syntax of the command line and/or project file (no exec)
@code{--get-xinput-event-base,- gxeb }
Get the event base for Xinput Extension
@code{--disable-xinput-events,- dxe }
Disable recording of XInput events
@code{--replay-backend,- rb }
<backend>
@code{--force-core-replay,- fcr }
Discard record X Input device data, use recorded core device data
file_name
Name of a file (e.g /tmp/my_file.xns)
display_name
......
......@@ -31,7 +31,7 @@
#include "parse.h"
static int
static void
cnee_handle_err(int error)
{
const char *err;
......
......@@ -3,8 +3,9 @@
*
* Xnee enables recording and replaying of X protocol data
*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* 2004, 2005, 2006, 2007 Henrik Sandklef
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* 2004, 2005, 2006, 2007, 2010
* Henrik Sandklef
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -31,6 +32,9 @@
#include "libxnee/xnee_utils.h"
#include "libxnee/xnee_range.h"
#include "libxnee/xnee_session.h"
#ifdef XNEE_XINPUT_SUPPORT
#include "libxnee/xnee_xinput.h"
#endif /* XNEE_XINPUT_SUPPORT */
#include "cnee_fake.h"
......@@ -275,7 +279,48 @@ static xnee_option_t cnee_options_impl[] =
XNEE_GENERAL_OPTION,
XNEE_OPTION_VISIBLE
},
#ifdef XNEE_XINPUT_SUPPORT
{
CNEE_GET_XINPUT_EVENT_BASE,
"get-xinput-event-base",
"gxeb",
NULL,
"Get the event base for Xinput Extension",
XNEE_GENERAL_OPTION,
XNEE_OPTION_VISIBLE
},
{
CNEE_DISABLE_XINPUT_EVENTS,
"disable-xinput-events",
"dxe",
NULL,
"Disable recording of XInput events",
XNEE_RECORD_OPTION,
XNEE_OPTION_VISIBLE
},
#endif /* XNEE_XINPUT_SUPPORT*/
{
CNEE_REPLAY_BACKEND,
"replay-backend",
"rb",
NULL,
"<backend>",
XNEE_REPLAY_OPTION,
XNEE_OPTION_VISIBLE
},
{
CNEE_FORCE_CORE_REPLAY,
"force-core-replay",
"fcr",
NULL,
"Discard record X Input device data, use recorded core device data ",
XNEE_REPLAY_OPTION,
XNEE_OPTION_VISIBLE
},
{
XNEE_LAST_OPTION,
NULL,
......@@ -502,8 +547,54 @@ xnee_parse_cnee_option(xnee_data *xd, char **opt_and_args, int *args_used)
verbose_option("XNEE_MOUSE_OPTION_KEY");
ret=xnee_parse_range (xd, XNEE_DEVICE_EVENT,
"ButtonPress-MotionNotify");
#ifdef XNEE_XINPUT_SUPPORT
if ( ret != XNEE_OK )
{
break;
}
xnee_xinput_request_mouse(xd);
#endif /* XNEE_XINPUT_SUPPORT */
break;
#ifdef XNEE_XINPUT_SUPPORT
case CNEE_GET_XINPUT_EVENT_BASE:
verbose_option("CNEE_GET_XINPUT_EVENT_BASE");
ret=xnee_get_xinput_event_base(NULL);
if ( ret != -1 )
{
fprintf(stdout, "%d\n",ret);
ret = XNEE_OK_LEAVE;
}
else
{
fprintf(stderr,
"Could not find event base for %s\n",
XNEE_XINPUT_EXTENSION_NAME);
ret = XNEE_CLI_ERROR;
}
break;
case CNEE_DISABLE_XINPUT_EVENTS:
verbose_option("CNEE_DISABLE_XINPUT_EVENTS");
xnee_disable_xinput(xd) ;
ret = XNEE_OK;
break;
#endif /* XNEE_XINPUT_SUPPORT */
case CNEE_REPLAY_BACKEND:
verbose_option("CNEE_REPLAY_BACKEND");
xnee_set_replay_backend_name(xd, opt_and_args[1]) ;
*args_used = 1;
ret = XNEE_OK;
break;
#ifdef XNEE_XINPUT_SUPPORT
case CNEE_FORCE_CORE_REPLAY:
verbose_option("CNEE_FORCE_CORE_REPLAY");
xnee_set_forced_core_device_events (xd) ;
*args_used = 0;
ret = XNEE_OK;
break;
#endif /* XNEE_XINPUT_SUPPORT */
default:
ret = XNEE_NO_OPTION_KEY;
......@@ -537,6 +628,7 @@ xnee_parse_args (xnee_data* xd , int argc, char **argv )
{
ret = xnee_parse_cnee_option(xd, &argv[i], &args_used);
if ( ret == XNEE_OK)
{
i = i + args_used ;
......@@ -554,6 +646,10 @@ xnee_parse_args (xnee_data* xd , int argc, char **argv )
{
return XNEE_PROJECT_SYNTAX_ERROR;
}
else if ( ret == XNEE_CLI_ERROR)
{
return XNEE_CLI_ERROR;
}
ret = xnee_parse_cli_option(xd, &argv[i], &args_used);
if ( ret == XNEE_OK )
......@@ -573,7 +669,8 @@ xnee_parse_args (xnee_data* xd , int argc, char **argv )
break;
}
}
if (ret != XNEE_OK)
{
/* if parser(s) have returned -1,
......
......@@ -42,6 +42,9 @@
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
/* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */
#undef HAVE_X11_EXTENSIONS_XINPUT2_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
......
This diff is collapsed.
AC_INIT(Xnee,3.06,bug-xnee@gnu.org)
AC_INIT(Xnee,3.07,bug-xnee@gnu.org)
AC_CONFIG_AUX_DIR(./autotools/)
AM_INIT_AUTOMAKE
AB_INIT
......@@ -16,6 +16,10 @@ AC_CHECK_HEADERS(stdarg.h varargs.h, break)
AC_EXEEXT
AC_PATH_PROG(AWK,awk)
AC_PATH_PROG(BASH,bash,sh)
AC_PATH_PROG(PKGCFG,pkg-config,,)
AC_PATH_PROG(CONVERT,convert,,)
AC_PATH_PROG(MAKEINFO,makeinfo,,)
AC_PATH_PROG(GTKCONF,gtk-config)
#AC_DISABLE_SHARED
AC_PROG_LIBTOOL
......@@ -24,9 +28,11 @@ AC_PROG_LIBTOOL
LIBS="$LIBS $X_LIBS"
AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="")])
AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
AC_CHECK_LIB(c, sem_init, LIBSEMA="CCC", [AC_CHECK_LIB(pthread, sem_init, LIBSEMA="-lpthread")])
AC_CHECK_LIB(Xtst, XTestFakeMotionEvent, LIBXTST="-lXtst",[AC_CHECK_LIB(Xext,XTestFakeMotionEvent , LIBXTST="-lXext")])
AC_CHECK_LIB(Xtst, XIQueryVersion, LIBXI="",[AC_CHECK_LIB(Xi, XIQueryVersion, LIBXI="-lXi")])
AC_CHECK_HEADERS(X11/extensions/XInput2.h, HAS_XI2="true",HAS_XI2="false",)
GENERATION_DIRS=""
......@@ -72,6 +78,14 @@ AC_ARG_ENABLE(doc,
*) AC_MSG_ERROR(bad value ${enableval} for --disable-doc) ;;
esac],[builddoc=false])
AC_ARG_ENABLE(man,
[ --enable-man (re)build Xnee man pages],
[case "${enableval}" in
yes) buildman=true ;;
no) buildman=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-man) ;;
esac],[buildman=false])
AC_ARG_ENABLE(doconly,
[ --enable-doconly build Xnee documentation only],
[case "${enableval}" in
......@@ -80,6 +94,14 @@ AC_ARG_ENABLE(doconly,
*) AC_MSG_ERROR(bad value ${enableval} for --disable-doconly) ;;
esac],[doconly=false])
AC_ARG_ENABLE(xinput2,
[ --enable-xinput2 build Xnee with support for XInput2],
[case "${enableval}" in
yes) use_xi2=true ;;
no) use_xi2=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-xinput2) ;;
esac],[use_xi2=true])
AC_ARG_ENABLE(cli,
[ --enable-cli build Xnee command line tool],
[case "${enableval}" in
......@@ -163,6 +185,7 @@ AC_ARG_ENABLE(paranoid-pedantic,
AM_CONDITIONAL(BUILDDOC, test x$builddoc = xtrue)
AM_CONDITIONAL(BUILDMAN, test x$buildman = xtrue)
AM_CONDITIONAL(VERBOSE, test x$verbose = xtrue)
AM_CONDITIONAL(GCOV, test x$gcov = xtrue)
AM_CONDITIONAL(GPROF, test x$gprof = xtrue)
......@@ -172,6 +195,7 @@ AM_CONDITIONAL(XOSD, test x$xosd = xtrue)
AM_CONDITIONAL(DOCONLY, test x$doconly = xtrue)
AM_CONDITIONAL(BUILD_STATIC, test x$makestatic = xtrue)
AM_CONDITIONAL(NOT_INSTALL_LIBS, test x$buildlib = xfalse)
AM_CONDITIONAL(XNEE_XINPUT_SUPPORT, test x$use_xi2 = xtrue)
if test x$verbose = xtrue ;
then
......@@ -218,11 +242,19 @@ else
fi
if test x$use_xi2 = xtrue;
then
XNEE_XINPUT_SUPPORT_FLAGS=-DXNEE_XINPUT_SUPPORT
else
XNEE_XINPUT_SUPPORT_FLAGS=
fi
dnl Forward some variables to the makefiles
AC_SUBST(LIBDL)
AC_SUBST(LIBSEMA)
X11_LIBS="-lX11 $LIBXTST"
X11_LIBS="-lX11 $LIBXTST $LIBXI"
AC_SUBST(X11_LIBS)
......@@ -290,11 +322,11 @@ help_on_missing_progrs()
if test x$buildgapplet = xtrue || test x$buildgui = xtrue || test x$builddoc = xtrue ;
then
AC_PATH_PROG(CONVERT,convert,,)
check_doc_program "$CONVERT" "convert" "imagemagick"
fi
if test x$buildgapplet = xtrue || test x$buildgui = xtrue ;
then
AC_PATH_PROG(PKGCFG,pkg-config,,)
......@@ -317,10 +349,10 @@ then
fi
fi
if test x$buildgapplet = xtrue || test x$buildgui = xtrue ;
then
AC_ISC_POSIX
AC_PROG_CC
AM_PROG_CC_STDC
......@@ -364,12 +396,47 @@ then
AC_SUBST(libgnomeui_LIBS)
PIXMAP_DIR=pixmap
if test x$buildgapplet = xtrue ;
then
# add_incl "pixmap"
else
echo "Not building applet or gui"
if test x$GTKCONF = x ;
then
echo " **************************************** "
echo " * WARNING, missing program: gtk-config *"
echo " **************************************** "
echo ""
echo " On Debian, install like: libgtk2.0-dev"
echo ""
echo "However, I will try my best to continue without gtk-config. "
echo "Will not be able to check for gtk/gnome header files"
echo ""
else
GTK_PREFIX=`$GTKCONF --prefix`
GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
GNOME_H_FILE=$GTK_INC_PATH/gnome.h
ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
MISSING_GNOME_H=$?
if test x$MISSING_GNOME_H != x0 ;
then
echo "Missing GNOME header file (gnome.h), you need to install development packages"
echo "On a Debian based system do:"
echo ""
echo " sudo apt-get install libgnomeui-dev "
echo ""
exit 1
fi
fi
fi
fi
if test x$buildgui = xtrue ;
then
dnl GETTEXT_PACKAGE=gnee
......@@ -427,6 +494,27 @@ else
fi
check_xinput2()
{
if test x$use_xi2 = xtrue ;
then
if test x$HAS_XI2 = xfalse ;
then
echo "XInput2 not found"
echo "To compile GNU Xnee you have to:"
echo " * Install XInput2 (development package)"
echo "or"
echo " * Disable XInput2 support in GNU Xnee:"
echo " ./configure --disable-xinput2"
echo " "
exit 1
fi
fi
}
check_xinput2
dnl if test x$builddoc = xtrue ;
dnl then
dnl DOC_DIR=doc
......@@ -470,10 +558,12 @@ DOC_NOT_BUILT_WARNING=false
MISSING_PROGRAMS=""
DOC_TARGETS="info txt"
if test x$builddoc = xtrue ;
then
AC_PATH_PROG(DIA,dia,,)
check_doc_program "$DIA" "dia" "dia"
......@@ -486,6 +576,10 @@ then
AC_PATH_PROG(DVIPDF,dvipdf,,)
check_doc_program "$DVIPDF" "dvipdf" "dvipdf"
echo "======================== DVIPDF= $DVIPDF"
AC_PATH_PROG(PDF2PS,pdf2ps,,)
check_doc_program "$PDF2PS" "pdf2ps" ""
......@@ -501,8 +595,7 @@ then
# AC_PATH_PROG(DOXYGEN,doxygen,,)
# check_doc_program "$DOXYGEN" "doxygen" "doxygen"
AC_PATH_PROG(MAKEINFO,makeinfo,,)
check_doc_program "$MAKEINFO" "makeinfo" "texi2html # texinfo for Ubuntu users"
check_doc_program "$MAKEINFO" "makeinfo" "texi2html texinfo"
if test x$DOC_NOT_BUILT_WARNING = xtrue ;
......@@ -531,6 +624,39 @@ then
DOC_TARGETS="images html info txt pdf ps"
CNEE_INFO="cnee.info"
fi
else
if test x$buildman = xtrue;
then
check_doc_program "$MAKEINFO" "makeinfo" "texi2html texinfo "
if test x$DOC_NOT_BUILT_WARNING = xtrue ;
then
echo " "
echo " ********** ERROR **********"
echo " ** Man page(s) and images can not be built ** "
echo " ** "
echo " ** The following programs are missing:"
for i in $MISSING_PROGRAMS
do
echo " ** $i "
done
echo " ** "
help_on_missing_progrs documentation "--disable-doc"
echo " ** "
echo " ********** ERROR **********"
DOC_DIR=""
DOC_TARGETS=""
builddoc=false
doconly=false
CNEE_INFO=""
echo "... configuration failed"
exit 1
else
DOC_TARGETS="info"
CNEE_INFO="cnee.info"
fi
fi
fi
......@@ -680,6 +806,7 @@ echo " GCOV_FLAG $GCOV_FLAG"
echo " GPROF_FLAG $GPROF_FLAG"
echo " BUF_VERBOSE_FLAG $BUF_VERBOSE_FLAG"
echo " PEDANTIC_FLAGS $PEDANTIC_FLAGS"
echo " XNEE_XINPUT_SUPPORT_FLAGS $XNEE_XINPUT_SUPPORT_FLAGS"
echo " LIBDL $LIBDL"
echo " LIBSEMA $LIBSEMA"
echo " X11_LIBS $X11_LIBS"
......@@ -701,12 +828,13 @@ then
show_doc_program "$CONVERT" "convert" "Can't convert image formats"
show_doc_program "$TEXI2HTML" "texi2html" "can not generate html pages"
# show_doc_program "$DVI2PS" "dvi2ps" "can not generate ps "
show_doc_program "$DVPDF" "dvipdf" "can not generate pdf from dvi "
show_doc_program "$DVIPDF" "dvipdf" "can not generate pdf from dvi "
show_doc_program "$PS2PDF" "ps2pdf" "can not generate pdf"
show_doc_program "$EPSTOPDF" "epstopdf" "can not generate pdf"
show_doc_program "$CONVERT" "convert" "can not generate convert between formats"
show_doc_program "$MAKEINFO" "makeinfo" "can not make info pages"
show_doc_program "$PKGCFG" "pkg-config" "can not get meta info from installed packages"
show_doc_program "$GTKCONF" "gtk-config" "can not check for header files..."
fi
echo ""
echo " Building the following components "
......@@ -730,6 +858,15 @@ then
else
echo " static"
fi
echo ""
echo " Support for XInput2"
echo " -------------------------------------"
if test "x$XNEE_XINPUT_SUPPORT_FLAGS" = "x" ;
then
echo " disabled"
else
echo " enabled"
fi
echo " "
echo " Settings ok?"
echo " -------------------------------------"
......@@ -746,3 +883,4 @@ echo " make"
echo " and (perhaps as root)"
echo " make install"
echo " "
......@@ -16,6 +16,7 @@ EXTRA_DIST = xnee_copying fdl.texi *.dia xnee.dox xnee.html xnee.pdf xnee.ps xne
#\
# $(MANUALS)
if BUILDDOC
DOC_DEP=$(GEN_IMAGES_TO_INSTALL) $(MANUALS)
doc_DATA = $(MANUALS) $(GEN_IMAGES_TO_INSTALL)
......@@ -113,10 +114,15 @@ ${IMG_PDF}: ${IMG_EPS}
${IMG_PNG}: ${IMG_EPS}
${IMG_JPG}: ${IMG_EPS}
if BUILDDOC
install:
mkdir -p $(DESTDIR)/$(docdir)
cp $(MANUALS) $(GEN_IMAGES_TO_INSTALL) $(DESTDIR)$(docdir)/
else
install:
echo not installing docs
endif
api-doc: xnee.dox
......
......@@ -119,6 +119,7 @@ FGREP = @FGREP@
FOO_DIR = @FOO_DIR@
GNOME_APPLET_DIR = @GNOME_APPLET_DIR@
GREP = @GREP@
GTKCONF = @GTKCONF@
GUI_DIR = @GUI_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -782,9 +783,11 @@ ${IMG_PDF}: ${IMG_EPS}
${IMG_PNG}: ${IMG_EPS}
${IMG_JPG}: ${IMG_EPS}