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

Update of libupnp.m4.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@447 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2008-07-07 01:07:46 +00:00
parent cb6dfa2824
commit b0f782f9c2
1 changed files with 41 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
upnp/m4/libupnp.m4
View File

@ -1,7 +1,8 @@
# # -*- Autoconf -*-
# This file is part of the aMule project.
# This file is part of the libupnp library project. # This file is part of the libupnp library project.
# #
# Copyright (c) 2008 Marcelo Roberto Jimenez (mroberto@users.sf.net) # Copyright (c) 2003-2008 aMule Team ( admin@amule.org / http://www.amule.org )
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -12,7 +13,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
@ -25,88 +26,64 @@ dnl Check for the libupnp library
dnl -------------------------------------------------------------------------- dnl --------------------------------------------------------------------------
dnl dnl
dnl This macro sets these variables: dnl This macro sets these variables:
dnl - LIBUPNP_PREFIX dnl - LIBUPNP_VERSION
dnl This is the user or system directory where libupnp is installed.
dnl - LIBUPNP_VERSION_STRING
dnl Something like "1.6.7" dnl Something like "1.6.7"
dnl - LIBUPNP_VERSION_NUMBER
dnl Something like 1006007
dnl - LIBUPNP_STYLE
dnl "prefix" or "system"
dnl - LIBUPNP_CPPFLAGS dnl - LIBUPNP_CPPFLAGS
dnl Flags to be added to CPPFLAGS dnl Flags to be added to CPPFLAGS
dnl - LIBUPNP_CFLAGS dnl - LIBUPNP_CFLAGS
dnl Flags to be added to CFLAGS dnl Flags to be added to CFLAGS
dnl - LIBUPNP_LDFLAGS dnl - LIBUPNP_LDFLAGS
dnl Flags to be added to LDFLAGS dnl Flags to be added to LDFLAGS
dnl - LIBUPNP_LDADD dnl - LIBUPNP_LIBS
dnl Library to be added to LDADD dnl Library to be added to LIBS
dnl dnl
dnl The LIBUPNP_CPPFLAGS, LIBUPNP_LDFLAGS and LIBUPNP_LIBS variables are also substituted. dnl The LIBUPNP_CPPFLAGS, LIBUPNP_CFLAGS, LIBUPNP_LDFLAGS and LIBUPNP_LIBS variables are also substituted.
dnl dnl
AC_DEFUN([LIBUPNP_CHECK], AC_DEFUN([LIBUPNP_CHECK],
[dnl [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl
dnl Test for --with dnl Test for --with-libupnp-prefix
AC_ARG_WITH( AC_ARG_WITH(
[libupnp-prefix], [libupnp-prefix],
[AS_HELP_STRING( [AS_HELP_STRING(
[--with-libupnp-prefix=PREFIX], [--with-libupnp-prefix=PREFIX],
[UPnP library location])], [UPnP library location])],
[LIBUPNP_PREFIX="$withval"]) [export PKG_CONFIG_PATH=$withval/lib/pkgconfig])
dnl Check for the presence dnl Check for libupnp >= MIN_LIBUPNP_VERSION
AC_MSG_CHECKING([for libupnp presence]) AS_IF([test $cross_compiling = no], [dnl
AS_IF([test -n "$LIBUPNP_PREFIX"],[dnl
LIBUPNP_STYLE=prefix
LIBUPNP_VERSION_STRING=`PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --modversion`
AS_IF([test -n "$LIBUPNP_VERSION_STRING"], [dnl
result=yes
resultstr=" (prefix specified in --with-libupnp-prefix=PREFIX)"dnl
], [dnl
result=no
resultstr=" (maybe an invalid prefix was specified in --with-libupnp-prefix=PREFIX)"dnl
])dnl
], [dnl
AS_IF([pkg-config libupnp --exists], [dnl
LIBUPNP_PREFIX=`pkg-config libupnp --prefix`
LIBUPNP_STYLE=system
LIBUPNP_VERSION_STRING=`pkg-config libupnp --modversion`
])dnl
AS_IF([test -n "$LIBUPNP_VERSION_STRING"], [dnl
result=yes
resultstr=" (installed in the system)"dnl
], [dnl
result=no
resultstr=" (try to use --with-libupnp-prefix=PREFIX)"dnl
])dnl
])
AC_MSG_RESULT([$result$resultstr])
AS_IF([test x$result = xyes],[dnl
dnl Ok, we know that libupnp is in the system, check for the mininum library version required.
AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION]) AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION])
# Find out the libupnp version and check against the minimum required AS_IF([test -n "$PKG_CONFIG"], [dnl
LIBUPNP_VERSION_NUMBER=`echo $LIBUPNP_VERSION_STRING | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` AS_IF([$PKG_CONFIG libupnp --exists], [dnl
minvers=`echo MIN_LIBUPNP_VERSION | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [dnl
AS_IF([test -n "$LIBUPNP_VERSION_NUMBER" && test "$LIBUPNP_VERSION_NUMBER" -ge $minvers], [dnl result=yes
result=yes resultstr=" (version $LIBUPNP_VERSION)"
resultstr=" (version $LIBUPNP_VERSION_STRING)" LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I`
LIBUPNP_CPPFLAGS=`PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --cflags-only-I` LIBUPNP_CFLAGS=`$PKG_CONFIG libupnp --cflags-only-other`
LIBUPNP_CFLAGS=`PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --cflags-only-other` LIBUPNP_LDFLAGS=`$PKG_CONFIG libupnp --libs-only-L`
LIBUPNP_LDFLAGS=`PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-other` LIBUPNP_LIBS=`$PKG_CONFIG libupnp --libs-only-other`
LIBUPNP_LDADD=`PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-L` LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`"
LIBUPNP_LDADD="$LIBUPNP_LDADD `PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-l`" ], [dnl
AH_TEMPLATE([LIBUPNP_INCLUDE_PREFIX], [Define this to the include prefix of libupnp]) result=no
AC_DEFINE_UNQUOTED([LIBUPNP_INCLUDE_PREFIX], $LIBUPNP_INCLUDE_PREFIX)dnl resultstr=" (version $LIBUPNP_VERSION is not new enough)"
])dnl
], [dnl
result=no
resultstr=" (try to use --with-libupnp-prefix=PREFIX)"
])dnl
], [dnl ], [dnl
result=no result=no
resultstr=" (version $LIBUPNP_VERSION_STRING is not new enough)"dnl resultstr=" (pkg-config not found)"
]) ])dnl
AC_MSG_RESULT([$result$resultstr]) AC_MSG_RESULT([$result$resultstr])
]) libupnp_error="libupnp >= MIN_LIBUPNP_VERSION not found$resultstr"
], [dnl
dnl Currently cross-compilation with libupnp is not supported.
result=no
libupnp_error="cross compiling"
])dnl
dnl Execute the right action. dnl Execute the right action.
AS_IF([test ${result:-no} = yes], [$2], [$3]) AS_IF([test ${result:-no} = yes], [$2], [$3])
@ -115,7 +92,6 @@ dnl Exported symbols
AC_SUBST([LIBUPNP_CPPFLAGS])dnl AC_SUBST([LIBUPNP_CPPFLAGS])dnl
AC_SUBST([LIBUPNP_CFLAGS])dnl AC_SUBST([LIBUPNP_CFLAGS])dnl
AC_SUBST([LIBUPNP_LDFLAGS])dnl AC_SUBST([LIBUPNP_LDFLAGS])dnl
AC_SUBST([LIBUPNP_LDADD])dnl AC_SUBST([LIBUPNP_LIBS])dnl
m4_undefine([MIN_LIBUPNP_VERSION])dnl m4_undefine([MIN_LIBUPNP_VERSION])dnl
]) ])