Commit 9365e5b0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contrib: one step further on the Win32 upnp port to compile vlc plugin

parent 9998fd24
--- libupnp.old/configure.ac 2008-04-25 13:41:16.000000000 +0200
+++ libupnp/configure.ac 2010-08-11 00:41:04.000000000 +0200
@@ -332,19 +332,13 @@
--- libupnp/configure.ac 2008-04-25 13:41:16.000000000 +0200
+++ libupnp_new/configure.ac 2010-08-13 23:21:00.000000000 +0200
@@ -286,7 +286,6 @@
AC_PROG_MAKE_SET
AC_PROG_EGREP
-#
# Default compilation flags
#
echo "--------------------- Default compilation flags -------------------------------"
@@ -332,19 +331,13 @@
# so just abort if a header file is not found.
AC_CHECK_HEADERS(
[ \
......@@ -20,7 +28,16 @@
unistd.h \
],
[],
@@ -370,39 +364,39 @@
@@ -355,7 +348,7 @@
# Checks for typedefs, structures, and compiler characteristics
#
AC_C_CONST
-TYPE_SOCKLEN_T
+#TYPE_SOCKLEN_T
#
@@ -370,39 +363,46 @@
# Checks for POSIX Threads
#
echo "--------------------------- pthread stuff -------------------------------------"
......@@ -31,14 +48,19 @@
+# [],
+# [AC_MSG_ERROR([POSIX threads are required to build this program])])
#
+PTHREAD_LIBS=" -lpthreadGC2"
+PTHREAD_CFLAGS=" -DPTW32_STATIC_LIB -DUPNP_STATIC_LIB"
# Update environment variables for pthreads
#
-CC="$PTHREAD_CC"
-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-LIBS="$PTHREAD_LIBS $LIBS"
+#CC="$PTHREAD_CC"
+#CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+#LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
LIBS="$PTHREAD_LIBS $LIBS"
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
#
# Determine if pthread_rwlock_t is available
#
......@@ -87,14 +109,3 @@
AC_CONFIG_FILES([
--- libupnp.old/configure.ac 2010-08-11 00:41:04.000000000 +0200
+++ libupnp/configure.ac 2010-08-11 12:32:48.000000000 +0200
@@ -349,7 +349,7 @@
# Checks for typedefs, structures, and compiler characteristics
#
AC_C_CONST
-TYPE_SOCKLEN_T
+#TYPE_SOCKLEN_T
#
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