Skip to content

N
nx-libs
Commit 76b48676 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

nxcompshad: Switch to autoreconf.

parent 622360ea
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 832 deletions
Makefile
View file @ 76b48676
......@@ -78,7 +78,7 @@ build-full:
# nxcomp{ext,shad}.
cd nx-X11/lib && make
cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE}
cd nxcompshad && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
./mesa-quilt push -a
......
debian/copyright
View file @ 76b48676
......@@ -80,25 +80,25 @@ Files: nx-X11/extras/Mesa/src/mesa/main/WSDrawBuffer.h
nx-X11/programs/Xserver/hw/nxagent/compext/Rle.h
nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
nx-X11/programs/Xserver/hw/nxagent/compext/Z.h
nxcompshad/Core.cpp
nxcompshad/Core.h
nxcompshad/Input.cpp
nxcompshad/Input.h
nxcompshad/Logger.cpp
nxcompshad/Logger.h
nxcompshad/Manager.cpp
nxcompshad/Manager.h
nxcompshad/Misc.h
nxcompshad/Poller.h
nxcompshad/Regions.h
nxcompshad/Shadow.cpp
nxcompshad/Shadow.h
nxcompshad/Updater.cpp
nxcompshad/Updater.h
nxcompshad/Win.cpp
nxcompshad/Win.h
nxcompshad/X11.cpp
nxcompshad/X11.h
nxcompshad/include/Shadow.h
nxcompshad/src/Core.cpp
nxcompshad/src/Core.h
nxcompshad/src/Input.cpp
nxcompshad/src/Input.h
nxcompshad/src/Logger.cpp
nxcompshad/src/Logger.h
nxcompshad/src/Manager.cpp
nxcompshad/src/Manager.h
nxcompshad/src/Misc.h
nxcompshad/src/Poller.h
nxcompshad/src/Regions.h
nxcompshad/src/Shadow.cpp
nxcompshad/src/Updater.cpp
nxcompshad/src/Updater.h
nxcompshad/src/Win.cpp
nxcompshad/src/Win.h
nxcompshad/src/X11.cpp
nxcompshad/src/X11.h
Copyright: 2001, 2011, NoMachine (http://www.nomachine.com)
2008-2014, Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
2011-2016, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
......@@ -1001,7 +1001,7 @@ Files: nx-X11/include/XWDFile.h
nx-X11/programs/Xserver/record/record.c
nx-X11/programs/Xserver/record/set.c
nx-X11/programs/Xserver/record/set.h
nxcompshad/X11/include/XTest_nxcompshad.h
nxcompshad/src/X11/include/XTest_nxcompshad.h
Copyright: 1985, 1987, 1990, 1998, The Open Group
1985, 1987, 1994, 1998, The Open Group
1985, 1987, 1998, The Open Group
......@@ -1452,7 +1452,7 @@ Files: nx-X11/include/extensions/composite.h
nx-X11/programs/Xserver/xfixes/xfixes.h
nx-X11/programs/Xserver/xfixes/xfixesint.h
nx-X11/programs/Xserver/Xext/shmint.h
nxcompshad/X11/include/Xdamage_nxcompshad.h
nxcompshad/src/X11/include/Xdamage_nxcompshad.h
Copyright: 1998, Keith Packard
1999, Keith Packard
2002, Keith Packard
......@@ -2310,7 +2310,7 @@ Copyright: 2000, Compaq Computer Corporation
License: MIT~X11
Files: nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
nxcompshad/X11/include/Xrandr_nxcompshad.h
nxcompshad/src/X11/include/Xrandr_nxcompshad.h
Copyright: 2000, Compaq Computer Corporation, Inc
2002, Hewlett-Packard Company, Inc
2006, Intel Corporation
......@@ -2908,10 +2908,11 @@ Files: ChangeLog
nxcomp/VERSION
nxcomp/configure.in
nxcomp/nxcomp.pc.in
nxcompshad/Makefile.in
nxcompshad/Makefile.am
nxcompshad/VERSION
nxcompshad/configure.in
nxcompshad/configure.ac
nxcompshad/nxcompshad.pc.in
nxcompshad/src/Makefile.am
nxproxy/VERSION
nxproxy/man/nxproxy.1
nxproxy/Makefile.am
......@@ -2951,7 +2952,6 @@ Copyright: *No copyright*
License: public-domain
Files: nxcomp/install-sh
nxcompshad/install-sh
Copyright: 1994, X Consortium
License: Expat~NoAdvert
Comment:
......
debian/libxcompshad-dev.install
View file @ 76b48676
usr/lib/*/libXcompshad.so
usr/lib/*/libXcompshad.a
usr/include/*/nx/Shadow.h
usr/lib/*/pkgconfig/nxcompshad.pc
debian/rules
View file @ 76b48676
......@@ -25,7 +25,7 @@ override_dh_install:
# remove static libs
rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a
rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la
# remove extras, GL, and other unneeded headers
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/
......
nx-X11/lib/X11/Imakefile
View file @ 76b48676
......@@ -87,7 +87,7 @@ NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext
NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext/src/.libs
NX_XCOMPEXTLIBTARGET = $(NX_XCOMPEXTLIBDIR)/$(NX_XCOMPEXTLIBNAME)
NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
......
nx-X11/programs/Xserver/Imakefile
View file @ 76b48676
......@@ -221,8 +221,8 @@ NX_XCOMP_HEADERS = \
../../../nxcomp/NXvars.h \
$(NULL)
NX_XCOMPSHAD_HEADERS = \
../../../nxcompshad/Shadow.h \
NX_XCOMPSHAD_HEADERS = \
../../../nxcompshad/include/Shadow.h \
$(NULL)
NX_HEADERS = \
......@@ -316,7 +316,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L/usr/sfw/lib \
-L../../../nxcomp \
-L../../../nxcompshad \
-L../../../nxcompshad/src/.libs \
-lrt \
-lXcomp \
-lXcompshad \
......@@ -331,7 +331,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
$(NULL)
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L../../../nxcomp \
-L../../../nxcompshad \
-L../../../nxcompshad/src/.libs \
-lXcomp \
-lXcompshad \
-lXrender \
......@@ -345,7 +345,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
#elif defined(OpenBSDArchitecture)
NXAGENTNXLIBS = -L../../../nxcomp \
-L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-L../../../nxcompshad/src/.libs \
-lkvm \
-lXcomp \
-lXcompshad \
......@@ -360,7 +360,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
$(NULL)
#else
NXAGENTNXLIBS = -L../../../nxcomp \
-L../../../nxcompshad \
-L../../../nxcompshad/src/.libs \
-lXcomp \
-lXcompshad \
-lXrender \
......
nxcompshad/.gitignore
View file @ 76b48676
nxcompshad.pc
Makefile
Makefile.in
aclocal.m4
build-aux/compile
build-aux/config.guess
build-aux/config.sub
build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
config.h
config.h.in
libtool
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
nxcompshad.pc
src/.deps/
src/Makefile
src/Makefile.in
stamp-h1
nxcompshad/Makefile.am 0 → 100644
View file @ 76b48676
SUBDIRS = src
pkgconfig_DATA = nxcompshad.pc
MAINTAINERCLEANFILES = \
$(srcdir)/autom4te.cache/* \
$(srcdir)/build-aux/* \
$(srcdir)/Makefile.in \
$(srcdir)/src/Makefile.in \
$(srcdir)/aclocal.m4 \
$(srcdir)/config.h.in \
$(srcdir)/config.h.in~ \
$(srcdir)/configure \
$(srcdir)/m4/libtool.m4 \
$(srcdir)/m4/lt~obsolete.m4 \
$(srcdir)/m4/ltoptions.m4 \
$(srcdir)/m4/ltsugar.m4 \
$(srcdir)/m4/ltversion.m4 \
$(NULL)
DISTCLEANFILES=$(MAINTAINERCLEANFILES)
nxcompshad/Makefile.in deleted 100644 → 0
View file @ 622360ea
#/**************************************************************************/
#/* */
#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
#/* */
#/* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
#/* are copyright of the aforementioned persons and companies. */
#/* */
#/* Redistribution and use of the present software is allowed according */
#/* to terms specified in the file LICENSE which comes in the source */
#/* distribution. */
#/* */
#/* All rights reserved. */
#/* */
#/* NOTE: This software has received contributions from various other */
#/* contributors, only the core maintainers and supporters are listed as */
#/* copyright holders. Please contact us, if you feel you should be listed */
#/* as copyright holder, as well. */
#/* */
#/**************************************************************************/
#
# Get values from configure script.
#
VERSION=@VERSION@
LIBVERSION=@LIBVERSION@
#
# We would really like to enable all warnings, -Wredundant-decls,
# though, gives a warning caused by pthread.h and unistd.h and
# GCC 3.4 was changed in a way that it now complains about some
# of the -W directives we used before (-Wmissing-declarations,
# -Wnested-externs, -Wstrict-prototypes and -Wmissing-prototypes).
#
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
-Wall -Wpointer-arith
CXXINCLUDES =
CXXDEFINES =
CPPFLAGS = @CPPFLAGS@
#
# C programs don't share the C++ flags. They should
# have their own @CCFLAGS@.
#
CC = @CC@
CCFLAGS = @X_CFLAGS@ @DEFS@ \
-Wall -Wpointer-arith
CCINCLUDES =
CCDEFINES =
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ -lNX_X11
#
# Only if THREADS is defined.
#
# LIBS = $(LIBS) -lpthread
#
#
# Only if you want ElectricFence.
#
# LIBS = $(LIBS) -lefence
#
#
# Only if you want mpatrol.
#
# LIBS = $(LIBS) -lmpatrol -lbfd -liberty
#
srcdir = @srcdir@
prefix = @prefix@
datarootdir = @datarootdir@
datadir = @datadir@
exec_prefix = @exec_prefix@
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
libdir = @libdir@
includedir = @includedir@
pkgconfigdir = @pkgconfigdir@
INSTALL = @INSTALL@
INSTALL_DIR = $(INSTALL) -d -m 0755
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LINK = cp -av
DESTDIR =
RM_FILE = rm -f
RM_DIR = rmdir -p --ignore-fail-on-non-empty
#
# This should be autodetected.
#
MAKEDEPEND = @MAKEDEPEND@
DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3
.SUFFIXES: .cpp.c
.cpp.o:
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
.c.o:
$(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
LIBRARY = Xcompshad
LIBNAME = lib$(LIBRARY)
ifeq ($(shell uname),Darwin)
LIBFULL = lib$(LIBRARY).$(VERSION).dylib
LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
LIBSHARED = lib$(LIBRARY).dylib
COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
else
LIBFULL = lib$(LIBRARY).so.$(VERSION)
LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
LIBSHARED = lib$(LIBRARY).so
LIBFLAGS =
endif
LIBARCHIVE = lib$(LIBRARY).a
MSRC = Main.c
CSRC =
CXXSRC = Core.cpp \
Input.cpp \
Logger.cpp \
Shadow.cpp \
X11.cpp \
Win.cpp \
Updater.cpp \
Manager.cpp
MOBJ = $(MSRC:.c.cpp=.o)
COBJ = $(CSRC:.c=.o)
CXXOBJ = $(CXXSRC:.cpp=.o)
MLIBS = -L. -lXShadow
ifeq ($(findstring -lgdi32,$(LIBS)),-lgdi32)
# We need a smarter way to detect windows
# platform.
LIBDLL = cyg$(LIBRARY).dll
LIBDLLSTATIC = lib${LIBRARY}.dll.a
all: depend $(LIBARCHIVE) $(LIBDLL)
else
EXTRALIBS = -lXext -lXtst -lXrandr -lXdamage
all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
endif
$(LIBFULL): $(CXXOBJ) $(COBJ)
$(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS)
$(LIBLOAD): $(LIBFULL)
rm -f $(LIBLOAD)
ln -s $(LIBFULL) $(LIBLOAD)
$(LIBSHARED): $(LIBFULL)
rm -f $(LIBSHARED)
ln -s $(LIBFULL) $(LIBSHARED)
$(LIBARCHIVE): $(CXXOBJ) $(COBJ)
rm -f $(LIBARCHIVE)
ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
ranlib $(LIBARCHIVE)
$(LIBDLL): $(LIBARCHIVE)
$(CC) -o $@ \
-shared \
-Wl,--out-implib=$(LIBDLLSTATIC) \
-Wl,--export-all-symbols \
-Wl,--enable-auto-import \
-Wl,--whole-archive ${LIBARCHIVE} \
-Wl,--no-whole-archive \
${LIBS}
$(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL)
# $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS)
depends: depend.status
depend: depend.status
depend.status:
if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
fi
touch depend.status
install: install.bin install.lib install.man
install.bin:
install.lib: all
$(INSTALL_DIR) $(DESTDIR)${libdir}
$(INSTALL_DIR) $(DESTDIR)${pkgconfigdir}
$(INSTALL_DIR) $(DESTDIR)${includedir}/nx
$(INSTALL_DIR) $(DESTDIR)${pkgconfigdir}
$(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
$(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
$(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
$(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
$(INSTALL_DATA) Shadow.h $(DESTDIR)${includedir}/nx
$(INSTALL_DATA) nxcompshad.pc $(DESTDIR)${pkgconfigdir}
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
install.man:
uninstall: uninstall.bin uninstall.lib uninstall.man
uninstall.bin:
uninstall.lib:
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
$(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done
$(RM_DIR) $(DESTDIR)${libdir}/nx/
$(RM_DIR) $(DESTDIR)${includedir}/nx/
$(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompshad.pc
echo "Running ldconfig tool, this may take a while..." && ldconfig || true
uninstall.man:
clean:
-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump *.pc \
$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
distclean: clean
-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure
nxcompshad/configure.ac 0 → 100644
View file @ 76b48676
dnl ***************************************************************************
dnl *** configure.ac for nxcompshad ***
dnl ***************************************************************************
m4_define([nxcompshad_version], m4_esyscmd([tr -d '\n' < VERSION]))
# Initialize Autoconf
AC_PREREQ(2.60)
AC_INIT([libXcompshad], [nxcompshad_version], [https://github.com/ArcticaProject/nx-libs/issues])
AC_PROG_CXX
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz])
# Initialize libtool
AC_PROG_LIBTOOL
COMPSHAD_VERSION=nxcompshad_version
AC_SUBST([COMPSHAD_VERSION])
LT_COMPSHAD_VERSION=[`echo $COMPSHAD_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`]
AC_SUBST([LT_COMPSHAD_VERSION])
PKG_CHECK_MODULES(Xext, xext)
PKG_CHECK_MODULES(Xdamage, xdamage)
PKG_CHECK_MODULES(Xrandr, xrandr)
PKG_CHECK_MODULES(Xtst, xtst)
# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
# compatible version in case the local version of pkgconfig isn't new enough.
# https://bugs.freedesktop.org/show_bug.cgi?id=48743
m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
[AC_ARG_WITH([pkgconfigdir],
[AS_HELP_STRING([--with-pkgconfigdir],
[install directory for nxcompshad.pc pkg-config file])],
[],[with_pkgconfigdir='$(libdir)/pkgconfig'])
AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
AC_LANG([C++])
NX_COMPILER_BRAND
NX_COMPILER_FLAGS
AC_CONFIG_FILES([
Makefile
src/Makefile
nxcompshad.pc
])
AC_OUTPUT
nxcompshad/configure.in deleted 100644 → 0
View file @ 622360ea
dnl /**************************************************************************/
dnl /* */
dnl /* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
dnl /* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
dnl /* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
dnl /* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
dnl /* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
dnl /* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
dnl /* */
dnl /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
dnl /* are copyright of the aforementioned persons and companies. */
dnl /* */
dnl /* Redistribution and use of the present software is allowed according */
dnl /* to terms specified in the file LICENSE which comes in the source */
dnl /* distribution. */
dnl /* */
dnl /* All rights reserved. */
dnl /* */
dnl /* NOTE: This software has received contributions from various other */
dnl /* contributors, only the core maintainers and supporters are listed as */
dnl /* copyright holders. Please contact us, if you feel you should be listed */
dnl /* as copyright holder, as well. */
dnl /* */
dnl /**************************************************************************/
dnl Process this file with autoconf to produce a configure script.
dnl Prolog
AC_INIT(Shadow.h)
AC_PREREQ(2.13)
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
dnl Reset default compilation flags.
if test "x$CXXFLAGS" == "x"; then
CXXFLAGS="-O3"
fi
if test "x$CPPFLAGS" == "x"; then
CPPFLAGS="-O3"
fi
dnl Reset default linking directives.
LIBSTATIC=""
LIBSHARED=""
dnl Prefer headers and libraries from nx-X11, if present.
if test -d "../nx-X11/exports/include" ; then
CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
LIBS="-L../nx-X11/exports/lib"
fi
dnl Check whether --with-ipaq was given.
if test "${with_ipaq}" = yes; then
echo -e "enabling IPAQ configuration"
CXX="arm-linux-c++"
CC="arm-linux-gcc"
unset ac_cv_prog_armcxx
unset ac_cv_prog_armcc
unset ac_cv_prog_CXXCPP
AC_CHECK_PROG([armcxx],["$CXX"],[yes],[no],[$PATH])
AC_CHECK_PROG([armcc],["$CC"],[yes],[no],[$PATH])
if test $armcxx = "yes" && test $armcc = "yes" ; then
ac_cv_prog_CXX="$CXX"
ac_cv_prog_CC="$CC"
else
AC_MSG_ERROR(installation or configuration problem: I cannot find compiler for arm-linux)
fi
else
unset ac_cv_prog_CXX
unset ac_cv_prog_CC
unset ac_cv_prog_CXXCPP
fi
dnl Check for programs.
AC_PROG_CXX
AC_PROG_CC
AC_LANG_CPLUSPLUS
dnl Check whether option -Wno-deprecated
dnl is needed by GCC compiler.
AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
case "${gcc_version}" in
gcc*)
AC_MSG_RESULT([yes])
CXXFLAGS="$CXXFLAGS -Wno-deprecated"
CPPFLAGS="$CPPFLAGS -Wno-deprecated"
;;
*)
AC_MSG_RESULT([no])
;;
esac
AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs])
gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
case "${gcc_version}" in
gcc*)
AC_MSG_RESULT([no])
;;
*)
AC_MSG_RESULT([yes])
CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
CPPFLAGS="$CPPFLAGS -Wmissing-declarations"
;;
esac
dnl Check for BSD compatible install.
AC_PROG_INSTALL
dnl Check for extra header files.
AC_PATH_XTRA
dnl Custom addition.
ac_help="$ac_help
--with-symbols give -g flag to compiler to produce debug symbols
--with-info define INFO at compile time to get basic log output
--with-valgrind clean up allocated buffers to avoid valgrind warnings
--with-version use this version for produced libraries
--with-static-jpeg enable static linking of JPEG library
--with-static-z enable static linking of Z library"
dnl Check to see if we're running under Cygwin32.
AC_DEFUN(nxconf_CYGWIN32,
[AC_CACHE_CHECK(for Cygwin32 environment, nxconf_cv_cygwin32,
[AC_TRY_COMPILE(,[return __CYGWIN32__;],
nxconf_cv_cygwin32=yes, nxconf_cv_cygwin32=no)
rm -f conftest*])
CYGWIN32=
test "$nxconf_cv_cygwin32" = yes && CYGWIN32=yes])
nxconf_CYGWIN32
dnl Cygwin32 requires the stdc++ library explicitly linked.
if test "$CYGWIN32" = yes; then
LIBS="$LIBS -lstdc++ -lcygipc -lgdi32"
fi
dnl Check for Darwin environment.
AC_DEFUN(nxconf_DARWIN,
[AC_CACHE_CHECK(for Darwin environment, nxconf_cv_darwin,
[AC_TRY_COMPILE(,[return __APPLE__;],
nxconf_cv_darwin=yes, nxconf_cv_darwin=no)
rm -f conftest*])
DARWIN=
test "$nxconf_cv_darwin" = yes && DARWIN=yes])
nxconf_DARWIN
dnl Check to see if we're running under Solaris.
AC_DEFUN(nxconf_SUN,
[AC_CACHE_CHECK(for Solaris environment, nxconf_cv_sun,
[AC_TRY_COMPILE(,[return __sun;],
nxconf_cv_sun=yes, nxconf_cv_sun=no)
rm -f conftest*])
SUN=
test "$nxconf_cv_sun" = yes && SUN=yes])
nxconf_SUN
dnl Check to see if we're running under FreeBSD.
AC_DEFUN(nxconf_FreeBSD,
[AC_CACHE_CHECK(for FreeBSD environment, nxconf_cv_freebsd,
[AC_TRY_COMPILE(,[return __FreeBSD__;],
nxconf_cv_freebsd=yes, nxconf_cv_freebsd=no)
rm -f conftest*])
FreeBSD=
test "$nxconf_cv_freebsd" = yes && FreeBSD=yes])
nxconf_FreeBSD
dnl Build PIC libraries.
if test "$CYGWIN32" != yes -a "$DARWIN" != yes; then
CXXFLAGS="$CXXFLAGS -fPIC"
CFLAGS="$CFLAGS -fPIC"
fi
dnl Solaris requires the socket and gcc_s libs explicitly linked.
dnl Note also that headers from default /usr/openwin/include/X11
dnl cause a warning due to pragma in Xmd.h.
if test "$SUN" = yes; then
LIBS="$LIBS -L/usr/sfw/lib -lsocket "
CXXFLAGS="$CXXFLAGS -I/usr/sfw/include"
fi
dnl On FreeBSD search libraries and includes under /usr/local.
if test "$FreeBSD" = yes; then
LIBS="$LIBS -L/usr/local/lib"
CXXFLAGS="$CXXFLAGS -I/usr/local/include"
fi
dnl Under Darwin we don't have support for -soname option and
dnl we need the -dynamiclib flag. Under Solaris, instead, we need
dnl the options -G -h.
if test "$DARWIN" = yes; then
LDFLAGS="$LDFLAGS -dynamiclib"
elif test "$SUN" = yes; then
LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
else
LDFLAGS="$LDFLAGS -Wl,-soname,\$(LIBLOAD)"
fi
dnl Check to see if in_addr_t is defined.
dnl Could use a specific configure test.
AC_DEFUN(nxconf_INADDRT,
[AC_CACHE_CHECK(for in_addr_t, nxconf_cv_inaddrt,
[AC_TRY_COMPILE([#include <netinet/in.h>],[in_addr_t t; t = 1; return t;],
nxconf_cv_inaddrt=yes, nxconf_cv_inaddrt=no)
rm -f conftest*])
INADDRT=
test "$nxconf_cv_inaddrt" = yes && INADDRT=yes])
nxconf_INADDRT
dnl If in_addr_t is not defined use unsigned int.
if test "$INADDRT" != yes ; then
echo -e "using unsigned int for type in_addr_t"
CXXFLAGS="$CXXFLAGS -DIN_ADDR_T=unsigned"
CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=unsigned"
else
CXXFLAGS="$CXXFLAGS -DIN_ADDR_T=in_addr_t"
CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=in_addr_t"
fi
dnl Check whether --with-version was given.
AC_SUBST(LIBVERSION)
AC_SUBST(VERSION)
if test "${with_version}" = yes; then
VERSION=${ac_option}
else
VERSION=`cat VERSION`
fi
echo -e "compiling version ${VERSION}"
LIBVERSION=`echo ${VERSION} | cut -d '.' -f 1`
CXXFLAGS="$CXXFLAGS -DVERSION=\\\"${VERSION}\\\""
CPPFLAGS="$CPPFLAGS -DVERSION=\\\"${VERSION}\\\""
dnl Finally compose the LIB variable.
if test "$DARWIN" = yes ; then
LIBS="$LIBS $LIBSTATIC $LIBSHARED"
elif test "$SUN" = yes ; then
LIBS="$LIBS $LIBSTATIC $LIBSHARED"
else
LIBS="$LIBS $LIBSTATIC -shared $LIBSHARED"
fi
dnl Check whether --with-symbols or --without-symbols was
dnl given and set the required optimization level.
if test "${with_symbols}" = yes; then
echo -e "enabling production of debug symbols"
CXXFLAGS="-g $CXXFLAGS"
CPPFLAGS="-g $CPPFLAGS"
else
echo -e "disabling production of debug symbols"
fi
dnl Check whether --with-info or --without-info was given.
if test "${with_info}" = yes; then
echo -e "enabling info output in the log file"
CXXFLAGS="$CXXFLAGS -DINFO"
CPPFLAGS="$CPPFLAGS -DINFO"
else
echo -e "disabling info output in the log file"
fi
dnl Check whether --with-valgrind or --without-valgrind was given.
if test "${with_valgrind}" = yes; then
echo -e "enabling valgrind memory checker workarounds"
CXXFLAGS="$CXXFLAGS -DVALGRIND"
CPPFLAGS="$CPPFLAGS -DVALGRIND"
else
echo -e "disabling valgrind memory checker workarounds"
fi
dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which makedepend)"
AC_OUTPUT(Makefile nxcompshad.pc)
nxcompshad/install-sh deleted 100755 → 0
View file @ 622360ea
#! /bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
#
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""
while [ x"$1" != x ]; do
case $1 in
-c) instcmd="$cpprog"
shift
continue;;
-d) dir_arg=true
shift
continue;;
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
-s) stripcmd="$stripprog"
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
shift
continue;;
*) if [ x"$src" = x ]
then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done
if [ x"$src" = x ]
then
echo "install: no input file specified"
exit 1
else
true
fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
if [ -d $dst ]; then
instcmd=:
else
instcmd=mkdir
fi
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
then
true
else
echo "install: $src does not exist"
exit 1
fi
if [ x"$dst" = x ]
then
echo "install: no destination specified"
exit 1
else
true
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ]
then
dst="$dst"/`basename $src`
else
true
fi
fi
## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
pathcomp="${pathcomp}${1}"
shift
if [ ! -d "${pathcomp}" ] ;
then
$mkdirprog "${pathcomp}"
else
true
fi
pathcomp="${pathcomp}/"
done
fi
if [ x"$dir_arg" != x ]
then
$doit $instcmd $dst &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
# If we're going to rename the final executable, determine the name now.
if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
true
fi
# Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
$doit $instcmd $src $dsttmp &&
trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
$doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
exit 0
nxcompshad/m4/nx-macros.m4 0 → 120000
View file @ 76b48676
../../m4/nx-macros.m4
\ No newline at end of file
nxcompshad/nxcompshad.pc.in
View file @ 76b48676
......@@ -5,7 +5,7 @@ includedir=@includedir@
Name: nxcompshad
Description: Shadow Session Support for NX Compression Library
Version: @VERSION@
Version: @COMPSHAD_VERSION@
Requires: nxcomp
Requires.private: x11
Cflags: -I${includedir}
......
nxcompshad/Core.cpp → nxcompshad/src/Core.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
#include <sys/time.h>
......
nxcompshad/Input.cpp → nxcompshad/src/Input.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
#define PANIC
......
nxcompshad/Logger.cpp → nxcompshad/src/Logger.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
......
nxcompshad/src/Makefile.am 0 → 100644
View file @ 76b48676
NULL =
lib_LTLIBRARIES = libXcompshad.la
libXcompshad_la_SOURCES = \
Core.cpp \
Input.cpp \
Logger.cpp \
Manager.cpp \
Shadow.cpp \
Updater.cpp \
Win.cpp \
X11.cpp \
$(NULL)
libXcompshad_la_LIBADD = \
@Xext_LIBS@ \
@Xdamage_LIBS@ \
@Xrandr_LIBS@ \
@Xtst_LIBS@ \
-L$(top_srcdir)/../nx-X11/exports/lib -lNX_X11 \
$(NULL)
AM_CFLAGS = \
$(Xext_CFLAGS) \
$(Xdamage_CFLAGS) \
$(Xrandr_CFLAGS) \
$(Xtst_CFLAGS) \
$(NULL)
AM_CXXFLAGS = \
$(BASE_CXXFLAGS) \
$(NULL)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/../nx-X11/exports/include \
$(NULL)
libXcompshad_la_LDFLAGS = -version-number @LT_COMPSHAD_VERSION@ -no-undefined
libXcompshadincludedir = $(includedir)/nx
libXcompshadinclude_HEADERS = \
$(top_srcdir)/include/Shadow.h \
$(NULL)
nxcompshad/Manager.cpp → nxcompshad/src/Manager.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <nx-X11/Xlib.h>
#include <nx-X11/Xutil.h>
#include <nx-X11/keysym.h>
......
nxcompshad/Shadow.cpp → nxcompshad/src/Shadow.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <signal.h>
#include <string.h>
......
nxcompshad/Updater.cpp → nxcompshad/src/Updater.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <nx-X11/Xlib.h>
#include <nx-X11/Xutil.h>
#include <nx-X11/keysym.h>
......
nxcompshad/Win.cpp → nxcompshad/src/Win.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if defined(__CYGWIN32__) || defined(WIN32)
#include <nx-X11/keysym.h>
......
nxcompshad/X11.cpp → nxcompshad/src/X11.cpp
View file @ 76b48676
......@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if !defined(__CYGWIN32__) && !defined(WIN32)
#define PANIC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment