patch-configure 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495
  1. --- motion-3.2.12.orig/configure 2010-06-01 08:48:23.000000000 +0200
  2. +++ motion-3.2.12/configure 2010-12-14 18:06:34.000000000 +0100
  3. @@ -2364,9 +2364,6 @@ ac_config_headers="$ac_config_headers co
  4. THREAD_CFLAGS=""
  5. THREAD_CHECK="/usr/include/pthread.h"
  6. -Darwin=""
  7. -FreeBSD=""
  8. -
  9. LINUXTHREADS="no"
  10. # Check whether --with-linuxthreads was given.
  11. @@ -2375,74 +2372,6 @@ if test "${with_linuxthreads+set}" = set
  12. fi
  13. -
  14. -PWCBSD="no"
  15. -
  16. -# Check whether --with-pwcbsd was given.
  17. -if test "${with_pwcbsd+set}" = set; then :
  18. - withval=$with_pwcbsd; PWCBSD="$withval"
  19. -
  20. -fi
  21. -
  22. -
  23. -
  24. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin" >&5
  25. -$as_echo_n "checking for Darwin... " >&6; }
  26. -Darwin=`uname -a | grep "Darwin"`
  27. -
  28. -if test "${Darwin}" = ""; then
  29. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  30. -$as_echo "no" >&6; }
  31. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for *BSD" >&5
  32. -$as_echo_n "checking for *BSD... " >&6; }
  33. -
  34. - FreeBSD=`uname -a | grep "BSD"`
  35. - if test "${FreeBSD}" = ""; then
  36. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  37. -$as_echo "no" >&6; }
  38. - VIDEO="video.o video2.o video_common.o"
  39. - else
  40. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  41. -$as_echo "yes" >&6; }
  42. - if test "${LINUXTHREADS}" = "no"; then
  43. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Linuxthreads" >&5
  44. -$as_echo_n "checking Linuxthreads... " >&6; }
  45. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipping" >&5
  46. -$as_echo "skipping" >&6; }
  47. - else
  48. - THREAD_CHECK="/usr/local/include/pthread/linuxthreads/pthread.h"
  49. - THREAD_LIB_CHECK="/usr/local/lib/liblthread.so"
  50. - fi
  51. -
  52. - if test "${PWCBSD}" != "no"; then
  53. - VIDEO="video.o video2.o video_common.o"
  54. - TEMP_CFLAGS="${CFLAGS} -I/usr/local/include -DPWCBSD"
  55. - else
  56. - VIDEO="video_freebsd.o"
  57. - TEMP_CFLAGS="${CFLAGS} -I/usr/local/include"
  58. - fi
  59. -
  60. - TEMP_LDFLAGS="${LDFLAGS} -L/usr/local/lib"
  61. - TEMP_LIBS="-L/usr/local/lib"
  62. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Build with PWCBSD support $PWCBSD" >&5
  63. -$as_echo "Build with PWCBSD support $PWCBSD" >&6; }
  64. -
  65. - fi
  66. -else
  67. - TEMP_CFLAGS="${CFLAGS} -I/sw/include"
  68. - TEMP_LDFLAGS="${LDFLAGS} -L/sw/lib"
  69. - TEMP_LIBS="-L/sw/lib"
  70. - VIDEO="video_freebsd.o"
  71. - FINK_LIB="-L/sw/lib"
  72. - Darwin="yes"
  73. - V4L="no"
  74. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $Darwin" >&5
  75. -$as_echo "$Darwin" >&6; }
  76. -fi
  77. -
  78. -
  79. -
  80. -
  81. # Checks for programs.
  82. ac_ext=c
  83. ac_cpp='$CPP $CPPFLAGS'
  84. @@ -3276,6 +3205,7 @@ else
  85. #
  86. # Check to Exclude V4L
  87. #
  88. +VIDEO="video.o video2.o video_common.o"
  89. V4L="yes"
  90. # Check whether --with-v4l was given.