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

Backport of svn rev. 554:

Browse Source 
Remove excessive 'dnl's from libupnp.m4.


git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@555 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez
2010-06-26 11:09:49 +00:00
parent eec36896c3
commit ce0e5b664f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
upnp/m4/libupnp.m4
View File

@@ -52,12 +52,12 @@ dnl Test for --with-libupnp-prefix
[export PKG_CONFIG_PATH=$withval/lib/pkgconfig]) [export PKG_CONFIG_PATH=$withval/lib/pkgconfig])
dnl Check for libupnp >= MIN_LIBUPNP_VERSION dnl Check for libupnp >= MIN_LIBUPNP_VERSION
AS_IF([test $cross_compiling = no], [dnl AS_IF([test $cross_compiling = no], [
AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION]) AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION])
AS_IF([test -n "$PKG_CONFIG"], [dnl AS_IF([test -n "$PKG_CONFIG"], [
AS_IF([$PKG_CONFIG libupnp --exists], [dnl AS_IF([$PKG_CONFIG libupnp --exists], [
LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion` LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [dnl AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [
result=yes result=yes
resultstr=" (version $LIBUPNP_VERSION)" resultstr=" (version $LIBUPNP_VERSION)"
LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I` LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I`
@@ -65,25 +65,25 @@ dnl Check for libupnp >= MIN_LIBUPNP_VERSION
LIBUPNP_LDFLAGS=`$PKG_CONFIG libupnp --libs-only-L` LIBUPNP_LDFLAGS=`$PKG_CONFIG libupnp --libs-only-L`
LIBUPNP_LIBS=`$PKG_CONFIG libupnp --libs-only-other` LIBUPNP_LIBS=`$PKG_CONFIG libupnp --libs-only-other`
LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`" LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`"
], [dnl ], [
result=no result=no
resultstr=" (version $LIBUPNP_VERSION is not new enough)" resultstr=" (version $LIBUPNP_VERSION is not new enough)"
])dnl ])
], [dnl ], [
result=no result=no
resultstr=" (try to use --with-libupnp-prefix=PREFIX)" resultstr=" (try to use --with-libupnp-prefix=PREFIX)"
])dnl ])
], [dnl ], [
result=no result=no
resultstr=" (pkg-config not found)" 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" libupnp_error="libupnp >= MIN_LIBUPNP_VERSION not found$resultstr"
], [dnl ], [
dnl Currently cross-compilation with libupnp is not supported. dnl Currently cross-compilation with libupnp is not supported.
result=no result=no
libupnp_error="cross compiling" 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])