generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

White spaces in configure.ac.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@279 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2007-12-25 13:43:01 +00:00
parent 3fe9ccb9ae
commit 4e23dd9c1b
1 changed files with 113 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
configure.ac
View File

@ -10,113 +10,114 @@
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT([libupnp], [1.6.3], [mroberto@users.sourceforge.net]) AC_INIT([libupnp], [1.6.3], [mroberto@users.sourceforge.net])
############################################################################### dnl ############################################################################
# *Independently* of the above libupnp package version, the libtool version dnl # *Independently* of the above libupnp package version, the libtool version
# of the 3 libraries need to be updated whenever there is a change released: dnl # 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: dnl # "current:revision:age" (this is NOT the same as the package version),
# - library code modified: revision++ dnl # where:
# - interfaces changed/added/removed: current++ and revision=0 dnl # - library code modified: revision++
# - interfaces added: age++ dnl # - interfaces changed/added/removed: current++ and revision=0
# - interfaces removed: age=0 dnl # - interfaces added: age++
# *please update only once, before a formal release, not for each change* dnl # - interfaces removed: age=0
# dnl # *please update only once, before a formal release, not for each change*
############################################################################### dnl #
# Release 1.4.1: dnl ############################################################################
#AC_SUBST([LT_VERSION_IXML], [2:2:0]) dnl # Release 1.4.1:
#AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0]) dnl #AC_SUBST([LT_VERSION_IXML], [2:2:0])
#AC_SUBST([LT_VERSION_UPNP], [2:2:0]) dnl #AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
# dnl #AC_SUBST([LT_VERSION_UPNP], [2:2:0])
############################################################################### dnl #
# Release 1.4.6: dnl ############################################################################
# "current:revision:age" dnl # Release 1.4.6:
# dnl # "current:revision:age"
# - Code has changed in ixml dnl #
# revision: 2 -> 3 dnl # - Code has changed in ixml
# - Code has changed in threadutil dnl # revision: 2 -> 3
# revision: 2 -> 3 dnl # - Code has changed in threadutil
# - Interface added in threadutil dnl # revision: 2 -> 3
# current: 2 -> 3 dnl # - Interface added in threadutil
# revisiion: 3 -> 0 dnl # current: 2 -> 3
# age: 0 -> 1 dnl # revisiion: 3 -> 0
# - Code has changed in upnp dnl # age: 0 -> 1
# revision: 2 -> 3 dnl # - Code has changed in upnp
# dnl # revision: 2 -> 3
#AC_SUBST([LT_VERSION_IXML], [2:3:0]) dnl #
#AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1]) dnl #AC_SUBST([LT_VERSION_IXML], [2:3:0])
#AC_SUBST([LT_VERSION_UPNP], [2:3:0]) dnl #AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
# dnl #AC_SUBST([LT_VERSION_UPNP], [2:3:0])
############################################################################### dnl #
# Release 1.6.0: dnl ############################################################################
# "current:revision:age" dnl # Release 1.6.0:
# dnl # "current:revision:age"
# - Code has changed in ixml dnl #
# revision: 3 -> 4 dnl # - Code has changed in ixml
# - Code has changed in threadutil dnl # revision: 3 -> 4
# revision: 0 -> 1 dnl # - Code has changed in threadutil
# - Code has changed in upnp dnl # revision: 0 -> 1
# revision: 3 -> 4 dnl # - Code has changed in upnp
# - Interface changed in upnp dnl # revision: 3 -> 4
# current: 2 -> 3 dnl # - Interface changed in upnp
# revision: 4 -> 0 dnl # current: 2 -> 3
# - Interface removed in upnp dnl # revision: 4 -> 0
# age: 0 -> 0 dnl # - Interface removed in upnp
# dnl # age: 0 -> 0
#AC_SUBST([LT_VERSION_IXML], [2:4:0]) dnl #
#AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1]) dnl #AC_SUBST([LT_VERSION_IXML], [2:4:0])
#AC_SUBST([LT_VERSION_UPNP], [3:0:0]) dnl #AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
# dnl #AC_SUBST([LT_VERSION_UPNP], [3:0:0])
############################################################################### dnl #
# Release 1.6.1: dnl ############################################################################
# "current:revision:age" dnl # Release 1.6.1:
# dnl # "current:revision:age"
# - Code has changed in threadutil dnl #
# revision: 1 -> 2 dnl # - Code has changed in threadutil
# - Interface added in threadutil dnl # revision: 1 -> 2
# current: 3 -> 4 dnl # - Interface added in threadutil
# revision: 2 -> 0 dnl # current: 3 -> 4
# - Interface added in threadutil dnl # revision: 2 -> 0
# age: 1 -> 2 dnl # - Interface added in threadutil
# - Code has changed in upnp dnl # age: 1 -> 2
# revision: 0 -> 1 dnl # - Code has changed in upnp
# dnl # revision: 0 -> 1
#AC_SUBST([LT_VERSION_IXML], [2:4:0]) dnl #
#AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2]) dnl #AC_SUBST([LT_VERSION_IXML], [2:4:0])
#AC_SUBST([LT_VERSION_UPNP], [3:1:0]) dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
# dnl #AC_SUBST([LT_VERSION_UPNP], [3:1:0])
############################################################################### dnl #
# Release 1.6.2: dnl ############################################################################
# "current:revision:age" dnl # Release 1.6.2:
# dnl # "current:revision:age"
# - Code has changed in upnp dnl #
# revision: 1 -> 2 dnl # - Code has changed in upnp
# dnl # revision: 1 -> 2
#AC_SUBST([LT_VERSION_IXML], [2:4:0]) dnl #
#AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2]) dnl #AC_SUBST([LT_VERSION_IXML], [2:4:0])
#AC_SUBST([LT_VERSION_UPNP], [3:2:0]) dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
# dnl #AC_SUBST([LT_VERSION_UPNP], [3:2:0])
############################################################################### dnl #
# Release 1.6.3: dnl ############################################################################
# "current:revision:age" dnl # Release 1.6.3:
# dnl # "current:revision:age"
# - Code has changed in threadutil dnl #
# revision: 0 -> 1 dnl # - Code has changed in threadutil
# dnl # revision: 0 -> 1
#AC_SUBST([LT_VERSION_IXML], [2:4:0]) dnl #
#AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2]) dnl #AC_SUBST([LT_VERSION_IXML], [2:4:0])
#AC_SUBST([LT_VERSION_UPNP], [3:2:0]) dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
# dnl #AC_SUBST([LT_VERSION_UPNP], [3:2:0])
############################################################################### dnl #
dnl ############################################################################
AC_SUBST([LT_VERSION_IXML], [2:4:0]) AC_SUBST([LT_VERSION_IXML], [2:4:0])
AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2]) AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
AC_SUBST([LT_VERSION_UPNP], [3:2:0]) AC_SUBST([LT_VERSION_UPNP], [3:2:0])
############################################################################### dnl ############################################################################
# Repeating the algorithm so that it is closer to the modificatin place: dnl # Repeating the algorithm to place it closer to the modificatin place:
# - library code modified: revision++ dnl # - library code modified: revision++
# - interfaces changed/added/removed: current++ and revision=0 dnl # - interfaces changed/added/removed: current++ and revision=0
# - interfaces added: age++ dnl # - interfaces added: age++
# - interfaces removed: age=0 dnl # - interfaces removed: age=0
# *please update only once, before a formal release, not for each change* dnl # *please update only once, before a formal release, not for each change*
############################################################################### dnl ############################################################################
AC_CONFIG_AUX_DIR(config.aux) AC_CONFIG_AUX_DIR(config.aux)
@ -151,8 +152,7 @@ AC_REVISION([$Revision: 1.11 $])
upnpmaj=`echo "$PACKAGE_VERSION" | sed 's/\..*//' ` upnpmaj=`echo "$PACKAGE_VERSION" | sed 's/\..*//' `
upnpmin=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.// ; s/[^0-9].*$//' `] upnpmin=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.// ; s/[^0-9].*$//' `]
upnppatch=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.[^.]\.// ; s/[^0-9].*$//' `] upnppatch=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.[^.]\.// ; s/[^0-9].*$//' `]
AC_DEFINE_UNQUOTED([UPNP_VERSION_STRING], "$PACKAGE_VERSION", AC_DEFINE_UNQUOTED([UPNP_VERSION_STRING], "$PACKAGE_VERSION", [see upnpconfig.h])
[see upnpconfig.h])
AC_DEFINE_UNQUOTED([UPNP_VERSION_MAJOR], $upnpmaj, [see upnpconfig.h]) AC_DEFINE_UNQUOTED([UPNP_VERSION_MAJOR], $upnpmaj, [see upnpconfig.h])
AC_DEFINE_UNQUOTED([UPNP_VERSION_MINOR], $upnpmin, [see upnpconfig.h]) AC_DEFINE_UNQUOTED([UPNP_VERSION_MINOR], $upnpmin, [see upnpconfig.h])
AC_DEFINE_UNQUOTED([UPNP_VERSION_PATCH], $upnppatch, [see upnpconfig.h]) AC_DEFINE_UNQUOTED([UPNP_VERSION_PATCH], $upnppatch, [see upnpconfig.h])
@ -174,7 +174,6 @@ fi
# #
# Check for libupnp subsets # Check for libupnp subsets
# #
RT_BOOL_ARG_ENABLE([client], [yes], [control point code (client)]) RT_BOOL_ARG_ENABLE([client], [yes], [control point code (client)])
if test "x$enable_client" = xyes ; then if test "x$enable_client" = xyes ; then
AC_DEFINE(UPNP_HAVE_CLIENT, 1, [see upnpconfig.h]) AC_DEFINE(UPNP_HAVE_CLIENT, 1, [see upnpconfig.h])
@ -208,11 +207,13 @@ fi
RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code]) RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
#
# doc installation # doc installation
# autoconf >= 2.60 already defines ${docdir}, but we will not use its # autoconf >= 2.60 already defines ${docdir}, but we will not use its
# default value, which is ${datarootdir}/doc/${PACKAGE_TARNAME}. # default value, which is ${datarootdir}/doc/${PACKAGE_TARNAME}.
# That would give us ${datarootdir}/doc/libupnp, and we want the package # That would give us ${datarootdir}/doc/libupnp, and we want the package
# version on that. # version on that.
#
docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}" docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
AC_MSG_CHECKING([for documentation directory]) AC_MSG_CHECKING([for documentation directory])
AC_ARG_WITH( AC_ARG_WITH(
@ -227,7 +228,9 @@ AS_HELP_STRING(
[], [],
[with_documentation=no]) [with_documentation=no])
#
# If something has been entered after an equal sign, assume it is the directory # If something has been entered after an equal sign, assume it is the directory
#
if test x"$with_documentation" != xyes -a x"$with_documentation" != xno; then if test x"$with_documentation" != xyes -a x"$with_documentation" != xno; then
docdir="$with_documentation" docdir="$with_documentation"
fi fi
@ -331,7 +334,9 @@ echo "--------------------------- pthread stuff --------------------------------
ACX_PTHREAD( ACX_PTHREAD(
[], [],
[AC_MSG_ERROR([POSIX threads are required to build this program])]) [AC_MSG_ERROR([POSIX threads are required to build this program])])
dnl # Determine if RW-mutex is available #
# Determine if pthread_rwlock_t is available
#
echo "----------------------- pthread_rwlock_t stuff --------------------------------" echo "----------------------- pthread_rwlock_t stuff --------------------------------"
AC_MSG_CHECKING([if pthread_rwlock_t is available]) AC_MSG_CHECKING([if pthread_rwlock_t is available])
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(