Commit 47902e37 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

== -> =

parent 8d19624e
...@@ -1422,7 +1422,7 @@ AC_ARG_ENABLE(debug, ...@@ -1422,7 +1422,7 @@ AC_ARG_ENABLE(debug,
test "${enable_debug}" != "yes" && enable_debug="no" test "${enable_debug}" != "yes" && enable_debug="no"
AH_TEMPLATE(NDEBUG, AH_TEMPLATE(NDEBUG,
[Define to 1 if debug code should NOT be compiled]) [Define to 1 if debug code should NOT be compiled])
AS_IF([test "x${enable_debug}" == "xno"], [AC_DEFINE(NDEBUG)]) AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)])
dnl dnl
dnl Enable release-specific flags dnl Enable release-specific flags
...@@ -4265,7 +4265,7 @@ class testclass : public SearchResponseListener, public MediaPlayer ...@@ -4265,7 +4265,7 @@ class testclass : public SearchResponseListener, public MediaPlayer
done done
LIBS="${LIBS_save}" LIBS="${LIBS_save}"
dnl should not happen - otherwise this needs fixing - hence FAILURE dnl should not happen - otherwise this needs fixing - hence FAILURE
AS_IF([test "${LIBS_cclink}" == "no"], AS_IF([test "${LIBS_cclink}" = "no"],
[AC_MSG_FAILURE([cannot find XML parser for CyberLink])]) [AC_MSG_FAILURE([cannot find XML parser for CyberLink])])
AC_MSG_RESULT([${LIBS_cclink}]) AC_MSG_RESULT([${LIBS_cclink}])
VLC_ADD_LDFLAGS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}]) VLC_ADD_LDFLAGS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}])
...@@ -4287,17 +4287,17 @@ AC_ARG_ENABLE(upnp, ...@@ -4287,17 +4287,17 @@ AC_ARG_ENABLE(upnp,
VLC_ADD_CXXFLAGS([upnp_intel], [ ]) VLC_ADD_CXXFLAGS([upnp_intel], [ ])
AS_IF([test "x${enable_upnp}" != "xno"], [ AS_IF([test "x${enable_upnp}" != "xno"], [
AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread]) AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread])
AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"], [ AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"], [
AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)]) AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)])
]) ])
AS_IF([test "${has_upnp}" == "yes"], [ AS_IF([test "${has_upnp}" = "yes"], [
VLC_ADD_LDFLAGS([upnp_intel], [-lupnp]) VLC_ADD_LDFLAGS([upnp_intel], [-lupnp])
]) ])
], [ ], [
has_upnp="no" has_upnp="no"
]) ])
AS_IF([test "${has_upnp}" == "yes"], [ AS_IF([test "${has_upnp}" = "yes"], [
VLC_ADD_PLUGINS([upnp_intel]) VLC_ADD_PLUGINS([upnp_intel])
]) ])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment