1
0

patch-configure 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129
  1. --- motion-3.2.11.orig/configure 2008-09-22 01:20:58.000000000 +0200
  2. +++ motion-3.2.11/configure 2009-06-13 13:14:29.000000000 +0200
  3. @@ -1749,9 +1749,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. @@ -1771,63 +1768,6 @@ fi
  12. -{ echo "$as_me:$LINENO: checking for Darwin" >&5
  13. -echo $ECHO_N "checking for Darwin... $ECHO_C" >&6; }
  14. -Darwin=`uname -a | grep "Darwin"`
  15. -
  16. -if test "${Darwin}" = ""; then
  17. - { echo "$as_me:$LINENO: result: no" >&5
  18. -echo "${ECHO_T}no" >&6; }
  19. - { echo "$as_me:$LINENO: checking for *BSD" >&5
  20. -echo $ECHO_N "checking for *BSD... $ECHO_C" >&6; }
  21. -
  22. - FreeBSD=`uname -a | grep "BSD"`
  23. - if test "${FreeBSD}" = ""; then
  24. - { echo "$as_me:$LINENO: result: no" >&5
  25. -echo "${ECHO_T}no" >&6; }
  26. - VIDEO="video.o video2.o video_common.o"
  27. - else
  28. - { echo "$as_me:$LINENO: result: yes" >&5
  29. -echo "${ECHO_T}yes" >&6; }
  30. - if test "${LINUXTHREADS}" = "no"; then
  31. - { echo "$as_me:$LINENO: checking Linuxthreads" >&5
  32. -echo $ECHO_N "checking Linuxthreads... $ECHO_C" >&6; }
  33. - { echo "$as_me:$LINENO: result: skipping" >&5
  34. -echo "${ECHO_T}skipping" >&6; }
  35. - else
  36. - THREAD_CHECK="/usr/local/include/pthread/linuxthreads/pthread.h"
  37. - THREAD_LIB_CHECK="/usr/local/lib/liblthread.so"
  38. - fi
  39. -
  40. - if test "${PWCBSD}" != "no"; then
  41. - VIDEO="video.o video2.o video_common.o"
  42. - TEMP_CFLAGS="${CFLAGS} -I/usr/local/include -DPWCBSD"
  43. - else
  44. - VIDEO="video_freebsd.o"
  45. - TEMP_CFLAGS="${CFLAGS} -I/usr/local/include"
  46. - fi
  47. -
  48. - TEMP_LDFLAGS="${LDFLAGS} -L/usr/local/lib"
  49. - TEMP_LIBS="-L/usr/local/lib"
  50. - { echo "$as_me:$LINENO: result: Build with PWCBSD support $PWCBSD" >&5
  51. -echo "${ECHO_T}Build with PWCBSD support $PWCBSD" >&6; }
  52. -
  53. - fi
  54. -else
  55. - TEMP_CFLAGS="${CFLAGS} -I/sw/include"
  56. - TEMP_LDFLAGS="${LDFLAGS} -L/sw/lib"
  57. - TEMP_LIBS="-L/sw/lib"
  58. - VIDEO="video_freebsd.o"
  59. - FINK_LIB="-L/sw/lib"
  60. - Darwin="yes"
  61. - V4L="no"
  62. - { echo "$as_me:$LINENO: result: $Darwin" >&5
  63. -echo "${ECHO_T}$Darwin" >&6; }
  64. -fi
  65. -
  66. -
  67. -
  68. -
  69. # Checks for programs.
  70. ac_ext=c
  71. ac_cpp='$CPP $CPPFLAGS'
  72. @@ -2754,42 +2694,12 @@ TEMP_CFLAGS="${TEMP_CFLAGS} ${CFLAGS}"
  73. TEMP_LDFLAGS="${TEMP_LDFLAGS} ${LDFLAGS}"
  74. -if test "${FreeBSD}" != "" && test "${PWCBSD}" = "no"; then
  75. -
  76. - { echo "$as_me:$LINENO: checking bktr headers in /usr/include/dev/bktr" >&5
  77. -echo $ECHO_N "checking bktr headers in /usr/include/dev/bktr... $ECHO_C" >&6; }
  78. -
  79. - if test -f /usr/include/dev/bktr/ioctl_meteor.h && test -f /usr/include/dev/bktr/ioctl_bt848.h; then
  80. - { echo "$as_me:$LINENO: result: yes" >&5
  81. -echo "${ECHO_T}yes" >&6; }
  82. - else
  83. - { echo "$as_me:$LINENO: result: no" >&5
  84. -echo "${ECHO_T}no" >&6; }
  85. - TEMP_CFLAGS="${TEMP_CFLAGS} -DOLD_BKTR"
  86. - fi
  87. -#
  88. -# Check to Exclude BKTR
  89. -#
  90. -BKTR="yes"
  91. -
  92. -# Check whether --with-bktr was given.
  93. -if test "${with_bktr+set}" = set; then
  94. - withval=$with_bktr; BKTR="$withval"
  95. -
  96. -fi
  97. -
  98. -
  99. -
  100. - if test "${BKTR}" = "no"; then
  101. - TEMP_CFLAGS="${TEMP_CFLAGS} -DWITHOUT_V4L"
  102. - fi
  103. -
  104. -else
  105. #
  106. # Check to Exclude V4L
  107. #
  108. V4L="yes"
  109. +VIDEO="video.o video2.o video_common.o"
  110. # Check whether --with-v4l was given.
  111. if test "${with_v4l+set}" = set; then
  112. @@ -2798,8 +2708,6 @@ if test "${with_v4l+set}" = set; then
  113. fi
  114. -fi
  115. -
  116. if test "${V4L}" = "no"; then
  117. TEMP_CFLAGS="${TEMP_CFLAGS} -DWITHOUT_V4L"