git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libupnp-configure.patch

   1 --- libupnp.old/configure.ac    2008-04-25 13:41:16.000000000 +0200
   2 +++ libupnp/configure.ac        2010-08-11 00:41:04.000000000 +0200
   3 @@ -332,19 +332,13 @@
   4  # so just abort if a header file is not found.
   5  AC_CHECK_HEADERS(
   6         [ \
   7 -       arpa/inet.h \
   8         fcntl.h \
   9         inttypes.h \
  10         limits.h \
  11 -       netdb.h \
  12 -       netinet/in.h \
  13         stdlib.h \
  14         string.h \
  15 -       sys/ioctl.h \
  16 -       sys/socket.h \
  17         sys/time.h \
  18         sys/timeb.h \
  19 -       syslog.h \
  20         unistd.h \
  21         ],
  22         [],
  23 @@ -370,39 +364,39 @@
  24  # Checks for POSIX Threads
  25  #
  26  echo "--------------------------- pthread stuff -------------------------------------"
  27 -ACX_PTHREAD(
  28 -       [],
  29 -       [AC_MSG_ERROR([POSIX threads are required to build this program])])
  30 +#ACX_PTHREAD(
  31 +#      [],
  32 +#      [AC_MSG_ERROR([POSIX threads are required to build this program])])
  33  #
  34  # Update environment variables for pthreads
  35  #
  36 -CC="$PTHREAD_CC"
  37 -CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
  38 -LIBS="$PTHREAD_LIBS $LIBS"
  39 +#CC="$PTHREAD_CC"
  40 +#CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
  41 +#LIBS="$PTHREAD_LIBS $LIBS"
  42  #
  43  # Determine if pthread_rwlock_t is available
  44  #
  45 -echo "----------------------- pthread_rwlock_t stuff --------------------------------"
  46 -AC_MSG_CHECKING([if pthread_rwlock_t is available])
  47 -AC_LANG([C])
  48 -AC_COMPILE_IFELSE(
  49 -       [AC_LANG_PROGRAM(
  50 -               [#include <pthread.h>],
  51 -               [pthread_rwlock_t *x;])],
  52 -       [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
  53 -               AC_MSG_RESULT([yes, supported without any options])],
  54 -       [AC_COMPILE_IFELSE(
  55 -               [AC_LANG_PROGRAM(
  56 -                       [#define _GNU_SOURCE
  57 -                       #include <pthread.h>],
  58 -                       [pthread_rwlock_t *x;])],
  59 -               [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
  60 -                       CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
  61 -                       AC_MSG_RESULT([yes, definition of _GNU_SOURCE required])],
  62 -               [AC_DEFINE([UPNP_USE_RWLOCK], [0], [Do not use pthread_rwlock_t])
  63 -                       AC_MSG_RESULT([no, needs to fallback to pthread_mutex])
  64 -                       AC_MSG_ERROR([pthread_rwlock_t not available])])])
  65 -echo "-------------------------------------------------------------------------------"
  66 +#echo "----------------------- pthread_rwlock_t stuff --------------------------------"
  67 +#AC_MSG_CHECKING([if pthread_rwlock_t is available])
  68 +#AC_LANG([C])
  69 +#AC_COMPILE_IFELSE(
  70 +#      [AC_LANG_PROGRAM(
  71 +#              [#include <pthread.h>],
  72 +#              [pthread_rwlock_t *x;])],
  73 +#      [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
  74 +#              AC_MSG_RESULT([yes, supported without any options])],
  75 +#      [AC_COMPILE_IFELSE(
  76 +#              [AC_LANG_PROGRAM(
  77 +#                      [#define _GNU_SOURCE
  78 +#                      #include <pthread.h>],
  79 +#                      [pthread_rwlock_t *x;])],
  80 +#              [AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
  81 +#                      CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
  82 +#                      AC_MSG_RESULT([yes, definition of _GNU_SOURCE required])],
  83 +#              [AC_DEFINE([UPNP_USE_RWLOCK], [0], [Do not use pthread_rwlock_t])
  84 +#                      AC_MSG_RESULT([no, needs to fallback to pthread_mutex])
  85 +#                      AC_MSG_ERROR([pthread_rwlock_t not available])])])
  86 +#echo "-------------------------------------------------------------------------------"
  87
  88
  89  AC_CONFIG_FILES([
  90 --- libupnp.old/configure.ac    2010-08-11 00:41:04.000000000 +0200
  91 +++ libupnp/configure.ac        2010-08-11 12:32:48.000000000 +0200
  92 @@ -349,7 +349,7 @@
  93  # Checks for typedefs, structures, and compiler characteristics
  94  #
  95  AC_C_CONST
  96 -TYPE_SOCKLEN_T
  97 +#TYPE_SOCKLEN_T
  98
  99
 100  #