package/motion/patches/patch-config_status

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