org.handhelds.familiar/packages/e2fsprogs-libs/e2fsprogs-libs-1.34/configure.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- e2fsprogs-libs-1.33/./lib/uuid/configure.in~configure
   7 +++ e2fsprogs-libs-1.33/./lib/uuid/configure.in
   8 @@ -2,9 +2,11 @@
   9  dnl  Not used now, for the future when uuid is separated out into its
  10  dnl own package.
  11  dnl
  12 -AC_INIT(gen_uuid.c)
  13 -AC_PREREQ(2.12)
  14 +AC_INIT
  15 +AC_CONFIG_SRCDIR([gen_uuid.c])
  16 +AC_PREREQ(2.57)
  17
  18  AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
  19  AC_CHECK_FUNCS(srandom)
  20 -AC_OUTPUT(Makefile)
  21 +AC_CONFIG_FILES([Makefile])
  22 +AC_OUTPUT
  23 --- e2fsprogs-libs-1.33/./configure.in~configure
  24 +++ e2fsprogs-libs-1.33/./configure.in
  25 @@ -1,5 +1,6 @@
  26 -AC_INIT(version.h)
  27 -AC_PREREQ(2.12)
  28 +AC_INIT
  29 +AC_CONFIG_SRCDIR([version.h])
  30 +AC_PREREQ(2.57)
  31  MCONFIG=./MCONFIG
  32  AC_SUBST_FILE(MCONFIG)
  33  BINARY_TYPE=bin
  34 @@ -537,10 +538,7 @@
  35  dnl is not decleared.
  36  AC_MSG_CHECKING(whether d_reclen declared in dirent)
  37  AC_CACHE_VAL(e2fsprogs_cv_have_d_reclen_dirent,
  38 -       AC_TRY_COMPILE(
  39 -[#include <dirent.h>], [struct dirent de; de.d_reclen = 0; ],
  40 -       [e2fsprogs_cv_have_d_reclen_dirent=yes],
  41 -       [e2fsprogs_cv_have_d_reclen_dirent=no]))
  42 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dirent.h>]], [[struct dirent de; de.d_reclen = 0; ]])],[e2fsprogs_cv_have_d_reclen_dirent=yes],[e2fsprogs_cv_have_d_reclen_dirent=no]))
  43  AC_MSG_RESULT($e2fsprogs_cv_have_d_reclen_dirent)
  44  if test "$e2fsprogs_cv_have_d_reclen_dirent" = yes; then
  45     AC_DEFINE(HAVE_RECLEN_DIRENT)
  46 @@ -548,10 +546,7 @@
  47  dnl Check to see if ssize_t was decleared
  48  AC_MSG_CHECKING(whether ssize_t declared)
  49  AC_CACHE_VAL(e2fsprogs_cv_have_ssize_t,
  50 -       AC_TRY_COMPILE(
  51 -[#include <sys/types.h>], [ssize_t a = 0; ],
  52 -       [e2fsprogs_cv_have_ssize_t=yes],
  53 -       [e2fsprogs_cv_have_ssize_t=no]))
  54 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[ssize_t a = 0; ]])],[e2fsprogs_cv_have_ssize_t=yes],[e2fsprogs_cv_have_ssize_t=no]))
  55  AC_MSG_RESULT($e2fsprogs_cv_have_ssize_t)
  56  if test "$e2fsprogs_cv_have_ssize_t" = yes; then
  57     AC_DEFINE(HAVE_TYPE_SSIZE_T)
  58 @@ -565,10 +560,7 @@
  59  dnl
  60  AC_MSG_CHECKING(whether llseek declared in unistd.h)
  61  AC_CACHE_VAL(e2fsprogs_cv_have_llseek_prototype,
  62 -       AC_TRY_COMPILE(
  63 -[#include <unistd.h>], [extern int llseek(int);],
  64 -       [e2fsprogs_cv_have_llseek_prototype=no],
  65 -       [e2fsprogs_cv_have_llseek_prototype=yes]))
  66 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[extern int llseek(int);]])],[e2fsprogs_cv_have_llseek_prototype=no],[e2fsprogs_cv_have_llseek_prototype=yes]))
  67  AC_MSG_RESULT($e2fsprogs_cv_have_llseek_prototype)
  68  if test "$e2fsprogs_cv_have_llseek_prototype" = yes; then
  69     AC_DEFINE(HAVE_LLSEEK_PROTOTYPE)
  70 @@ -584,12 +576,9 @@
  71  dnl
  72  AC_MSG_CHECKING(whether lseek64 declared in unistd.h)
  73  AC_CACHE_VAL(e2fsprogs_cv_have_lseek64_prototype,
  74 -       AC_TRY_COMPILE(
  75 -[#define _LARGEFILE_SOURCE
  76 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _LARGEFILE_SOURCE
  77  #define _LARGEFILE64_SOURCE
  78 -#include <unistd.h>], [extern int lseek64(int);],
  79 -       [e2fsprogs_cv_have_lseek64_prototype=no],
  80 -       [e2fsprogs_cv_have_lseek64_prototype=yes]))
  81 +#include <unistd.h>]], [[extern int lseek64(int);]])],[e2fsprogs_cv_have_lseek64_prototype=no],[e2fsprogs_cv_have_lseek64_prototype=yes]))
  82  AC_MSG_RESULT($e2fsprogs_cv_have_lseek64_prototype)
  83  if test "$e2fsprogs_cv_have_lseek64_prototype" = yes; then
  84     AC_DEFINE(HAVE_LSEEK64_PROTOTYPE)
  85 @@ -624,18 +613,12 @@
  86  dnl
  87  AC_MSG_CHECKING(whether struct stat has a st_flags field)
  88  AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags,
  89 -       AC_TRY_COMPILE([#include <sys/stat.h>],
  90 -               [struct stat stat; stat.st_flags = 0;],
  91 -               [e2fsprogs_cv_struct_st_flags=yes],
  92 -               [e2fsprogs_cv_struct_st_flags=no]))
  93 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat stat; stat.st_flags = 0;]])],[e2fsprogs_cv_struct_st_flags=yes],[e2fsprogs_cv_struct_st_flags=no]))
  94  AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags)
  95  if test "$e2fsprogs_cv_struct_st_flags" = yes; then
  96    AC_MSG_CHECKING(whether st_flags field is useful)
  97    AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags_immut,
  98 -       AC_TRY_COMPILE([#include <sys/stat.h>],
  99 -               [struct stat stat; stat.st_flags |= UF_IMMUTABLE;],
 100 -               [e2fsprogs_cv_struct_st_flags_immut=yes],
 101 -               [e2fsprogs_cv_struct_st_flags_immut=no]))
 102 +       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat stat; stat.st_flags |= UF_IMMUTABLE;]])],[e2fsprogs_cv_struct_st_flags_immut=yes],[e2fsprogs_cv_struct_st_flags_immut=no]))
 103    AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags_immut)
 104    if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
 105           AC_DEFINE(HAVE_STAT_FLAGS)
 106 @@ -747,8 +730,7 @@
 107  AC_MSG_CHECKING([whether linker accepts -static])
 108  AC_CACHE_VAL(ac_cv_e2fsprogs_use_static,
 109  [SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
 110 -AC_TRY_LINK([#include <stdio.h>],[fflush(stdout);],
 111 - ac_cv_e2fsprogs_use_static=yes, ac_cv_e2fsprogs_use_static=no)
 112 +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[fflush(stdout);]])],[ac_cv_e2fsprogs_use_static=yes],[ac_cv_e2fsprogs_use_static=no])
 113  LDFLAGS=$SAVE_LDFLAGS])
 114  dnl
 115  dnl Regardless of how the test turns out, Solaris doesn't handle -static
 116 @@ -804,4 +786,5 @@
 117                 outlist="$outlist $i"
 118         fi
 119  done
 120 -AC_OUTPUT($outlist)
 121 +AC_CONFIG_FILES([$outlist])
 122 +AC_OUTPUT