* Bumped the program version to 1.4.2 in config.ac.
* Now requires autoconf 2.60. * Fixed docdir use. * Does not install the documentation by default. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@122 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez
parent
f64c539395
commit
f07bcb749f
10
ChangeLog
10
ChangeLog
@ -2,6 +2,16 @@
|
|||||||
Trunk
|
Trunk
|
||||||
*************************************************************************
|
*************************************************************************
|
||||||
|
|
||||||
|
2007-02-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
|
||||||
|
|
||||||
|
* Bumped the program version to 1.4.2 in config.ac.
|
||||||
|
|
||||||
|
* Now requires autoconf 2.60.
|
||||||
|
|
||||||
|
* Fixed docdir use.
|
||||||
|
|
||||||
|
* Does not install the documentation by default.
|
||||||
|
|
||||||
2007-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
|
2007-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
|
||||||
|
|
||||||
* SF Tracker [ 1634922 ] Support for large files (>= 2 GiB), part 2
|
* SF Tracker [ 1634922 ] Support for large files (>= 2 GiB), part 2
|
||||||
|
|||||||
39
Makefile.am
39
Makefile.am
@ -5,40 +5,39 @@
|
|||||||
# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
|
# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
|
||||||
#
|
#
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-samples
|
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-samples
|
||||||
|
|
||||||
SUBDIRS = ixml threadutil upnp docs/dist
|
SUBDIRS = ixml threadutil upnp docs/dist
|
||||||
|
|
||||||
|
|
||||||
EXTRA_DIST = libupnp.pc.in LICENSE THANKS libupnp.spec \
|
EXTRA_DIST = \
|
||||||
build/libupnp.bpf \
|
libupnp.pc.in \
|
||||||
build/libupnp.bpr \
|
LICENSE \
|
||||||
build/libupnp.dsp \
|
THANKS \
|
||||||
build/libupnp.dsw \
|
libupnp.spec \
|
||||||
build/inc/autoconfig.h \
|
build/libupnp.bpf \
|
||||||
build/inc/config.h \
|
build/libupnp.bpr \
|
||||||
build/inc/upnpconfig.h
|
build/libupnp.dsp \
|
||||||
|
build/libupnp.dsw \
|
||||||
|
build/inc/autoconfig.h \
|
||||||
|
build/inc/config.h \
|
||||||
|
build/inc/upnpconfig.h
|
||||||
|
|
||||||
|
|
||||||
# This variable must have 'exec' in its name, in order to be installed
|
# This variable must have 'exec' in its name, in order to be installed
|
||||||
# by 'install-exec' target (instead of default 'install-data')
|
# by 'install-exec' target (instead of default 'install-data')
|
||||||
pkgconfigexecdir = $(libdir)/pkgconfig
|
pkgconfigexecdir = $(libdir)/pkgconfig
|
||||||
pkgconfigexec_DATA = libupnp.pc
|
pkgconfigexec_DATA = libupnp.pc
|
||||||
|
|
||||||
$(pkgconfigexec_DATA): config.status
|
$(pkgconfigexec_DATA): config.status
|
||||||
|
|
||||||
|
|
||||||
if WITH_DOCDIR
|
if WITH_DOCUMENTATION
|
||||||
docdir = @DOCDIR@
|
doc_DATA = LICENSE README NEWS TODO THANKS
|
||||||
doc_DATA = LICENSE README NEWS TODO THANKS
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
|
CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
33
configure.ac
33
configure.ac
@ -8,9 +8,9 @@
|
|||||||
# (C) Copyright 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
|
# (C) Copyright 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
|
||||||
#
|
#
|
||||||
|
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.60)
|
||||||
|
|
||||||
AC_INIT([libupnp], [1.4.1], [virtual_worlds@gmx.de])
|
AC_INIT([libupnp], [1.4.2], [mroberto@users.sourceforge.net])
|
||||||
# *Independently* of the above libupnp package version, the libtool version
|
# *Independently* of the above libupnp package version, the libtool version
|
||||||
# of the 3 libraries need to be updated whenever there is a change released :
|
# of the 3 libraries need to be updated whenever there is a change released :
|
||||||
# "current:revision:age" (this is NOT the same as the package version), where:
|
# "current:revision:age" (this is NOT the same as the package version), where:
|
||||||
@ -125,19 +125,24 @@ RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
|
|||||||
|
|
||||||
|
|
||||||
# doc installation
|
# doc installation
|
||||||
AC_MSG_CHECKING([documentation installation])
|
# autoconf >= 2.60 already defines ${docdir}.
|
||||||
AC_ARG_WITH([docdir],
|
AC_MSG_CHECKING([for documentation directory])
|
||||||
AC_HELP_STRING([--with-docdir=DIR],
|
AC_ARG_WITH([documentation],
|
||||||
[where documentation is installed
|
AS_HELP_STRING([--with-documentation=directory_name],
|
||||||
@<:@[DATADIR/doc/]AC_PACKAGE_NAME[-]AC_PACKAGE_VERSION@:>@])
|
[where documentation is installed
|
||||||
AC_HELP_STRING([--without-docdir],
|
@<:@[DATADIR/doc/]AC_PACKAGE_NAME[-]AC_PACKAGE_VERSION@:>@])
|
||||||
[do not install the documentation]),
|
AS_HELP_STRING([--without-documentation],
|
||||||
[DOCDIR="$with_docdir"],
|
[do not install the documentation]),
|
||||||
[DOCDIR="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
|
[],
|
||||||
|
[with_documentation=no])
|
||||||
|
|
||||||
AM_CONDITIONAL(WITH_DOCDIR, test x"$with_docdir" != xno)
|
# If something has been entered after an equal sign, assume it is the directory
|
||||||
AC_SUBST(DOCDIR)
|
if test x"$with_documentation" != xyes -a x"$with_documentation" != xno; then
|
||||||
AC_MSG_RESULT($DOCDIR)
|
docdir="$with_documentation"
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(WITH_DOCUMENTATION, test x"$with_documentation" != xno)
|
||||||
|
AC_SUBST(docdir)
|
||||||
|
AC_MSG_RESULT($docdir)
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
13
docs/dist/Makefile.am
vendored
13
docs/dist/Makefile.am
vendored
@ -1,4 +1,7 @@
|
|||||||
EXTRA_DIST = ./UPnP_Programming_Guide.pdf \
|
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
./UPnP_Programming_Guide.pdf \
|
||||||
./IXML_Programming_Guide.pdf \
|
./IXML_Programming_Guide.pdf \
|
||||||
./html/upnp/icon1.gif \
|
./html/upnp/icon1.gif \
|
||||||
./html/upnp/icon2.gif \
|
./html/upnp/icon2.gif \
|
||||||
@ -251,9 +254,10 @@ EXTRA_DIST = ./UPnP_Programming_Guide.pdf \
|
|||||||
./html/ixml/ixmlCloneDOMString.html \
|
./html/ixml/ixmlCloneDOMString.html \
|
||||||
./html/ixml/ixmlFreeDOMString.html
|
./html/ixml/ixmlFreeDOMString.html
|
||||||
|
|
||||||
if WITH_DOCDIR
|
if WITH_DOCUMENTATION
|
||||||
docsdir = @DOCDIR@
|
docsdir = @docdir@
|
||||||
nobase_docs_DATA = ./UPnP_Programming_Guide.pdf \
|
nobase_docs_DATA = \
|
||||||
|
./UPnP_Programming_Guide.pdf \
|
||||||
./IXML_Programming_Guide.pdf \
|
./IXML_Programming_Guide.pdf \
|
||||||
./html/upnp/icon1.gif \
|
./html/upnp/icon1.gif \
|
||||||
./html/upnp/icon2.gif \
|
./html/upnp/icon2.gif \
|
||||||
@ -506,3 +510,4 @@ if WITH_DOCDIR
|
|||||||
./html/ixml/ixmlCloneDOMString.html \
|
./html/ixml/ixmlCloneDOMString.html \
|
||||||
./html/ixml/ixmlFreeDOMString.html
|
./html/ixml/ixmlFreeDOMString.html
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
@ -132,8 +132,7 @@ upnp_tv_ctrlpt_SOURCES = \
|
|||||||
sample/tvctrlpt/upnp_tv_ctrlpt.h \
|
sample/tvctrlpt/upnp_tv_ctrlpt.h \
|
||||||
sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
|
sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
|
||||||
|
|
||||||
if WITH_DOCDIR
|
if WITH_DOCUMENTATION
|
||||||
docdir = @DOCDIR@
|
|
||||||
examplesdir = $(docdir)/examples
|
examplesdir = $(docdir)/examples
|
||||||
examples_DATA = $(upnp_tv_ctrlpt_SOURCES) $(upnp_tv_device_SOURCES)
|
examples_DATA = $(upnp_tv_ctrlpt_SOURCES) $(upnp_tv_device_SOURCES)
|
||||||
endif
|
endif
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user