patch-config_status 8.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171
  1. --- motion-4.0.orig/config.status 2011-09-18 22:49:28.000000000 +0200
  2. +++ motion-4.0/config.status 2012-07-25 14:54:49.000000000 +0200
  3. @@ -1,4 +1,4 @@
  4. -#! /bin/sh
  5. +#! /bin/bash
  6. # Generated by configure.
  7. # Run this file to recreate the current configuration.
  8. # Compiler output produced by configure, useful for debugging
  9. @@ -8,7 +8,7 @@ debug=false
  10. ac_cs_recheck=false
  11. ac_cs_silent=false
  12. -SHELL=${CONFIG_SHELL-/bin/sh}
  13. +SHELL=${CONFIG_SHELL-/bin/bash}
  14. export SHELL
  15. ## -------------------- ##
  16. ## M4sh Initialization. ##
  17. @@ -434,17 +434,17 @@ $config_headers
  18. Report bugs to the package provider."
  19. -ac_cs_config=""
  20. +ac_cs_config="'--build=i686-apple-darwin10' '--host=mipsel-openadk-linux' '--target=mipsel-openadk-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--bindir=/usr/bin' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sysconfdir=/etc' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-nls' '--without-ffmpeg' '--without-jpeg-mmx' '--without-optimizecpu' '--without-mysql' '--without-sqlite' '--without-pgsql' '--with-v4l' 'build_alias=i686-apple-darwin10' 'host_alias=mipsel-openadk-linux' 'target_alias=mipsel-openadk-linux' 'CC=/Volumes/adk/openadk/host_mipsel_uclibc/bin/mipsel-openadk-linux-uclibc-gcc' 'CFLAGS=-fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe' 'LDFLAGS=-L/Volumes/adk/openadk/target_mipsel_uclibc/lib -L/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib' 'CPPFLAGS=-DNDEBUG'"
  21. ac_cs_version="\
  22. motion config.status trunkREV528
  23. -configured by ./configure, generated by GNU Autoconf 2.67,
  24. +configured by /Volumes/adk/openadk/build_qemu_mipsel_uclibc/w-motion-4.0-1/motion-4.0/configure, generated by GNU Autoconf 2.67,
  25. with options \"$ac_cs_config\"
  26. Copyright (C) 2010 Free Software Foundation, Inc.
  27. This config.status script is free software; the Free Software Foundation
  28. gives unlimited permission to copy, distribute and modify it."
  29. -ac_pwd='/home/wbx/adk/ibm/motion'
  30. +ac_pwd='/Volumes/adk/openadk/build_qemu_mipsel_uclibc/w-motion-4.0-1/motion-4.0'
  31. srcdir='.'
  32. test -n "$AWK" || AWK=awk
  33. # The default lists apply if the user does not specify any file.
  34. @@ -523,10 +523,10 @@ if $ac_cs_silent; then
  35. fi
  36. if $ac_cs_recheck; then
  37. - set X '/bin/sh' './configure' $ac_configure_extra_args --no-create --no-recursion
  38. + set X '/bin/bash' '/Volumes/adk/openadk/build_qemu_mipsel_uclibc/w-motion-4.0-1/motion-4.0/configure' '--build=i686-apple-darwin10' '--host=mipsel-openadk-linux' '--target=mipsel-openadk-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--bindir=/usr/bin' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sysconfdir=/etc' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-nls' '--without-ffmpeg' '--without-jpeg-mmx' '--without-optimizecpu' '--without-mysql' '--without-sqlite' '--without-pgsql' '--with-v4l' 'build_alias=i686-apple-darwin10' 'host_alias=mipsel-openadk-linux' 'target_alias=mipsel-openadk-linux' 'CC=/Volumes/adk/openadk/host_mipsel_uclibc/bin/mipsel-openadk-linux-uclibc-gcc' 'CFLAGS=-fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe' 'LDFLAGS=-L/Volumes/adk/openadk/target_mipsel_uclibc/lib -L/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib' 'CPPFLAGS=-DNDEBUG' $ac_configure_extra_args --no-create --no-recursion
  39. shift
  40. - $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
  41. - CONFIG_SHELL='/bin/sh'
  42. + $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
  43. + CONFIG_SHELL='/bin/bash'
  44. export CONFIG_SHELL
  45. exec "$@"
  46. fi
  47. @@ -620,30 +620,33 @@ echo 'BEGIN {' >"$tmp/subs1.awk" &&
  48. cat >>"$tmp/subs1.awk" <<\_ACAWK &&
  49. S["LTLIBOBJS"]=""
  50. S["LIBOBJS"]=""
  51. -S["BIN_PATH"]="/usr/local/bin"
  52. -S["EGREP"]="/bin/grep -E"
  53. -S["GREP"]="/bin/grep"
  54. -S["CPP"]="gcc -E"
  55. -S["FFMPEG_OBJ"]="ffmpeg.o"
  56. +S["BIN_PATH"]="/usr/bin"
  57. +S["EGREP"]="/usr/bin/grep -E"
  58. +S["GREP"]="/usr/bin/grep"
  59. +S["CPP"]="/Volumes/adk/openadk/host_mipsel_uclibc/bin/mipsel-openadk-linux-uclibc-gcc -E"
  60. +S["FFMPEG_OBJ"]=""
  61. S["SDL_OBJ"]="sdl.o"
  62. S["OBJEXT"]="o"
  63. S["EXEEXT"]=""
  64. -S["ac_ct_CC"]="gcc"
  65. -S["CPPFLAGS"]=""
  66. -S["LDFLAGS"]=" -L/usr/lib64"
  67. -S["CFLAGS"]=" -g -O2 -D_REENTRANT -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DHAVE_FFMPEG -I/usr/include -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW -DMOTION_V"\
  68. -"4L2 -DTYPE_32BIT=\"int\" -DHAVE_BSWAP "
  69. -S["CC"]="gcc"
  70. -S["VIDEO"]="video.o video2.o video_common.o"
  71. -S["target_alias"]=""
  72. -S["host_alias"]=""
  73. -S["build_alias"]=""
  74. -S["LIBS"]="-lm -lpthread -L/usr/lib -lSDL -ljpeg -L/usr/lib64 -lavformat -lavcodec -lavutil -lm -lz -lsqlite3"
  75. +S["ac_ct_CC"]=""
  76. +S["CPPFLAGS"]="-DNDEBUG"
  77. +S["LDFLAGS"]="-L/Volumes/adk/openadk/target_mipsel_uclibc/lib -L/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link "\
  78. +"-Wl,/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib -L/sw/lib -L/Volumes/adk/openadk/target_mipsel_uclibc/lib -L/Volumes/adk/openadk/target_mipsel"\
  79. +"_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_mipsel_uclibc/usr/lib"
  80. +S["CFLAGS"]="-fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/sw/include -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -D_R"\
  81. +"EENTRANT -I/Volumes/adk/openadk/target_mipsel_uclibc/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DMOTION_V4L2 -DMOTION_V4L2_OLD -DTYPE_32BIT=\"int\""\
  82. +" -DHAVE_BSWAP "
  83. +S["CC"]="/Volumes/adk/openadk/host_mipsel_uclibc/bin/mipsel-openadk-linux-uclibc-gcc"
  84. +S["VIDEO"]="video_freebsd.o"
  85. +S["target_alias"]="mipsel-openadk-linux"
  86. +S["host_alias"]="mipsel-openadk-linux"
  87. +S["build_alias"]="i686-apple-darwin10"
  88. +S["LIBS"]="-lm -L/sw/lib -lpthread -lSDL -lpthread -ljpeg -lsqlite3"
  89. S["ECHO_T"]=""
  90. S["ECHO_N"]="-n"
  91. S["ECHO_C"]=""
  92. S["DEFS"]="-DHAVE_CONFIG_H"
  93. -S["mandir"]="${datarootdir}/man"
  94. +S["mandir"]="/usr/share/man"
  95. S["localedir"]="${datarootdir}/locale"
  96. S["libdir"]="${exec_prefix}/lib"
  97. S["psdir"]="${docdir}"
  98. @@ -654,16 +657,16 @@ S["infodir"]="${datarootdir}/info"
  99. S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
  100. S["oldincludedir"]="/usr/include"
  101. S["includedir"]="${prefix}/include"
  102. -S["localstatedir"]="${prefix}/var"
  103. +S["localstatedir"]="/var"
  104. S["sharedstatedir"]="${prefix}/com"
  105. -S["sysconfdir"]="${prefix}/etc"
  106. -S["datadir"]="${datarootdir}"
  107. +S["sysconfdir"]="/etc"
  108. +S["datadir"]="/usr/share"
  109. S["datarootdir"]="${prefix}/share"
  110. -S["libexecdir"]="${exec_prefix}/libexec"
  111. +S["libexecdir"]="/usr/libexec"
  112. S["sbindir"]="${exec_prefix}/sbin"
  113. -S["bindir"]="${exec_prefix}/bin"
  114. +S["bindir"]="/usr/bin"
  115. S["program_transform_name"]="s,x,x,"
  116. -S["prefix"]="/usr/local"
  117. +S["prefix"]="/usr"
  118. S["exec_prefix"]="${prefix}"
  119. S["PACKAGE_URL"]=""
  120. S["PACKAGE_BUGREPORT"]=""
  121. @@ -672,7 +675,7 @@ S["PACKAGE_VERSION"]="trunkREV528"
  122. S["PACKAGE_TARNAME"]="motion"
  123. S["PACKAGE_NAME"]="motion"
  124. S["PATH_SEPARATOR"]=":"
  125. -S["SHELL"]="/bin/sh"
  126. +S["SHELL"]="/bin/bash"
  127. _ACAWK
  128. cat >>"$tmp/subs1.awk" <<_ACAWK &&
  129. for (key in S) S_is_set[key] = 1
  130. @@ -740,17 +743,17 @@ D["HAVE_TIME_H"]=" 1"
  131. D["HAVE_SIGNAL_H"]=" 1"
  132. D["HAVE_SYS_IOCTL_H"]=" 1"
  133. D["HAVE_SYS_MMAN_H"]=" 1"
  134. -D["HAVE_LINUX_VIDEODEV_H"]=" 1"
  135. D["HAVE_LINUX_VIDEODEV2_H"]=" 1"
  136. D["HAVE_SYS_PARAM_H"]=" 1"
  137. D["HAVE_SYS_TYPES_H"]=" 1"
  138. D["HAVE_GET_CURRENT_DIR_NAME"]=" 1"
  139. +D["HAVE_LINUX_VIDEODEV2_H"]=" 1"
  140. D["SIZEOF_SHORT"]=" 2"
  141. D["SIZEOF_INT"]=" 4"
  142. -D["SIZEOF_LONG_INT"]=" 8"
  143. +D["SIZEOF_LONG_INT"]=" 4"
  144. D["SIZEOF_LONG_LONG"]=" 8"
  145. -D["SIZEOF_INT_P"]=" 8"
  146. -D["SIZEOF_VOID_P"]=" 8"
  147. +D["SIZEOF_INT_P"]=" 4"
  148. +D["SIZEOF_VOID_P"]=" 4"
  149. for (key in D) D_is_set[key] = 1
  150. FS = ""
  151. }
  152. @@ -940,11 +943,11 @@ case `eval "sed -n \"\$ac_sed_dataroot\"
  153. { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
  154. $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  155. ac_datarootdir_hack='
  156. - s&@datadir@&${datarootdir}&g
  157. + s&@datadir@&/usr/share&g
  158. s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
  159. s&@infodir@&${datarootdir}/info&g
  160. s&@localedir@&${datarootdir}/locale&g
  161. - s&@mandir@&${datarootdir}/man&g
  162. + s&@mandir@&/usr/share/man&g
  163. s&\${datarootdir}&${prefix}/share&g' ;;
  164. esac
  165. ac_sed_extra="/^[ ]*VPATH[ ]*=[ ]*/{