From e52ce5d402d1aa879578064f8188ef1250895801 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Tue, 1 Jul 2008 08:30:17 +0200 Subject: [PATCH] Upstream tarball 20080701 --- CVSDATE | 2 +- Makefile.in | 15 +- SVNDATE | 2 +- aclocal.m4 | 1 + amule_build_install.sh | 1 + config.h.in | 3 + configure | 101 ++++++++- configure.in | 14 ++ docs/Changelog | 6 + docs/Makefile.in | 15 +- docs/man/Makefile.in | 15 +- m4/libupnp.m4 | 119 +++++++++++ src/Makefile.am | 5 +- src/Makefile.in | 21 +- src/UPnP.cpp | 352 +++++++------------------------- src/UPnP.h | 76 ------- src/UPnPCompatibility.h | 4 +- src/libs/Makefile.in | 15 +- src/libs/common/Makefile.in | 15 +- src/libs/ec/Makefile.in | 15 +- src/libs/ec/cpp/Makefile.in | 15 +- src/pixmaps/Makefile.in | 15 +- src/pixmaps/flags_xpm/Makefile.in | 15 +- src/skins/Makefile.in | 15 +- src/utils/Makefile.in | 15 +- src/utils/aLinkCreator/Makefile.in | 15 +- src/utils/aLinkCreator/docs/Makefile.in | 15 +- src/utils/aLinkCreator/src/Makefile.in | 15 +- src/utils/cas/Makefile.in | 15 +- src/utils/cas/docs/Makefile.in | 15 +- src/utils/fileview/Makefile.in | 15 +- src/utils/wxCas/Makefile.in | 15 +- src/utils/wxCas/docs/Makefile.in | 15 +- src/utils/wxCas/src/Makefile.in | 15 +- src/utils/xas/Makefile.in | 15 +- src/utils/xas/docs/Makefile.in | 15 +- src/webserver/Makefile.in | 15 +- src/webserver/chicane/Makefile.in | 15 +- src/webserver/default/Makefile.in | 15 +- src/webserver/litoral/Makefile.in | 15 +- src/webserver/php-default/Makefile.in | 15 +- src/webserver/src/Makefile.am | 13 +- src/webserver/src/Makefile.in | 36 +++- src/webserver/src/WebServer.cpp | 1 - unittests/Makefile.in | 15 +- unittests/muleunit/Makefile.in | 15 +- unittests/tests/Makefile.in | 15 +- 47 files changed, 671 insertions(+), 536 deletions(-) create mode 100644 m4/libupnp.m4 diff --git a/CVSDATE b/CVSDATE index 0f408a0f..65137f28 100644 --- a/CVSDATE +++ b/CVSDATE @@ -1 +1 @@ -Mon Jun 30 07:01:56 CEST 2008 +Tue Jul 1 07:01:56 CEST 2008 diff --git a/Makefile.in b/Makefile.in index 256240af..070e227e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -60,11 +60,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -210,6 +211,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/SVNDATE b/SVNDATE index 0f408a0f..65137f28 100644 --- a/SVNDATE +++ b/SVNDATE @@ -1 +1 @@ -Mon Jun 30 07:01:56 CEST 2008 +Tue Jul 1 07:01:56 CEST 2008 diff --git a/aclocal.m4 b/aclocal.m4 index 4ec5377c..c00e57db 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -894,6 +894,7 @@ m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) m4_include([m4/libpng.m4]) +m4_include([m4/libupnp.m4]) m4_include([m4/nls.m4]) m4_include([m4/progtest.m4]) m4_include([m4/readline.m4]) diff --git a/amule_build_install.sh b/amule_build_install.sh index 98ab0608..013e98f7 100755 --- a/amule_build_install.sh +++ b/amule_build_install.sh @@ -240,6 +240,7 @@ function build_amule { --with-wx-config=${WXWIDGETS_INSTALL_DIR}/bin/wx-config \ --prefix=${AMULE_INSTALL_DIR} \ --with-crypto-prefix=${CRYPTOPP_INSTALL_DIR} \ + --with-libupnp-prefix=${LIBUPNP_INSTALL_DIR} \ && \ LD_LIBRARY_PATH=${WXWIDGETS_INSTALL_DIR}/lib make -j${JOBS} && \ LD_LIBRARY_PATH=${WXWIDGETS_INSTALL_DIR}/lib make install > /dev/null diff --git a/config.h.in b/config.h.in index a662a3e4..fb2ec28f 100644 --- a/config.h.in +++ b/config.h.in @@ -419,6 +419,9 @@ /* Define if integer division by zero raises signal SIGFPE. */ #undef INTDIV0_RAISES_SIGFPE +/* Define this to the include prefix of libupnp */ +#undef LIBUPNP_INCLUDE_PREFIX + /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK diff --git a/configure b/configure index 53d261cc..d9972633 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os RESOLV_LIB X11LIBS MULECPPFLAGS MULECFLAGS MULECXXFLAGS MULELDFLAGS MULERCFLAGS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP BUILD_CC ac_ct_BUILD_CC EXEEXT BUILD_EXEEXT BUILD_CPPFLAGS BUILD_CFLAGS BUILD_LDFLAGS EGREP LEX LEXLIB LEX_OUTPUT_ROOT RANLIB ac_ct_RANLIB YACC AR ac_ct_AR LD ac_ct_LD ZLIB_CPPFLAGS ZLIB_LDFLAGS ZLIB_LIBS GDLIB_CONFIG_PATH GDLIB_CFLAGS GDLIB_LDFLAGS GDLIB_LIBS CAS_DEFS REGEX_LIBS LIBPNG_CONFIG_PATH LIBPNG_CFLAGS LIBPNG_LDFLAGS LIBPNG_LIBS AMULEWEB_DEFS GEOIP_CPPFLAGS GEOIP_LDFLAGS GEOIP_LIBS WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION_FULL WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_UNICODE WX_DEBUG WX_SHARED WX_PORT WXBASE_LIBS WXBASE_CPPFLAGS RC RCFLAGS ac_ct_RC CRYPTOPP_CPPFLAGS CRYPTOPP_LDFLAGS CRYPTOPP_LIBS BFD_CPPFLAGS BFD_LIBS ALLOCA LIBOBJS POW_LIB MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB AMULE_DAEMON_MANPAGES AMULECMD_MANPAGES WEB_MANPAGES AMULE_GUI_MANPAGES CAS_MANPAGES WXCAS_MANPAGES ED2K_MANPAGES ALC_MANPAGES ALCC_MANPAGES MONOLITHIC_MANPAGES INCINTL docdir SVNDATE WEB_TRUE WEB_FALSE ED2K_TRUE ED2K_FALSE CAS_TRUE CAS_FALSE WXCAS_TRUE WXCAS_FALSE ALC_TRUE ALC_FALSE ALCC_TRUE ALCC_FALSE AMULE_GUI_TRUE AMULE_GUI_FALSE AMULE_DAEMON_TRUE AMULE_DAEMON_FALSE COMPILE_CMD_TRUE COMPILE_CMD_FALSE MONOLITHIC_TRUE MONOLITHIC_FALSE XAS_TRUE XAS_FALSE ENABLE_UPNP_TRUE ENABLE_UPNP_FALSE ENABLE_IP2COUNTRY_TRUE ENABLE_IP2COUNTRY_FALSE SYS_WIN32_TRUE SYS_WIN32_FALSE NEED_RC_TRUE NEED_RC_FALSE NEED_CORESERVICES_TRUE NEED_CORESERVICES_FALSE COMPILE_NLS_TRUE COMPILE_NLS_FALSE GENERATE_FLEX_HEADER_TRUE GENERATE_FLEX_HEADER_FALSE READLINE_LIBS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os RESOLV_LIB X11LIBS MULECPPFLAGS MULECFLAGS MULECXXFLAGS MULELDFLAGS MULERCFLAGS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP BUILD_CC ac_ct_BUILD_CC EXEEXT BUILD_EXEEXT BUILD_CPPFLAGS BUILD_CFLAGS BUILD_LDFLAGS EGREP LEX LEXLIB LEX_OUTPUT_ROOT RANLIB ac_ct_RANLIB YACC AR ac_ct_AR LD ac_ct_LD ZLIB_CPPFLAGS ZLIB_LDFLAGS ZLIB_LIBS GDLIB_CONFIG_PATH GDLIB_CFLAGS GDLIB_LDFLAGS GDLIB_LIBS CAS_DEFS REGEX_LIBS LIBPNG_CONFIG_PATH LIBPNG_CFLAGS LIBPNG_LDFLAGS LIBPNG_LIBS AMULEWEB_DEFS GEOIP_CPPFLAGS GEOIP_LDFLAGS GEOIP_LIBS WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION_FULL WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_UNICODE WX_DEBUG WX_SHARED WX_PORT WXBASE_LIBS WXBASE_CPPFLAGS RC RCFLAGS ac_ct_RC LIBUPNP_CPPFLAGS LIBUPNP_CFLAGS LIBUPNP_LDFLAGS LIBUPNP_LDADD CRYPTOPP_CPPFLAGS CRYPTOPP_LDFLAGS CRYPTOPP_LIBS BFD_CPPFLAGS BFD_LIBS ALLOCA LIBOBJS POW_LIB MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB AMULE_DAEMON_MANPAGES AMULECMD_MANPAGES WEB_MANPAGES AMULE_GUI_MANPAGES CAS_MANPAGES WXCAS_MANPAGES ED2K_MANPAGES ALC_MANPAGES ALCC_MANPAGES MONOLITHIC_MANPAGES INCINTL docdir SVNDATE WEB_TRUE WEB_FALSE ED2K_TRUE ED2K_FALSE CAS_TRUE CAS_FALSE WXCAS_TRUE WXCAS_FALSE ALC_TRUE ALC_FALSE ALCC_TRUE ALCC_FALSE AMULE_GUI_TRUE AMULE_GUI_FALSE AMULE_DAEMON_TRUE AMULE_DAEMON_FALSE COMPILE_CMD_TRUE COMPILE_CMD_FALSE MONOLITHIC_TRUE MONOLITHIC_FALSE XAS_TRUE XAS_FALSE ENABLE_UPNP_TRUE ENABLE_UPNP_FALSE ENABLE_IP2COUNTRY_TRUE ENABLE_IP2COUNTRY_FALSE SYS_WIN32_TRUE SYS_WIN32_FALSE NEED_RC_TRUE NEED_RC_FALSE NEED_CORESERVICES_TRUE NEED_CORESERVICES_FALSE COMPILE_NLS_TRUE COMPILE_NLS_FALSE GENERATE_FLEX_HEADER_TRUE GENERATE_FLEX_HEADER_FALSE READLINE_LIBS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -933,6 +933,8 @@ Optional Packages: even if --disable-debug is given (default is auto) --with-wxversion Build against a specific version of wxWidgets (default is auto) + --with-libupnp-prefix=PREFIX + UPnP library location --with-crypto-prefix=PREFIX prefix where crypto++ is installed --with-x use the X Window System @@ -8152,6 +8154,95 @@ fi fi + +# Check for libupnp +if test "${ENABLE_UPNP:-yes}" = yes; then + + + +# Check whether --with-libupnp-prefix or --without-libupnp-prefix was given. +if test "${with_libupnp_prefix+set}" = set; then + withval="$with_libupnp_prefix" + LIBUPNP_PREFIX="$withval" +fi; + + echo "$as_me:$LINENO: checking for libupnp presence" >&5 +echo $ECHO_N "checking for libupnp presence... $ECHO_C" >&6 + if test -n "$LIBUPNP_PREFIX"; then + LIBUPNP_STYLE=prefix + LIBUPNP_VERSION_STRING=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --modversion) + if test -n "LIBUPNP_VERSION_STRING"; then + result=yes + resultstr=" (prefix specified in --with-libupnp-prefix=PREFIX)" +else + result=no + resultstr=" (maybe an invalid prefix was specified in --with-libupnp-prefix=PREFIX)" +fi + +else + LIBUPNP_PREFIX=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --prefix) + LIBUPNP_STYLE=system + LIBUPNP_VERSION_STRING=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --modversion) + if test -n "LIBUPNP_VERSION_STRING"; then + result=yes + resultstr=" (installed in the system)" +else + result=no + resultstr=" (try to use --with-libupnp-prefix=PREFIX)" +fi + +fi + + echo "$as_me:$LINENO: result: $result$resultstr" >&5 +echo "${ECHO_T}$result$resultstr" >&6 + + if test x$result = xyes; then + echo "$as_me:$LINENO: checking for libupnp version >= 1.6.6" >&5 +echo $ECHO_N "checking for libupnp version >= 1.6.6... $ECHO_C" >&6 + # Find out the libupnp version and check against the minimum required + LIBUPNP_VERSION_NUMBER=`echo $LIBUPNP_VERSION_STRING | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + minvers=`echo 1.6.6 | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + + if test -n "$LIBUPNP_VERSION_NUMBER" && test "$LIBUPNP_VERSION_NUMBER" -ge $minvers; then + result=yes + resultstr=" (version $LIBUPNP_VERSION_STRING)" + LIBUPNP_CPPFLAGS=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --cflags-only-I) + LIBUPNP_CFLAGS=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --cflags-only-other) + LIBUPNP_LDFLAGS=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-other) + LIBUPNP_LDADD=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-L) + LIBUPNP_LDADD="$LIBUPNP_LDADD $(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-l)" + + + cat >>confdefs.h <<_ACEOF +#define LIBUPNP_INCLUDE_PREFIX $LIBUPNP_INCLUDE_PREFIX +_ACEOF + +else + result=no + resultstr=" (version $LIBUPNP_VERSION_STRING is not new enough)" +fi + + echo "$as_me:$LINENO: result: $result$resultstr" >&5 +echo "${ECHO_T}$result$resultstr" >&6 + +fi + + + if test ${result:-no} = yes; then + : +else + { { echo "$as_me:$LINENO: error: Unable to find libupnp." >&5 +echo "$as_me: error: Unable to find libupnp." >&2;} + { (exit 1); exit 1; }; } + +fi + + + + +fi + + # Check for Crypto++ @@ -20031,6 +20122,10 @@ s,@WXBASE_CPPFLAGS@,$WXBASE_CPPFLAGS,;t t s,@RC@,$RC,;t t s,@RCFLAGS@,$RCFLAGS,;t t s,@ac_ct_RC@,$ac_ct_RC,;t t +s,@LIBUPNP_CPPFLAGS@,$LIBUPNP_CPPFLAGS,;t t +s,@LIBUPNP_CFLAGS@,$LIBUPNP_CFLAGS,;t t +s,@LIBUPNP_LDFLAGS@,$LIBUPNP_LDFLAGS,;t t +s,@LIBUPNP_LDADD@,$LIBUPNP_LDADD,;t t s,@CRYPTOPP_CPPFLAGS@,$CRYPTOPP_CPPFLAGS,;t t s,@CRYPTOPP_LDFLAGS@,$CRYPTOPP_LDFLAGS,;t t s,@CRYPTOPP_LIBS@,$CRYPTOPP_LIBS,;t t @@ -20991,6 +21086,10 @@ fi echo " wxWidgets ${WX_VERSION_FULL} ($wxinfo)" echo " crypto++ ${CRYPTOPP_VERSION_STRING} (${CRYPTOPP_STYLE}, in ${CRYPTOPP_PREFIX})" +if test x${ENABLE_UPNP} = xyes; then + echo " libupnp ${LIBUPNP_VERSION_STRING} (${LIBUPNP_STYLE}, in ${LIBUPNP_PREFIX})" +fi + if test x${WEB:-no} != xno; then if test $regex_found = no; then regex_found="Not detected" diff --git a/configure.in b/configure.in index f41e2c80..4072eb84 100644 --- a/configure.in +++ b/configure.in @@ -301,6 +301,17 @@ AS_IF([test ${SYS:-unknown} = win32], MULERCFLAGS=`$WX_CONFIG_WITH_ARGS --cflags | $AWK ['{ for (i = 1; i <= NF; i++) if (index($i, "-I") != 1 && index($i, "-D") != 1) $i = ""; print }']` ]) + +# Check for libupnp +AS_IF([test "${ENABLE_UPNP:-yes}" = yes], [ + LIBUPNP_CHECK( + [1.6.6], + [], + [AC_MSG_ERROR([Unable to find libupnp.])] + ) +])dnl + + # Check for Crypto++ MULE_CHECK_CRYPTOPP([5.1], [ # Check for CryptoPP >= 5.5 @@ -572,6 +583,9 @@ AS_IF([test $WX_DEBUG -eq 1], [wxinfo="$wxinfo,debug"]) AS_IF([test $WX_SHARED -eq 1], [wxinfo="$wxinfo,shared"], [wxinfo="$wxinfo,static"]) echo " wxWidgets ${WX_VERSION_FULL} ($wxinfo)" echo " crypto++ ${CRYPTOPP_VERSION_STRING} (${CRYPTOPP_STYLE}, in ${CRYPTOPP_PREFIX})" +AS_IF([test x${ENABLE_UPNP} = xyes],[dnl +echo " libupnp ${LIBUPNP_VERSION_STRING} (${LIBUPNP_STYLE}, in ${LIBUPNP_PREFIX})"dnl +]) if test x${WEB:-no} != xno; then AS_IF([test $regex_found = no], [regex_found="Not detected"], diff --git a/docs/Changelog b/docs/Changelog index 2348fef3..4523779a 100644 --- a/docs/Changelog +++ b/docs/Changelog @@ -25,6 +25,12 @@ Version 2.2.2 - Whatever comes next. * Fix wrong usage of CPath::IsOk which caused an infinite loop on Import * Fix wxTempFile usage for compressed IPFilter files + Phoenix: + * Removed the dlopen() code from UPnP.cpp. + * Added the m4 macro to test for libupnp. + * Updated amule_build_install.sh to work with + --with-libupnp-prefix. + Stu Redman: * scanner fix for MSVC compilation * Sort DownloadListCtrl on startup diff --git a/docs/Makefile.in b/docs/Makefile.in index 8abf8e7a..dbcb9396 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -184,6 +185,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/docs/man/Makefile.in b/docs/man/Makefile.in index a8380d70..7aeb434e 100644 --- a/docs/man/Makefile.in +++ b/docs/man/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -165,6 +166,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/m4/libupnp.m4 b/m4/libupnp.m4 new file mode 100644 index 00000000..6ea19cda --- /dev/null +++ b/m4/libupnp.m4 @@ -0,0 +1,119 @@ +# +# This file is part of the libupnp library project. +# +# Copyright (c) 2008 Marcelo Roberto Jimenez (mroberto@users.sf.net) +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +# + +dnl -------------------------------------------------------------------------- +dnl LIBUPNP_CHECK([VERSION = 1.6.6], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl +dnl Check for the libupnp library +dnl -------------------------------------------------------------------------- +dnl +dnl This macro sets these variables: +dnl - LIBUPNP_PREFIX +dnl This is the user or system directory where libupnp is installed. +dnl - LIBUPNP_VERSION_STRING +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 Flags to be added to CPPFLAGS +dnl - LIBUPNP_CFLAGS +dnl Flags to be added to CFLAGS +dnl - LIBUPNP_LDFLAGS +dnl Flags to be added to LDFLAGS +dnl - LIBUPNP_LDADD +dnl Library to be added to LDADD +dnl +dnl The LIBUPNP_CPPFLAGS, LIBUPNP_LDFLAGS and LIBUPNP_LIBS variables are also substituted. +dnl +AC_DEFUN([LIBUPNP_CHECK], +[dnl +m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl + +dnl Test for --with + AC_ARG_WITH( + [libupnp-prefix], + [AS_HELP_STRING( + [--with-libupnp-prefix=PREFIX], + [UPnP library location])], + [LIBUPNP_PREFIX="$withval"]) + +dnl Check for the presence + AC_MSG_CHECKING([for libupnp presence]) + 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 + LIBUPNP_PREFIX=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --prefix) + LIBUPNP_STYLE=system + 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=" (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]) + # Find out the libupnp version and check against the minimum required + LIBUPNP_VERSION_NUMBER=`echo $LIBUPNP_VERSION_STRING | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` + minvers=`echo MIN_LIBUPNP_VERSION | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` + + AS_IF([test -n "$LIBUPNP_VERSION_NUMBER" && test "$LIBUPNP_VERSION_NUMBER" -ge $minvers], [dnl + result=yes + resultstr=" (version $LIBUPNP_VERSION_STRING)" + LIBUPNP_CPPFLAGS=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --cflags-only-I) + LIBUPNP_CFLAGS=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --cflags-only-other) + LIBUPNP_LDFLAGS=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-other) + LIBUPNP_LDADD=$(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-L) + LIBUPNP_LDADD="$LIBUPNP_LDADD $(PKG_CONFIG_PATH=$LIBUPNP_PREFIX/lib/pkgconfig pkg-config libupnp --libs-only-l)" + AH_TEMPLATE([LIBUPNP_INCLUDE_PREFIX], [Define this to the include prefix of libupnp]) + AC_DEFINE_UNQUOTED([LIBUPNP_INCLUDE_PREFIX], $LIBUPNP_INCLUDE_PREFIX)dnl + ], [dnl + result=no + resultstr=" (version $LIBUPNP_VERSION_STRING is not new enough)"dnl + ]) + AC_MSG_RESULT([$result$resultstr]) + ]) + +dnl Execute the right action. + m4_ifval([$2$3], [AS_IF([test ${result:-no} = yes], [$2], [$3])]) + +dnl Exported symbols +AC_SUBST([LIBUPNP_CPPFLAGS])dnl +AC_SUBST([LIBUPNP_CFLAGS])dnl +AC_SUBST([LIBUPNP_LDFLAGS])dnl +AC_SUBST([LIBUPNP_LDADD])dnl +m4_undefine([MIN_LIBUPNP_VERSION])dnl +]) + diff --git a/src/Makefile.am b/src/Makefile.am index 5e3dda6e..69102812 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -226,7 +226,7 @@ common_sources = \ # Libs -core_libs = -L. -lmuleappcore +core_libs = -L. -lmuleappcore $(LIBUPNP_LDADD) gui_libs = -L. -lmuleappgui $(X11LIBS) $(WX_LIBS) $(GEOIP_LDFLAGS) $(GEOIP_LIBS) remote_common_libs = -Llibs/common -Llibs/ec/cpp -lmulecommon -lec $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(RESOLV_LIB) $(BFD_LIBS) common_libs = -L. -lmuleappcommon $(remote_common_libs) $(CRYPTOPP_LDFLAGS) $(CRYPTOPP_LIBS) @@ -245,7 +245,7 @@ endif # core_flags = if ENABLE_UPNP -core_flags += -DENABLE_UPNP=1 +core_flags += -DENABLE_UPNP=1 $(LIBUPNP_CPPFLAGS) $(LIBUPNP_CFLAGS) endif gui_flags = $(WX_CPPFLAGS) $(GEOIP_CPPFLAGS) @@ -527,3 +527,4 @@ endif EXTRA__DIST__SUBDIRS = include kademlia remote-gui.net include $(top_srcdir)/automake/dist-hook.am + diff --git a/src/Makefile.in b/src/Makefile.in index 2d12aac5..0032fba0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62,7 +62,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ @ENABLE_IP2COUNTRY_TRUE@ IP2Country.cpp @SYS_WIN32_TRUE@am__append_15 = -lshlwapi -@ENABLE_UPNP_TRUE@am__append_16 = -DENABLE_UPNP=1 +@ENABLE_UPNP_TRUE@am__append_16 = -DENABLE_UPNP=1 $(LIBUPNP_CPPFLAGS) $(LIBUPNP_CFLAGS) @NEED_RC_TRUE@am__append_17 = amulerc.$(OBJEXT) @NEED_RC_TRUE@am__append_18 = amulerc.$(OBJEXT) @NEED_RC_TRUE@am__append_19 = amuleguirc.$(OBJEXT) @@ -80,11 +80,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -240,7 +241,7 @@ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) @NEED_RC_TRUE@am__DEPENDENCIES_5 = amulerc.$(OBJEXT) am__objects_7 = amulecmd-OtherFunctions.$(OBJEXT) \ amulecmd-NetworkFunctions.$(OBJEXT) @@ -504,6 +505,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -753,7 +758,7 @@ common_sources = \ # Libs -core_libs = -L. -lmuleappcore $(am__append_15) +core_libs = -L. -lmuleappcore $(LIBUPNP_LDADD) $(am__append_15) gui_libs = -L. -lmuleappgui $(X11LIBS) $(WX_LIBS) $(GEOIP_LDFLAGS) $(GEOIP_LIBS) remote_common_libs = -Llibs/common -Llibs/ec/cpp -lmulecommon -lec $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(RESOLV_LIB) $(BFD_LIBS) common_libs = -L. -lmuleappcommon $(remote_common_libs) $(CRYPTOPP_LDFLAGS) $(CRYPTOPP_LIBS) diff --git a/src/UPnP.cpp b/src/UPnP.cpp index 6d5b568f..0050d542 100644 --- a/src/UPnP.cpp +++ b/src/UPnP.cpp @@ -75,43 +75,6 @@ m_key() } -CDynamicLibHandle::CDynamicLibHandle(const char *libname) -: -m_libname(libname), -m_LibraryHandle(dlopen(libname, RTLD_LAZY)) -{ - std::ostringstream msg; - if (!m_LibraryHandle) { - msg << "error(CDynamicLibHandle): Unable to dlopen " << - m_libname << ". Check PATH and LD_LIBRARY_PATH."; - AddLogLineM(true, logUPnP, msg); -// throw CUPnPException(msg); - } else { - msg << "Successfully opened " << m_libname << "."; - AddLogLineM(false, logUPnP, msg); - } -} - - -CDynamicLibHandle::~CDynamicLibHandle() -{ - if (m_LibraryHandle) { - std::ostringstream msg; - int err_code = dlclose(m_LibraryHandle); - if (err_code) { - msg << "error(CDynamicLibHandle): Error closing " << - m_libname << ": " << dlerror() << - "."; - fprintf(stderr, "%s\n", msg.str().c_str()); - AddLogLineM(true, logUPnP, msg); - } else { - msg << "Successfully closed " << m_libname << "."; - AddLogLineM(false, logUPnP, msg); - } - } -} - - const std::string &CUPnPLib::UPNP_ROOT_DEVICE = "upnp:rootdevice"; @@ -134,187 +97,16 @@ const std::string &CUPnPLib::UPNP_SERVICE_WAN_PPP_CONNECTION = "urn:schemas-upnp-org:service:WANPPPConnection:1"; -const char *CUPnPLib::s_LibIXMLSymbols[] = -{ -/* 0*/ "ixmlNode_getFirstChild", -/* 1*/ "ixmlNode_getNextSibling", -/* 2*/ "ixmlNode_getNodeName", -/* 3*/ "ixmlNode_getNodeValue", -/* 4*/ "ixmlNode_getAttributes", -/* 5*/ "ixmlDocument_free", -/* 6*/ "ixmlNamedNodeMap_getNamedItem", -/* 7*/ "ixmlNamedNodeMap_free", -}; - - -const char *CUPnPLib::s_LibUPnPSymbols[] = -{ -/* 0*/ "UpnpInit", -/* 1*/ "UpnpFinish", -/* 2*/ "UpnpGetServerPort", -/* 3*/ "UpnpGetServerIpAddress", -/* 4*/ "UpnpRegisterClient", -/* 5*/ "UpnpUnRegisterClient", -/* 6*/ "UpnpSearchAsync", -/* 7*/ "UpnpGetServiceVarStatus", -/* 8*/ "UpnpSendAction", -/* 9*/ "UpnpSendActionAsync", -/*10*/ "UpnpSubscribe", -/*11*/ "UpnpUnSubscribe", -/*12*/ "UpnpDownloadXmlDoc", -/*13*/ "UpnpResolveURL", -/*14*/ "UpnpMakeAction", -/*15*/ "UpnpAddToAction", -/*16*/ "UpnpGetErrorMessage", -}; - - -#ifdef __DARWIN__ - #include - #include - - // Dynamic libraries have different names in different systems - const char *libIXMLName = "libixml.2.dylib"; - const char *libUPnP2Name = "libupnp.2.dylib"; - const char *libUPNP3Name = "libupnp.3.dylib"; -#else // Linux and other compatible systems - const char *libIXMLName = "libixml.so.2"; - const char *libUPnP2Name = "libupnp.so.2"; - const char *libUPNP3Name = "libupnp.so.3"; -#endif - - -const std::string CUPnPLib::addLibraryPath(const char *name) -{ -#ifdef __DARWIN__ - CFBundleRef bundle = CFBundleGetMainBundle(); - CFURLRef frameworkURL = CFBundleCopyPrivateFrameworksURL(bundle); - CFStringRef libName = CFStringCreateWithCString(NULL, name, kCFStringEncodingUTF8); - CFURLRef libURL = CFURLCreateCopyAppendingPathComponent( - NULL, frameworkURL, libName, false); - char result[MAXPATHLEN]; - CFURLGetFileSystemRepresentation( - libURL, true, (UInt8 *)result, (CFIndex)MAXPATHLEN); - CFRelease(libName); - CFRelease(libURL); - CFRelease(frameworkURL); - - return static_cast(result); -#else // Linux and other compatible systems - return static_cast(name); -#endif -} - - CUPnPLib::CUPnPLib(CUPnPControlPoint &ctrlPoint) : -m_ctrlPoint(ctrlPoint), -m_LibIXMLHandle(addLibraryPath(libIXMLName).c_str()), -m_LibUPnPHandle2(addLibraryPath(libUPnP2Name).c_str()), -m_LibUPnPHandle3(addLibraryPath(libUPNP3Name).c_str()), -m_LibUPnPHandle(NULL) +m_ctrlPoint(ctrlPoint) { - // There are two versions of libUPnP in the market, - // check for the one that we have in the system. - if (m_LibUPnPHandle3.Get()) { - m_LibUPnPHandle = &m_LibUPnPHandle3; - } else if (m_LibUPnPHandle2.Get()) { - m_LibUPnPHandle = &m_LibUPnPHandle2; - } else { - std::ostringstream msg; - msg << "error(CDynamicLibHandle): Unable to dlopen " - "one or more UPnP component libraries. " - "Check PATH and LD_LIBRARY_PATH."; - AddLogLineM(true, logUPnP, msg); - throw CUPnPException(msg); - } - - // IXML - m_ixmlNode_getFirstChild = - REINTERPRET_CAST(IXML_Node *(*)(IXML_Node *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[0])); - m_ixmlNode_getNextSibling = - REINTERPRET_CAST(IXML_Node *(*)(IXML_Node *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[1])); - m_ixmlNode_getNodeName = - REINTERPRET_CAST(const DOMString (*)(IXML_Node *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[2])); - m_ixmlNode_getNodeValue = - REINTERPRET_CAST(const DOMString (*)(IXML_Node *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[3])); - m_ixmlNode_getAttributes = - REINTERPRET_CAST(IXML_NamedNodeMap *(*)(IXML_Node *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[4])); - m_ixmlDocument_free = - REINTERPRET_CAST(void (*)(IXML_Document *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[5])); - m_ixmlNamedNodeMap_getNamedItem = - REINTERPRET_CAST(IXML_Node *(*)(IXML_NamedNodeMap *, const DOMString)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[6])); - m_ixmlNamedNodeMap_free = - REINTERPRET_CAST(void (*)(IXML_NamedNodeMap *)) - (dlsym(m_LibIXMLHandle.Get(), s_LibIXMLSymbols[7])); - - // UPnP - m_UpnpInit = - REINTERPRET_CAST(int (*)(const char *, int)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[0])); - m_UpnpFinish = - REINTERPRET_CAST(void (*)()) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[1])); - m_UpnpGetServerPort = - REINTERPRET_CAST(unsigned short (*)()) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[2])); - m_UpnpGetServerIpAddress = - REINTERPRET_CAST(char * (*)()) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[3])); - m_UpnpRegisterClient = - REINTERPRET_CAST(int (*)(Upnp_FunPtr, const void *, UpnpClient_Handle *)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[4])); - m_UpnpUnRegisterClient = - REINTERPRET_CAST(int (*)(UpnpClient_Handle)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[5])); - m_UpnpSearchAsync = - REINTERPRET_CAST(int (*)(UpnpClient_Handle, int, const char *, const void *)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[6])); - m_UpnpGetServiceVarStatus = - REINTERPRET_CAST(int (*)(UpnpClient_Handle, const char *, const char *, DOMString *)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[7])); - m_UpnpSendAction = - REINTERPRET_CAST(int (*)(UpnpClient_Handle, const char *, const char *, const char *, - IXML_Document *, IXML_Document **)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[8])); - m_UpnpSendActionAsync = - REINTERPRET_CAST(int (*)(UpnpClient_Handle, const char *, const char *, const char *, - IXML_Document *, Upnp_FunPtr, const void *)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[9])); - m_UpnpSubscribe = - REINTERPRET_CAST(int (*)(UpnpClient_Handle, const char *, int *, Upnp_SID)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[10])); - m_UpnpUnSubscribe = - REINTERPRET_CAST(int (*)(UpnpClient_Handle, Upnp_SID)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[11])); - m_UpnpDownloadXmlDoc = - REINTERPRET_CAST(int (*)(const char *, IXML_Document **)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[12])); - m_UpnpResolveURL = - REINTERPRET_CAST(int (*)(const char *, const char *, char *)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[13])); - m_UpnpMakeAction = - REINTERPRET_CAST(IXML_Document *(*)(const char *, const char *, int, const char *, ...)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[14])); - m_UpnpAddToAction = - REINTERPRET_CAST(int (*)(IXML_Document **, const char *, const char *, const char *, const char *)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[15])); - m_UpnpGetErrorMessage = - REINTERPRET_CAST(const char *(*)(int)) - (dlsym(m_LibUPnPHandle->Get(), s_LibUPnPSymbols[16])); } std::string CUPnPLib::GetUPnPErrorMessage(int code) const { - return m_UpnpGetErrorMessage(code); + return UpnpGetErrorMessage(code); } @@ -383,61 +175,61 @@ void CUPnPLib::ProcessActionResponse( } -/** - * This function returns the root node of a given document. +/*! + * \brief Returns the root node of a given document. */ IXML_Element *CUPnPLib::Element_GetRootElement( IXML_Document *doc) const { IXML_Element *root = REINTERPRET_CAST(IXML_Element *)( - m_ixmlNode_getFirstChild( + ixmlNode_getFirstChild( REINTERPRET_CAST(IXML_Node *)(doc))); return root; } -/** - * This function returns the first child of a given element. +/*! + * \brief Returns the first child of a given element. */ IXML_Element *CUPnPLib::Element_GetFirstChild( IXML_Element *parent) const { IXML_Node *node = REINTERPRET_CAST(IXML_Node *)(parent); - IXML_Node *child = m_ixmlNode_getFirstChild(node); + IXML_Node *child = ixmlNode_getFirstChild(node); return REINTERPRET_CAST(IXML_Element *)(child); } -/** - * This function returns the next sibling of a given child. +/*! + * \brief Returns the next sibling of a given child. */ IXML_Element *CUPnPLib::Element_GetNextSibling( IXML_Element *child) const { IXML_Node *node = REINTERPRET_CAST(IXML_Node *)(child); - IXML_Node *sibling = m_ixmlNode_getNextSibling(node); + IXML_Node *sibling = ixmlNode_getNextSibling(node); return REINTERPRET_CAST(IXML_Element *)(sibling); } -/** - * This function returns the element tag (name) +/*! + * \brief Returns the element tag (name) */ const DOMString CUPnPLib::Element_GetTag( IXML_Element *element) const { IXML_Node *node = REINTERPRET_CAST(IXML_Node *)(element); - const DOMString tag = m_ixmlNode_getNodeName(node); + const DOMString tag = ixmlNode_getNodeName(node); return tag; } -/** - * This function returns the TEXT node value of the current node. +/*! + * \brief Returns the TEXT node value of the current node. */ const std::string CUPnPLib::Element_GetTextValue( IXML_Element *element) const @@ -445,9 +237,9 @@ const std::string CUPnPLib::Element_GetTextValue( if (!element) { return stdEmptyString; } - IXML_Node *text = m_ixmlNode_getFirstChild( + IXML_Node *text = ixmlNode_getFirstChild( REINTERPRET_CAST(IXML_Node *)(element)); - const DOMString s = m_ixmlNode_getNodeValue(text); + const DOMString s = ixmlNode_getNodeValue(text); std::string ret; if (s) { ret = s; @@ -457,8 +249,8 @@ const std::string CUPnPLib::Element_GetTextValue( } -/** - * This function returns the TEXT node value of the first child matching tag. +/*! + * \brief Returns the TEXT node value of the first child matching tag. */ const std::string CUPnPLib::Element_GetChildValueByTag( IXML_Element *element, @@ -471,8 +263,8 @@ const std::string CUPnPLib::Element_GetChildValueByTag( } -/** - * Returns the first child element that matches the requested tag or +/*! + * \brief Returns the first child element that matches the requested tag or * NULL if not found. */ IXML_Element *CUPnPLib::Element_GetFirstChildByTag( @@ -484,19 +276,19 @@ IXML_Element *CUPnPLib::Element_GetFirstChildByTag( } IXML_Node *node = REINTERPRET_CAST(IXML_Node *)(element); - IXML_Node *child = m_ixmlNode_getFirstChild(node); - const DOMString childTag = m_ixmlNode_getNodeName(child); + IXML_Node *child = ixmlNode_getFirstChild(node); + const DOMString childTag = ixmlNode_getNodeName(child); while(child && childTag && strcmp(tag, childTag)) { - child = m_ixmlNode_getNextSibling(child); - childTag = m_ixmlNode_getNodeName(child); + child = ixmlNode_getNextSibling(child); + childTag = ixmlNode_getNodeName(child); } return REINTERPRET_CAST(IXML_Element *)(child); } -/** - * Returns the next sibling element that matches the requested tag. Should be +/*! + * \brief Returns the next sibling element that matches the requested tag. Should be * used with the return value of Element_GetFirstChildByTag(). */ IXML_Element *CUPnPLib::Element_GetNextSiblingByTag( @@ -509,8 +301,8 @@ IXML_Element *CUPnPLib::Element_GetNextSiblingByTag( IXML_Node *child = REINTERPRET_CAST(IXML_Node *)(element); const DOMString childTag = NULL; do { - child = m_ixmlNode_getNextSibling(child); - childTag = m_ixmlNode_getNodeName(child); + child = ixmlNode_getNextSibling(child); + childTag = ixmlNode_getNodeName(child); } while(child && childTag && strcmp(tag, childTag)); return REINTERPRET_CAST(IXML_Element *)(child); @@ -520,15 +312,15 @@ IXML_Element *CUPnPLib::Element_GetNextSiblingByTag( const std::string CUPnPLib::Element_GetAttributeByTag( IXML_Element *element, const DOMString tag) const { - IXML_NamedNodeMap *NamedNodeMap = m_ixmlNode_getAttributes( + IXML_NamedNodeMap *NamedNodeMap = ixmlNode_getAttributes( REINTERPRET_CAST(IXML_Node *)(element)); - IXML_Node *attribute = m_ixmlNamedNodeMap_getNamedItem(NamedNodeMap, tag); - const DOMString s = m_ixmlNode_getNodeValue(attribute); + IXML_Node *attribute = ixmlNamedNodeMap_getNamedItem(NamedNodeMap, tag); + const DOMString s = ixmlNode_getNodeValue(attribute); std::string ret; if (s) { ret = s; } - m_ixmlNamedNodeMap_free(NamedNodeMap); + ixmlNamedNodeMap_free(NamedNodeMap); return ret; } @@ -675,7 +467,7 @@ m_SCPD(NULL) std::vector vscpdURL(URLBase.length() + m_SCPDURL.length() + 1); char *scpdURL = &vscpdURL[0]; - errcode = upnpLib.m_UpnpResolveURL( + errcode = UpnpResolveURL( URLBase.c_str(), m_SCPDURL.c_str(), scpdURL); @@ -691,7 +483,7 @@ m_SCPD(NULL) std::vector vcontrolURL( URLBase.length() + m_controlURL.length() + 1); char *controlURL = &vcontrolURL[0]; - errcode = upnpLib.m_UpnpResolveURL( + errcode = UpnpResolveURL( URLBase.c_str(), m_controlURL.c_str(), controlURL); @@ -707,7 +499,7 @@ m_SCPD(NULL) std::vector veventURL( URLBase.length() + m_eventSubURL.length() + 1); char *eventURL = &veventURL[0]; - errcode = upnpLib.m_UpnpResolveURL( + errcode = UpnpResolveURL( URLBase.c_str(), m_eventSubURL.c_str(), eventURL); @@ -854,7 +646,7 @@ bool CUPnPService::Execute( IXML_Document *ActionDoc = NULL; if (ArgValue.size()) { for (unsigned int i = 0; i < ArgValue.size(); ++i) { - int ret = m_upnpLib.m_UpnpAddToAction( + int ret = UpnpAddToAction( &ActionDoc, action.GetName().c_str(), GetServiceType().c_str(), @@ -862,24 +654,24 @@ bool CUPnPService::Execute( ArgValue[i].GetValue().c_str()); if (ret != UPNP_E_SUCCESS) { m_upnpLib.processUPnPErrorMessage( - "m_UpnpAddToAction", ret, NULL, NULL); + "UpnpAddToAction", ret, NULL, NULL); return false; } } } else { - ActionDoc = m_upnpLib.m_UpnpMakeAction( + ActionDoc = UpnpMakeAction( action.GetName().c_str(), GetServiceType().c_str(), 0, NULL); if (!ActionDoc) { - msg << "Error: m_UpnpMakeAction returned NULL."; + msg << "Error: UpnpMakeAction returned NULL."; AddLogLineM(false, logUPnP, msg); return false; } } #if 0 // Send the action asynchronously - m_upnpLib.m_UpnpSendActionAsync( + UpnpSendActionAsync( m_UPnPControlPoint.GetUPnPClientHandle(), GetAbsControlURL().c_str(), GetServiceType().c_str(), @@ -891,26 +683,26 @@ bool CUPnPService::Execute( // Send the action synchronously IXML_Document *RespDoc = NULL; - int ret = m_upnpLib.m_UpnpSendAction( + int ret = UpnpSendAction( m_UPnPControlPoint.GetUPnPClientHandle(), GetAbsControlURL().c_str(), GetServiceType().c_str(), NULL, ActionDoc, &RespDoc); if (ret != UPNP_E_SUCCESS) { m_upnpLib.processUPnPErrorMessage( - "m_UpnpSendAction", ret, NULL, RespDoc); - m_upnpLib.m_ixmlDocument_free(ActionDoc); - m_upnpLib.m_ixmlDocument_free(RespDoc); + "UpnpSendAction", ret, NULL, RespDoc); + ixmlDocument_free(ActionDoc); + ixmlDocument_free(RespDoc); return false; } - m_upnpLib.m_ixmlDocument_free(ActionDoc); + ixmlDocument_free(ActionDoc); // Check the response document m_upnpLib.ProcessActionResponse( RespDoc, action.GetName()); // Free the response document - m_upnpLib.m_ixmlDocument_free(RespDoc); + ixmlDocument_free(RespDoc); return true; } @@ -921,7 +713,7 @@ const std::string CUPnPService::GetStateVariable( { std::ostringstream msg; DOMString StVarVal; - int ret = m_upnpLib.m_UpnpGetServiceVarStatus( + int ret = UpnpGetServiceVarStatus( m_UPnPControlPoint.GetUPnPClientHandle(), GetAbsControlURL().c_str(), stateVariableName.c_str(), @@ -929,7 +721,7 @@ const std::string CUPnPService::GetStateVariable( if (ret != UPNP_E_SUCCESS) { msg << "GetStateVariable(\"" << stateVariableName << - "\"): in a call to m_UpnpGetServiceVarStatus"; + "\"): in a call to UpnpGetServiceVarStatus"; m_upnpLib.processUPnPErrorMessage( msg.str(), ret, StVarVal, NULL); return stdEmptyString; @@ -971,7 +763,7 @@ m_presentationURL (upnpLib.Element_GetChildValueByTag(device, "presentationURL" strlen(m_presentationURL.c_str()) + 2; std::vector vpresURL(presURLlen); char* presURL = &vpresURL[0]; - int errcode = upnpLib.m_UpnpResolveURL( + int errcode = UpnpResolveURL( URLBase.c_str(), m_presentationURL.c_str(), presURL); @@ -1051,18 +843,18 @@ m_WanService(NULL) int ret; char *ipAddress = NULL; unsigned short port = 0; - ret = m_upnpLib.m_UpnpInit(ipAddress, udpPort); + ret = UpnpInit(ipAddress, udpPort); if (ret != UPNP_E_SUCCESS) { msg << "error(UpnpInit): Error code "; goto error; } - port = m_upnpLib.m_UpnpGetServerPort(); - ipAddress = m_upnpLib.m_UpnpGetServerIpAddress(); + port = UpnpGetServerPort(); + ipAddress = UpnpGetServerIpAddress(); msg << "bound to " << ipAddress << ":" << port << "."; AddLogLineM(false, logUPnP, msg); msg.str(""); - ret = m_upnpLib.m_UpnpRegisterClient( + ret = UpnpRegisterClient( static_cast(&CUPnPControlPoint::Callback), &m_UPnPClientHandle, &m_UPnPClientHandle); @@ -1080,10 +872,10 @@ m_WanService(NULL) // We should not search twice, because this will produce two // UPNP_DISCOVERY_SEARCH_TIMEOUT events, and we might end with problems // on the mutex. - ret = m_upnpLib.m_UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_ROOT_DEVICE.c_str(), NULL); - //ret = m_upnpLib.m_UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_DEVICE_IGW.c_str(), this); - //ret = m_upnpLib.m_UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_DEVICE_LAN.c_str(), this); - //ret = m_upnpLib.m_UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_DEVICE_WAN_CONNECTION.c_str(), this); + ret = UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_ROOT_DEVICE.c_str(), NULL); + //ret = UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_DEVICE_IGW.c_str(), this); + //ret = UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_DEVICE_LAN.c_str(), this); + //ret = UpnpSearchAsync(m_UPnPClientHandle, 3, m_upnpLib.UPNP_DEVICE_WAN_CONNECTION.c_str(), this); if (ret != UPNP_E_SUCCESS) { msg << "error(UpnpSearchAsync): Error sending search request: "; goto error; @@ -1103,7 +895,7 @@ m_WanService(NULL) // Error processing error: - m_upnpLib.m_UpnpFinish(); + UpnpFinish(); msg << ret << ": " << m_upnpLib.GetUPnPErrorMessage(ret) << "."; throw CUPnPException(msg); } @@ -1118,8 +910,8 @@ CUPnPControlPoint::~CUPnPControlPoint() } // Remove all first // RemoveAll(); - m_upnpLib.m_UpnpUnRegisterClient(m_UPnPClientHandle); - m_upnpLib.m_UpnpFinish(); + UpnpUnRegisterClient(m_UPnPClientHandle); + UpnpFinish(); } @@ -1224,7 +1016,7 @@ bool CUPnPControlPoint::PrivateAddPortMapping( CUPnPPortMapping &upnpPortMapping) { // Get an IP address. The UPnP server one must do. - std::string ipAddress(m_upnpLib.m_UpnpGetServerIpAddress()); + std::string ipAddress(UpnpGetServerIpAddress()); // Start building the action std::string actionName("AddPortMapping"); @@ -1380,7 +1172,7 @@ upnpDiscovery: AddDebugLogLineM(true, logUPnP, msg); } // Get the XML tree device description in doc - ret = upnpCP->m_upnpLib.m_UpnpDownloadXmlDoc(d_event->Location, &doc); + ret = UpnpDownloadXmlDoc(d_event->Location, &doc); if (ret != UPNP_E_SUCCESS) { msg << "Error retrieving device description from " << d_event->Location << ": " << @@ -1424,7 +1216,7 @@ upnpDiscovery: d_event->Location, d_event->Expires); } // Free the XML doc tree - upnpCP->m_upnpLib.m_ixmlDocument_free(doc); + ixmlDocument_free(doc); } break; } @@ -1510,7 +1302,7 @@ upnpEventSubscriptionExpired: (struct Upnp_Event_Subscribe *)Event; Upnp_SID newSID; int TimeOut = 1801; - int ret = upnpCP->m_upnpLib.m_UpnpSubscribe( + int ret = UpnpSubscribe( upnpCP->m_UPnPClientHandle, es_event->PublisherUrl, &TimeOut, @@ -1550,14 +1342,14 @@ upnpEventSubscriptionExpired: (struct Upnp_Action_Complete *)Event; if (a_event->ErrCode != UPNP_E_SUCCESS) { upnpCP->m_upnpLib.processUPnPErrorMessage( - "m_UpnpSendActionAsync", + "UpnpSendActionAsync", a_event->ErrCode, NULL, a_event->ActionResult); } else { // Check the response document upnpCP->m_upnpLib.ProcessActionResponse( a_event->ActionResult, - ""); + ""); } /* No need for any processing here, just print out results. * Service state table updates are handled by events. @@ -1652,7 +1444,7 @@ void CUPnPControlPoint::OnEventReceived( } AddDebugLogLineM(true, logUPnP, msg); // Freeing that doc segfaults. Probably should not be freed. - //m_upnpLib.m_ixmlDocument_free(ChangedVariablesDoc); + //ixmlDocument_free(ChangedVariablesDoc); } @@ -1706,7 +1498,7 @@ void CUPnPControlPoint::RemoveRootDevice(const char *udn) void CUPnPControlPoint::Subscribe(CUPnPService &service) { std::ostringstream msg; - int errcode = m_upnpLib.m_UpnpSubscribe(m_UPnPClientHandle, + int errcode = UpnpSubscribe(m_UPnPClientHandle, service.GetAbsEventSubURL().c_str(), service.GetTimeoutAddr(), service.GetSID()); @@ -1718,7 +1510,7 @@ void CUPnPControlPoint::Subscribe(CUPnPService &service) AddLogLineM(true, logUPnP, msg); IXML_Document *scpdDoc = NULL; - errcode = m_upnpLib.m_UpnpDownloadXmlDoc( + errcode = UpnpDownloadXmlDoc( service.GetAbsSCPDURL().c_str(), &scpdDoc); if (errcode == UPNP_E_SUCCESS) { // Get the root node @@ -1753,7 +1545,7 @@ void CUPnPControlPoint::Unsubscribe(CUPnPService &service) { ServiceMap::iterator it = m_ServiceMap.find(service.GetAbsEventSubURL()); m_ServiceMap.erase(it); - m_upnpLib.m_UpnpUnSubscribe(m_UPnPClientHandle, service.GetSID()); + UpnpUnSubscribe(m_UPnPClientHandle, service.GetSID()); } diff --git a/src/UPnP.h b/src/UPnP.h index b09a557e..b6c16721 100644 --- a/src/UPnP.h +++ b/src/UPnP.h @@ -82,21 +82,6 @@ public: }; -class CDynamicLibHandle -{ -private: - std::string m_libname; - void *const m_LibraryHandle; - CDynamicLibHandle(const CDynamicLibHandle &); - CDynamicLibHandle &operator=(const CDynamicLibHandle &); - -public: - CDynamicLibHandle(const char *libname); - ~CDynamicLibHandle(); - void *Get() const { return m_LibraryHandle; } -}; - - class CUPnPControlPoint; @@ -114,18 +99,6 @@ public: static const std::string &UPNP_SERVICE_WAN_PPP_CONNECTION; CUPnPControlPoint &m_ctrlPoint; -private: - // dlopen stuff - static const int NUM_LIB_IXML_SYMBOLS = 8; - static const char *s_LibIXMLSymbols[NUM_LIB_IXML_SYMBOLS]; - static const int NUM_LIB_UPNP_SYMBOLS = 17; - static const char *s_LibUPnPSymbols[NUM_LIB_UPNP_SYMBOLS]; - CDynamicLibHandle m_LibIXMLHandle; - CDynamicLibHandle m_LibUPnPHandle2; - CDynamicLibHandle m_LibUPnPHandle3; - CDynamicLibHandle *m_LibUPnPHandle; - const std::string addLibraryPath(const char *name); - public: CUPnPLib(CUPnPControlPoint &ctrlPoint); ~CUPnPLib() {} @@ -170,55 +143,6 @@ public: const std::string Element_GetAttributeByTag( IXML_Element *element, const DOMString tag) const; - - // ixml api - IXML_Node *(*m_ixmlNode_getFirstChild)(IXML_Node *nodeptr); - IXML_Node *(*m_ixmlNode_getNextSibling)(IXML_Node *nodeptr); - const DOMString (*m_ixmlNode_getNodeName)(IXML_Node *nodeptr); - const DOMString (*m_ixmlNode_getNodeValue)(IXML_Node *nodeptr); - IXML_NamedNodeMap *(*m_ixmlNode_getAttributes)(IXML_Node *nodeptr); - void (*m_ixmlDocument_free)(IXML_Document *doc); - IXML_Node *(*m_ixmlNamedNodeMap_getNamedItem)( - IXML_NamedNodeMap *nnMap, const DOMString name); - void (*m_ixmlNamedNodeMap_free)(IXML_NamedNodeMap *nnMap); - - // upnp api - // 1 - Initialization and Registration - int (*m_UpnpInit)(const char *IPAddress, int Port); - void (*m_UpnpFinish)(); - unsigned short (*m_UpnpGetServerPort)(); - char *(*m_UpnpGetServerIpAddress)(); - int (*m_UpnpRegisterClient)(Upnp_FunPtr Callback, - const void *Cookie, UpnpClient_Handle *Hnd); - int (*m_UpnpUnRegisterClient)(UpnpClient_Handle Hnd); - // 2 - Discovery - int (*m_UpnpSearchAsync)(UpnpClient_Handle Hnd, int Mx, - const char *Target, const void *Cookie); - // 3 - Control - int (*m_UpnpGetServiceVarStatus)(UpnpClient_Handle Hnd, const char *ActionURL, - const char *VarName, DOMString *StVarVal); - int (*m_UpnpSendAction)(UpnpClient_Handle Hnd, const char *ActionURL, - const char *ServiceType, const char *DevUDN, IXML_Document *Action, - IXML_Document **RespNode); - int (*m_UpnpSendActionAsync)(UpnpClient_Handle Hnd, const char *ActionURL, - const char *ServiceType, const char *DevUDN, IXML_Document *Action, - Upnp_FunPtr Callback, const void *Cookie); - // 4 - Eventing - int (*m_UpnpSubscribe)(UpnpClient_Handle Hnd, - const char *PublisherUrl, int *TimeOut, Upnp_SID SubsId); - int (*m_UpnpUnSubscribe)(UpnpClient_Handle Hnd, Upnp_SID SubsId); - // 5 - HTTP - int (*m_UpnpDownloadXmlDoc)(const char *url, IXML_Document **xmlDoc); - // 6 - Optional Tools API - int (*m_UpnpResolveURL)(const char *BaseURL, - const char *RelURL, char *AbsURL); - IXML_Document *(*m_UpnpMakeAction)( - const char *ActionName, const char *ServType, int NumArg, - const char *Arg, ...); - int (*m_UpnpAddToAction)( - IXML_Document **ActionDoc, const char *ActionName, - const char *ServType, const char *ArgName, const char *ArgVal); - const char *(*m_UpnpGetErrorMessage)(int ErrorCode); }; diff --git a/src/UPnPCompatibility.h b/src/UPnPCompatibility.h index e0c17db9..5000f101 100644 --- a/src/UPnPCompatibility.h +++ b/src/UPnPCompatibility.h @@ -27,7 +27,9 @@ #ifndef UPNPCOMPATIBILITY_H #define UPNPCOMPATIBILITY_H -#include "extern/upnp/upnp.h" + +#include "upnp.h" +#include "upnptools.h" #include diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in index f9cc5719..a9d92508 100644 --- a/src/libs/Makefile.in +++ b/src/libs/Makefile.in @@ -47,11 +47,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -173,6 +174,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/libs/common/Makefile.in b/src/libs/common/Makefile.in index e281dcf8..3831ba58 100644 --- a/src/libs/common/Makefile.in +++ b/src/libs/common/Makefile.in @@ -52,11 +52,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -188,6 +189,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/libs/ec/Makefile.in b/src/libs/ec/Makefile.in index b1300ec0..9a67d079 100644 --- a/src/libs/ec/Makefile.in +++ b/src/libs/ec/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -174,6 +175,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/libs/ec/cpp/Makefile.in b/src/libs/ec/cpp/Makefile.in index 05fac705..2711ee03 100644 --- a/src/libs/ec/cpp/Makefile.in +++ b/src/libs/ec/cpp/Makefile.in @@ -52,11 +52,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -188,6 +189,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/pixmaps/Makefile.in b/src/pixmaps/Makefile.in index eabb5c7f..6598a8f2 100644 --- a/src/pixmaps/Makefile.in +++ b/src/pixmaps/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -174,6 +175,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/pixmaps/flags_xpm/Makefile.in b/src/pixmaps/flags_xpm/Makefile.in index 97d88a46..9db86375 100644 --- a/src/pixmaps/flags_xpm/Makefile.in +++ b/src/pixmaps/flags_xpm/Makefile.in @@ -47,11 +47,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -164,6 +165,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/skins/Makefile.in b/src/skins/Makefile.in index cb3122c0..0e267b2a 100644 --- a/src/skins/Makefile.in +++ b/src/skins/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -175,6 +176,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in index ef7c7f5f..5ac49031 100644 --- a/src/utils/Makefile.in +++ b/src/utils/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -173,6 +174,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/aLinkCreator/Makefile.in b/src/utils/aLinkCreator/Makefile.in index 57426137..1ad34b58 100644 --- a/src/utils/aLinkCreator/Makefile.in +++ b/src/utils/aLinkCreator/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -187,6 +188,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/aLinkCreator/docs/Makefile.in b/src/utils/aLinkCreator/docs/Makefile.in index c2233f13..ec3d7bc4 100644 --- a/src/utils/aLinkCreator/docs/Makefile.in +++ b/src/utils/aLinkCreator/docs/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -165,6 +166,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/aLinkCreator/src/Makefile.in b/src/utils/aLinkCreator/src/Makefile.in index b4f95932..103eebf1 100644 --- a/src/utils/aLinkCreator/src/Makefile.in +++ b/src/utils/aLinkCreator/src/Makefile.in @@ -56,11 +56,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -200,6 +201,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/cas/Makefile.in b/src/utils/cas/Makefile.in index 8371b990..36ae687f 100644 --- a/src/utils/cas/Makefile.in +++ b/src/utils/cas/Makefile.in @@ -55,11 +55,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -207,6 +208,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/cas/docs/Makefile.in b/src/utils/cas/docs/Makefile.in index 88ab167c..e74bac15 100644 --- a/src/utils/cas/docs/Makefile.in +++ b/src/utils/cas/docs/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -165,6 +166,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/fileview/Makefile.in b/src/utils/fileview/Makefile.in index 1da54292..5d380132 100644 --- a/src/utils/fileview/Makefile.in +++ b/src/utils/fileview/Makefile.in @@ -51,11 +51,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -189,6 +190,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/wxCas/Makefile.in b/src/utils/wxCas/Makefile.in index 86bf0db5..35a9f45f 100644 --- a/src/utils/wxCas/Makefile.in +++ b/src/utils/wxCas/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -185,6 +186,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/wxCas/docs/Makefile.in b/src/utils/wxCas/docs/Makefile.in index ff4c8a94..b5f05bbe 100644 --- a/src/utils/wxCas/docs/Makefile.in +++ b/src/utils/wxCas/docs/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -165,6 +166,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/wxCas/src/Makefile.in b/src/utils/wxCas/src/Makefile.in index 6636053c..f4e30991 100644 --- a/src/utils/wxCas/src/Makefile.in +++ b/src/utils/wxCas/src/Makefile.in @@ -54,11 +54,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -192,6 +193,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/xas/Makefile.in b/src/utils/xas/Makefile.in index 8a4d65e5..2b823415 100644 --- a/src/utils/xas/Makefile.in +++ b/src/utils/xas/Makefile.in @@ -50,11 +50,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -187,6 +188,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/utils/xas/docs/Makefile.in b/src/utils/xas/docs/Makefile.in index f400c3a9..63398446 100644 --- a/src/utils/xas/docs/Makefile.in +++ b/src/utils/xas/docs/Makefile.in @@ -48,11 +48,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -169,6 +170,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/webserver/Makefile.in b/src/webserver/Makefile.in index 06350229..a93db00a 100644 --- a/src/webserver/Makefile.in +++ b/src/webserver/Makefile.in @@ -47,11 +47,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -173,6 +174,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/webserver/chicane/Makefile.in b/src/webserver/chicane/Makefile.in index 4a1d3a63..d764398a 100644 --- a/src/webserver/chicane/Makefile.in +++ b/src/webserver/chicane/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -175,6 +176,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/webserver/default/Makefile.in b/src/webserver/default/Makefile.in index cc6e72c1..32ba5102 100644 --- a/src/webserver/default/Makefile.in +++ b/src/webserver/default/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -175,6 +176,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/webserver/litoral/Makefile.in b/src/webserver/litoral/Makefile.in index d76f3532..148b2094 100644 --- a/src/webserver/litoral/Makefile.in +++ b/src/webserver/litoral/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -175,6 +176,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/webserver/php-default/Makefile.in b/src/webserver/php-default/Makefile.in index 9c4a4b3a..769beebb 100644 --- a/src/webserver/php-default/Makefile.in +++ b/src/webserver/php-default/Makefile.in @@ -49,11 +49,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -175,6 +176,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/src/webserver/src/Makefile.am b/src/webserver/src/Makefile.am index 246d66a5..9854039d 100644 --- a/src/webserver/src/Makefile.am +++ b/src/webserver/src/Makefile.am @@ -34,14 +34,18 @@ amuleweb_CPPFLAGS = -I../.. -I$(top_srcdir)/src -I$(top_srcdir)/src/libs -I$(top amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LIBPNG_CFLAGS) amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY) $(LIBPNG_CFLAGS) -if ENABLE_UPNP -amuleweb_CPPFLAGS += -DENABLE_UPNP -endif - amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common -L../../libs/ec/cpp $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) amuleweb_LDADD = -lec -lmulecommon $(WXBASE_LIBS) $(ZLIB_LIBS) \ $(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(BFD_LIBS) $(REGEX_LIBS) $(LIBINTL) +if ENABLE_UPNP +amuleweb_CPPFLAGS += -DENABLE_UPNP=1 $(LIBUPNP_CPPFLAGS) +amuleweb_CFLAGS += $(LIBUPNP_CFLAGS) +amuleweb_CXXFLAGS += $(LIBUPNP_CFLAGS) +amuleweb_LDFLAGS += $(LIBUPNP_LDFLAGS) +amuleweb_LDADD += $(LIBUPNP_LDADD) +endif + noinst_HEADERS = \ WebInterface.h \ WebServer.h \ @@ -76,3 +80,4 @@ EXTRA_DIST = \ missing-template.html \ php_lexer.l \ php_parser.y + diff --git a/src/webserver/src/Makefile.in b/src/webserver/src/Makefile.in index e1442336..3cf6d3be 100644 --- a/src/webserver/src/Makefile.in +++ b/src/webserver/src/Makefile.in @@ -44,7 +44,11 @@ bin_PROGRAMS = amuleweb$(EXEEXT) @ENABLE_UPNP_TRUE@ $(top_srcdir)/src/UPnP.cpp \ @ENABLE_UPNP_TRUE@ UPnPCompatibility.cpp -@ENABLE_UPNP_TRUE@am__append_2 = -DENABLE_UPNP +@ENABLE_UPNP_TRUE@am__append_2 = -DENABLE_UPNP=1 $(LIBUPNP_CPPFLAGS) +@ENABLE_UPNP_TRUE@am__append_3 = $(LIBUPNP_CFLAGS) +@ENABLE_UPNP_TRUE@am__append_4 = $(LIBUPNP_CFLAGS) +@ENABLE_UPNP_TRUE@am__append_5 = $(LIBUPNP_LDFLAGS) +@ENABLE_UPNP_TRUE@am__append_6 = $(LIBUPNP_LDADD) subdir = src/webserver/src DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -58,11 +62,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -91,6 +96,7 @@ am_amuleweb_OBJECTS = amuleweb-WebServer.$(OBJEXT) \ @NEED_RC_TRUE@nodist_amuleweb_OBJECTS = amuleweb-version.$(OBJEXT) amuleweb_OBJECTS = $(am_amuleweb_OBJECTS) $(nodist_amuleweb_OBJECTS) am__DEPENDENCIES_1 = +@ENABLE_UPNP_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -213,6 +219,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -352,12 +362,16 @@ amuleweb_CPPFLAGS = -I../.. -I$(top_srcdir)/src \ -DWEBSERVERDIR="\"$(pkgdatadir)/webserver\"" \ -DECSOCKET_USE_EVENTS=0 $(INCINTL) $(ZLIB_CPPFLAGS) \ $(am__append_2) -amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LIBPNG_CFLAGS) -amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY) $(LIBPNG_CFLAGS) -amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common -L../../libs/ec/cpp $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) +amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LIBPNG_CFLAGS) \ + $(am__append_3) +amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) \ + $(WX_CXXFLAGS_ONLY) $(LIBPNG_CFLAGS) $(am__append_4) +amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common \ + -L../../libs/ec/cpp $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) \ + $(am__append_5) amuleweb_LDADD = -lec -lmulecommon $(WXBASE_LIBS) $(ZLIB_LIBS) \ - $(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(BFD_LIBS) $(REGEX_LIBS) $(LIBINTL) - + $(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(BFD_LIBS) \ + $(REGEX_LIBS) $(LIBINTL) $(am__append_6) noinst_HEADERS = \ WebInterface.h \ WebServer.h \ diff --git a/src/webserver/src/WebServer.cpp b/src/webserver/src/WebServer.cpp index abfadca9..784a3d99 100644 --- a/src/webserver/src/WebServer.cpp +++ b/src/webserver/src/WebServer.cpp @@ -48,7 +48,6 @@ #include "php_core_lib.h" //------------------------------------------------------------------- - typedef uint32_t COLORTYPE; inline unsigned long RGB(int r, int g, int b) diff --git a/unittests/Makefile.in b/unittests/Makefile.in index 69ea4f26..2d756016 100644 --- a/unittests/Makefile.in +++ b/unittests/Makefile.in @@ -47,11 +47,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -172,6 +173,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/unittests/muleunit/Makefile.in b/unittests/muleunit/Makefile.in index 40ac982b..ec1374cf 100644 --- a/unittests/muleunit/Makefile.in +++ b/unittests/muleunit/Makefile.in @@ -50,11 +50,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -190,6 +191,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/unittests/tests/Makefile.in b/unittests/tests/Makefile.in index df9618eb..b1f6c2eb 100644 --- a/unittests/tests/Makefile.in +++ b/unittests/tests/Makefile.in @@ -50,11 +50,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/build-tools.m4 \ $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libpng.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ - $(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/m4/zlib.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + $(top_srcdir)/m4/libupnp.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ + $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -238,6 +239,10 @@ LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@ LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@ LIBPNG_LIBS = @LIBPNG_LIBS@ LIBS = @LIBS@ +LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@ +LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@ +LIBUPNP_LDADD = @LIBUPNP_LDADD@ +LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ -- 2.11.4.GIT