code.vuplus.com Git - vuplus_openvuplus/blob - meta-openvuplus/recipes-base/samba/samba-3.0.37/configure.patch

   1 diff -urN source.old//aclocal.m4 source//aclocal.m4
   2 --- source.old//aclocal.m4      2008-08-25 22:09:21.000000000 +0100
   3 +++ source//aclocal.m4  2008-11-23 17:44:58.050646210 +0000
   4 @@ -1,5 +1,5 @@
   5  dnl test whether dirent has a d_off member
   6 -AC_DEFUN(AC_DIRENT_D_OFF,
   7 +AC_DEFUN([AC_DIRENT_D_OFF],
   8  [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
   9  [AC_TRY_COMPILE([
  10  #include <unistd.h>
  11 @@ -13,7 +13,7 @@
  12
  13  dnl Mark specified module as shared
  14  dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
  15 -AC_DEFUN(SMB_MODULE,
  16 +AC_DEFUN([SMB_MODULE],
  17  [
  18         AC_MSG_CHECKING([how to build $1])
  19         if test "$[MODULE_][$1]"; then
  20 @@ -44,7 +44,7 @@
  21         fi
  22  ])
  23
  24 -AC_DEFUN(SMB_SUBSYSTEM,
  25 +AC_DEFUN([SMB_SUBSYSTEM],
  26  [
  27         AC_SUBST($1_STATIC)
  28         AC_SUBST($1_MODULES)
  29 @@ -229,7 +229,7 @@
  30
  31  dnl Define an AC_DEFINE with ifndef guard.
  32  dnl AC_N_DEFINE(VARIABLE [, VALUE])
  33 -define(AC_N_DEFINE,
  34 +define([AC_N_DEFINE],
  35  [cat >> confdefs.h <<\EOF
  36  [#ifndef] $1
  37  [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
  38 @@ -239,14 +239,14 @@
  39
  40  dnl Add an #include
  41  dnl AC_ADD_INCLUDE(VARIABLE)
  42 -define(AC_ADD_INCLUDE,
  43 +define([AC_ADD_INCLUDE],
  44  [cat >> confdefs.h <<\EOF
  45  [#include] $1
  46  EOF
  47  ])
  48
  49  dnl Copied from libtool.m4
  50 -AC_DEFUN(AC_PROG_LD_GNU,
  51 +AC_DEFUN([AC_PROG_LD_GNU],
  52  [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
  53  [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
  54  if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
  55 @@ -257,7 +257,7 @@
  56  ])
  57
  58  dnl Removes -I/usr/include/? from given variable
  59 -AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
  60 +AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[
  61    ac_new_flags=""
  62    for i in [$]$1; do
  63      case [$]i in
  64 @@ -270,7 +270,7 @@
  65
  66  dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
  67  dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
  68 -AC_DEFUN(LIB_REMOVE_USR_LIB,[
  69 +AC_DEFUN([LIB_REMOVE_USR_LIB],[
  70    ac_new_flags=""
  71    l=""
  72    for i in [$]$1; do
  73 @@ -301,7 +301,7 @@
  74
  75  dnl From Bruno Haible.
  76
  77 -AC_DEFUN(jm_ICONV,
  78 +AC_DEFUN([jm_ICONV],
  79  [
  80    dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
  81    dnl those with the standalone portable libiconv installed).
  82 @@ -387,7 +387,7 @@
  83    fi
  84  ])
  85
  86 -AC_DEFUN(rjs_CHARSET,[
  87 +AC_DEFUN([rjs_CHARSET],[
  88    dnl Find out if we can convert from $1 to UCS2-LE
  89    AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
  90    AC_TRY_RUN([
  91 @@ -405,7 +405,7 @@
  92
  93  dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR)
  94  dnl This function doesn't add -I/usr/include into CFLAGS
  95 -AC_DEFUN(CFLAGS_ADD_DIR,[
  96 +AC_DEFUN([CFLAGS_ADD_DIR],[
  97  if test "$2" != "/usr/include" ; then
  98      $1="$$1 -I$2"
  99  fi
 100 @@ -413,7 +413,7 @@
 101
 102  dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR)
 103  dnl This function doesn't add -L/usr/lib into LDFLAGS
 104 -AC_DEFUN(LIB_ADD_DIR,[
 105 +AC_DEFUN([LIB_ADD_DIR],[
 106  if test "$2" != "/usr/lib" ; then
 107      $1="$$1 -L$2"
 108  fi
 109 @@ -486,7 +486,7 @@
 110  dnl AC_TRY_RUN_STRICT(PROGRAM,CFLAGS,CPPFLAGS,LDFLAGS,
 111  dnl            [ACTION-IF-TRUE],[ACTION-IF-FALSE],
 112  dnl            [ACTION-IF-CROSS-COMPILING = RUNTIME-ERROR])
 113 -AC_DEFUN( [AC_TRY_RUN_STRICT],
 114 +AC_DEFUN([AC_TRY_RUN_STRICT],
 115  [
 116         old_CFLAGS="$CFLAGS";
 117         CFLAGS="$2";
 118 diff -urN source.old//configure.in source//configure.in
 119 --- source.old//configure.in    2008-08-25 22:09:21.000000000 +0100
 120 +++ source//configure.in        2008-11-23 17:22:17.108791515 +0000
 121 @@ -1402,7 +1402,7 @@
 122  #endif
 123         exit(0);
 124  }
 125 -], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
 126 +], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross])
 127         if test x"$linux_getgrouplist_ok" = x"yes"; then
 128            AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
 129         fi
 130 diff -urN source.old//lib/replace/libreplace.m4 source//lib/replace/libreplace.m4
 131 --- source.old//lib/replace/libreplace.m4       2008-08-25 22:09:21.000000000 +0100
 132 +++ source//lib/replace/libreplace.m4   2008-11-23 17:54:27.942153096 +0000
 133 @@ -1,4 +1,4 @@
 134 -AC_DEFUN_ONCE(AC_LIBREPLACE_LOCATION_CHECKS,
 135 +AC_DEFUN_ONCE([AC_LIBREPLACE_LOCATION_CHECKS],
 136  [
 137  echo "LIBREPLACE_LOCATION_CHECKS: START"
 138
 139 @@ -27,7 +27,7 @@
 140  ]) dnl end AC_LIBREPLACE_LOCATION_CHECKS
 141
 142
 143 -AC_DEFUN_ONCE(AC_LIBREPLACE_BROKEN_CHECKS,
 144 +AC_DEFUN_ONCE([AC_LIBREPLACE_BROKEN_CHECKS],
 145  [
 146  echo "LIBREPLACE_BROKEN_CHECKS: START"
 147
 148 @@ -325,25 +325,25 @@
 149         AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
 150  fi
 151
 152 -m4_include(system/config.m4)
 153 +m4_include(lib/replace/system/config.m4)
 154
 155 -m4_include(dlfcn.m4)
 156 -m4_include(getpass.m4)
 157 -m4_include(strptime.m4)
 158 -m4_include(win32.m4)
 159 -m4_include(timegm.m4)
 160 -m4_include(repdir.m4)
 161 +m4_include(lib/replace/dlfcn.m4)
 162 +m4_include(lib/replace/getpass.m4)
 163 +m4_include(lib/replace/strptime.m4)
 164 +m4_include(lib/replace/win32.m4)
 165 +m4_include(lib/replace/timegm.m4)
 166 +m4_include(lib/replace/repdir.m4)
 167
 168  AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not found])])
 169
 170  echo "LIBREPLACE_BROKEN_CHECKS: END"
 171  ]) dnl end AC_LIBREPLACE_BROKEN_CHECKS
 172
 173 -AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_START,
 174 +AC_DEFUN_ONCE([AC__LIBREPLACE_ALL_CHECKS_START],
 175  [
 176  #LIBREPLACE_ALL_CHECKS: START"
 177  ])
 178 -AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_END,
 179 +AC_DEFUN_ONCE([AC__LIBREPLACE_ALL_CHECKS_END],
 180  [
 181  #LIBREPLACE_ALL_CHECKS: END"
 182  ])
 183 @@ -356,6 +356,6 @@
 184  AC__LIBREPLACE_ALL_CHECKS_END
 185  ])
 186
 187 -m4_include(libreplace_cc.m4)
 188 -m4_include(libreplace_macros.m4)
 189 -m4_include(autoconf-2.60.m4)
 190 +m4_include(lib/replace/libreplace_cc.m4)
 191 +m4_include(lib/replace/libreplace_macros.m4)
 192 +m4_include(lib/replace/autoconf-2.60.m4)
 193 diff -urN source.old//lib/replace/libreplace_macros.m4 source//lib/replace/libreplace_macros.m4
 194 --- source.old//lib/replace/libreplace_macros.m4        2008-08-25 22:09:21.000000000 +0100
 195 +++ source//lib/replace/libreplace_macros.m4    2008-11-23 17:31:08.269791372 +0000
 196 @@ -76,7 +76,7 @@
 197  ])
 198
 199  dnl AC_PROG_CC_FLAG(flag)
 200 -AC_DEFUN(AC_PROG_CC_FLAG,
 201 +AC_DEFUN([AC_PROG_CC_FLAG],
 202  [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
 203  [echo 'void f(){}' > conftest.c
 204  if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
 205 @@ -103,7 +103,7 @@
 206  dnl see if a declaration exists for a function or variable
 207  dnl defines HAVE_function_DECL if it exists
 208  dnl AC_HAVE_DECL(var, includes)
 209 -AC_DEFUN(AC_HAVE_DECL,
 210 +AC_DEFUN([AC_HAVE_DECL],
 211  [
 212   AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
 213      AC_TRY_COMPILE([$2],[int i = (int)$1],