This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 00cec4924157db9498d56e5c1fbde852e8eb3717 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Jul 12 01:52:29 2015 +0200 Add pkg-config support to nxcomp, nxcompext and nxcompshad --- nxcomp/Makefile.in | 19 +++++++++++-------- nxcomp/configure.in | 5 ++++- nxcomp/nxcomp.pc.in | 15 +++++++++++++++ nxcompext/Makefile.in | 19 +++++++++++-------- nxcompext/configure.in | 5 ++++- nxcompext/nxcompext.pc.in | 13 +++++++++++++ nxcompshad/Makefile.in | 19 +++++++++++-------- nxcompshad/configure.in | 5 ++++- nxcompshad/nxcompshad.pc.in | 13 +++++++++++++ 9 files changed, 86 insertions(+), 27 deletions(-) diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 6022747..a8647ce 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -58,14 +58,15 @@ LIBS = @LIBS@ # Other autoconfigured settings, not used at the moment. # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -292,6 +293,7 @@ install.lib: all $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcomp.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -313,6 +315,7 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcomp/configure.in b/nxcomp/configure.in index 43b5157..206df2e 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(NX.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Set our default compilation flags. CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" @@ -387,4 +390,4 @@ else ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcomp.pc) diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in new file mode 100644 index 0000000..f4d3a7e --- /dev/null +++ b/nxcomp/nxcomp.pc.in @@ -0,0 +1,15 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcomp +Description: NX Compression Library +Version: @VERSION@ +#libjepg does not provide a pkgconfig-file, zlib does not provide it for older versions +#Requires: libjpeg zlib +Requires: libpng +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcomp + diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index b33c5aa..b66a4c3 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -50,14 +50,15 @@ LIBS = @LIBS@ -lz -lNX_X11 -lXcomp # LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -171,6 +172,7 @@ install.lib: all $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcompext.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -185,6 +187,7 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompext.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcompext/configure.in b/nxcompext/configure.in index e6f13c0..eb6604d 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(NXlib.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Reset default compilation flags. CXXFLAGS="$CXXFLAGS -O3" @@ -243,4 +246,4 @@ else ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcompext.pc) diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in new file mode 100644 index 0000000..669397a --- /dev/null +++ b/nxcompext/nxcompext.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcompext +Description: Extension for NX Compression Library +Version: @VERSION@ +Requires: nxcomp +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcompext + diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 3e5c33a..5b1abeb 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -68,14 +68,15 @@ LIBS = @LIBS@ -lNX_X11 # LIBS = $(LIBS) -lmpatrol -lbfd -liberty # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 @@ -206,6 +207,7 @@ install.lib: all $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcompshad.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -222,6 +224,7 @@ uninstall.lib: 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: diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 8dd1b2e..8468b47 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(Shadow.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Reset default compilation flags. CXXFLAGS="$CXXFLAGS -O3" @@ -281,4 +284,4 @@ if test -z "${MAKEDEPEND}"; then fi fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcompshad.pc) diff --git a/nxcompshad/nxcompshad.pc.in b/nxcompshad/nxcompshad.pc.in new file mode 100644 index 0000000..4d4265c --- /dev/null +++ b/nxcompshad/nxcompshad.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcompshad +Description: Shadow Session Support for NX Compression Library +Version: @VERSION@ +Requires: nxcomp +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcompshad + -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git