org.handhelds.familiar/packages/nonworking/apache/apache/apache-2.0.48/configure.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- httpd-2.0.48/./configure.in~configure
   7 +++ httpd-2.0.48/./configure.in
   8 @@ -4,8 +4,9 @@
   9  dnl     Use ./buildconf to produce a configure script
  10  dnl
  11
  12 -AC_PREREQ(2.13)
  13 -AC_INIT(ABOUT_APACHE)
  14 +AC_PREREQ(2.57)
  15 +AC_INIT
  16 +AC_CONFIG_SRCDIR([ABOUT_APACHE])
  17
  18  AC_CONFIG_HEADER(include/ap_config_auto.h)
  19  AC_CONFIG_AUX_DIR(build)
  20 @@ -55,7 +56,7 @@
  21  dnl shared library support for these packages doesn't currently
  22  dnl work on some platforms
  23
  24 -AC_CANONICAL_SYSTEM
  25 +AC_CANONICAL_TARGET([])
  26
  27  orig_prefix="$prefix"
  28
  29 @@ -209,7 +210,7 @@
  30        APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
  31        ;;
  32    *-solaris2*)
  33 -      dnl This is a hack -- we should be using AC_TRY_RUN instead
  34 +      dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead
  35        ap_platform_runtime_link_flag="-R"
  36        dnl solaris 8 and above don't have a thundering herd
  37        dnl not sure about rev's before this one.
  38 @@ -286,7 +287,7 @@
  39  dnl ## Check for typedefs, structures, and compiler characteristics.
  40
  41  AC_C_CONST
  42 -if test "$ac_cv_prog_gcc" = "yes"; then
  43 +if test "$ac_cv_c_compiler_gnu" = "yes"; then
  44    APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER)
  45  fi
  46
  47 @@ -305,9 +306,8 @@
  48
  49  dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
  50  AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
  51 -[AC_TRY_COMPILE([#include <sys/types.h>
  52 -#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
  53 -  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
  54 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
  55 +#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
  56  if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
  57      AC_DEFINE(HAVE_GMTOFF)
  58  fi
  59 --- httpd-2.0.48/./srclib/apr/configure.in~configure
  60 +++ httpd-2.0.48/./srclib/apr/configure.in
  61 @@ -4,7 +4,8 @@
  62  dnl Process this file with autoconf to produce a configure script.
  63  dnl Use ./buildconf to prepare build files and run autoconf for APR.
  64
  65 -AC_INIT(build/apr_common.m4)
  66 +AC_INIT
  67 +AC_CONFIG_SRCDIR([build/apr_common.m4])
  68  AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
  69  AC_CONFIG_AUX_DIR(build)
  70
  71 @@ -29,7 +30,7 @@
  72  dnl
  73  APR_CONFIG_NICE(config.nice)
  74
  75 -AC_CANONICAL_SYSTEM
  76 +AC_CANONICAL_TARGET([])
  77  echo "Configuring APR library"
  78  echo "Platform: $host"
  79
  80 @@ -532,18 +533,14 @@
  81              dnl Linux is silly as it has pthread_rwlock_init defined
  82              dnl but keeps the pthread_rwlock_t structure hidden unless
  83              dnl special things are defined.
  84 -            AC_TRY_COMPILE([#include <sys/types.h>
  85 -#include <pthread.h>],
  86 -                [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
  87 -                 ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
  88 +            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
  89 +#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
  90              if test "$ac_cv_struct_pthread_rw" = "no"; then
  91 -                AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
  92 +                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
  93  #define _BSD_SOURCE
  94  #define _SVID_SOURCE
  95  #include <sys/types.h>
  96 -#include <pthread.h>],
  97 -                    [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
  98 -                    ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
  99 +#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
 100                  if test "$ac_cv_struct_pthread_rw" = "yes"; then
 101                      APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE])
 102                      APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE])
 103 @@ -624,7 +621,7 @@
 104  if test "$ac_cv_func_mmap" = "yes" &&
 105     test "$ac_cv_file__dev_zero" = "yes"; then
 106      AC_MSG_CHECKING(for mmap that can map /dev/zero)
 107 -    AC_TRY_RUN([
 108 +    AC_RUN_IFELSE([AC_LANG_SOURCE([[
 109  #include <sys/types.h>
 110  #include <sys/stat.h>
 111  #include <fcntl.h>
 112 @@ -647,7 +644,7 @@
 113              return 3;
 114          }
 115          return 0;
 116 -    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
 117 +    }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no])
 118
 119      AC_MSG_RESULT($ac_cv_file__dev_zero)
 120  fi
 121 @@ -852,7 +849,8 @@
 122  AC_SUBST(sendfile)
 123
 124  AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
 125 -AC_DECL_SYS_SIGLIST
 126 +AC_CHECK_DECLS([sys_siglist])
 127 +
 128
 129  AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
 130  APR_CHECK_INET_ADDR
 131 @@ -961,12 +959,11 @@
 132  # being included by itself.  Check for <netinet/tcp.h> manually,
 133  # including another header file first.
 134  AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h],
 135 -[AC_TRY_CPP(
 136 -[#ifdef HAVE_NETINET_IN_H
 137 +[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H
 138  #include <netinet/in.h>
 139  #endif
 140  #include <netinet/tcp.h>
 141 -], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])])
 142 +]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])])
 143  if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
 144     netinet_tcph=1
 145     AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present])
 146 @@ -1039,7 +1036,7 @@
 147  if test "x$ac_cv_sizeof_voidp" != "x"; then
 148      voidp_size=$ac_cv_sizeof_voidp
 149  else
 150 -    AC_ERROR([Cannot determine size of void*])
 151 +    AC_MSG_ERROR([Cannot determine size of void*])
 152  fi
 153
 154  dnl Checks for integer size
 155 @@ -1378,7 +1375,7 @@
 156  fi
 157
 158  AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
 159 -AC_TRY_RUN([
 160 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
 161  #include <sys/types.h>
 162  #include <sys/time.h>
 163  #include <sys/resource.h>
 164 @@ -1388,10 +1385,10 @@
 165      limit.rlim_cur = 0;
 166      limit.rlim_max = 0;
 167      exit(0);
 168 -}], [
 169 -    ac_cv_struct_rlimit=yes ], [
 170 -    ac_cv_struct_rlimit=no ], [
 171 -    ac_cv_struct_rlimit=no ] ) ] )
 172 +}]])],[
 173 +    ac_cv_struct_rlimit=yes ],[
 174 +    ac_cv_struct_rlimit=no ],[
 175 +    ac_cv_struct_rlimit=no  ]) ] )
 176  struct_rlimit=0
 177  test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
 178  AC_SUBST(struct_rlimit)
 179 @@ -1405,7 +1402,7 @@
 180
 181  # Some systems return ENOSYS from sem_open.
 182  AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[
 183 -AC_TRY_RUN([
 184 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
 185  #include <errno.h>
 186  #include <stdlib.h>
 187  #include <fcntl.h>
 188 @@ -1424,22 +1421,21 @@
 189      sem_close(psem);
 190      sem_unlink(sem_name);
 191      exit(0);
 192 -}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no],
 193 -[ac_cv_func_sem_open=no])])
 194 +}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])])
 195
 196  # It's stupid, but not all platforms have union semun, even those that need it.
 197  AC_MSG_CHECKING(for union semun in sys/sem.h)
 198 -AC_TRY_COMPILE([
 199 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 200  #include <sys/types.h>
 201  #include <sys/ipc.h>
 202  #include <sys/sem.h>
 203 -],[
 204 +]], [[
 205  union semun arg;
 206  semctl(0, 0, 0, arg);
 207 -], [have_union_semun="1" union_semun=yes ]
 208 -msg=yes, [
 209 +]])],[have_union_semun="1" union_semun=yes
 210 +msg=yes],[
 211  have_union_semun="0"
 212 -msg=no ] )
 213 +msg=no  ])
 214  AC_MSG_RESULT([$msg])
 215  AC_SUBST(have_union_semun)
 216
 217 @@ -1461,7 +1457,7 @@
 218      # Linux and older versions of AIX have this problem.
 219      APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
 220        AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
 221 -      AC_TRY_RUN([
 222 +      AC_RUN_IFELSE([AC_LANG_SOURCE([[
 223  #include <sys/types.h>
 224  #include <pthread.h>
 225          int main()
 226 @@ -1479,7 +1475,7 @@
 227              if (pthread_mutex_destroy(&mutex))
 228                  exit(5);
 229              exit(0);
 230 -        }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
 231 +        }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])])
 232        # Override detection of pthread_mutexattr_setpshared
 233        ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
 234
 235 @@ -1488,15 +1484,15 @@
 236          if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then
 237              AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT],
 238              [apr_cv_setrobust_with_prio_inherit], [
 239 -            AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT
 240 +            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT
 241  #include <sys/types.h>
 242 -#include <pthread.h>],[
 243 +#include <pthread.h>]], [[
 244              int main()
 245              {
 246                  pthread_mutexattr_t attr;
 247                  pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
 248                  return 0;
 249 -            }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])])
 250 +            }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])])
 251              if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then
 252                  ac_cv_func_pthread_mutexattr_setrobust_np=yes
 253                  APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT)
 254 @@ -1664,7 +1660,7 @@
 255      if test -r "$apr_devrandom"; then
 256        rand="1"
 257      else
 258 -      AC_ERROR([$apr_devrandom not found or unreadable.])
 259 +      AC_MSG_ERROR([$apr_devrandom not found or unreadable.])
 260      fi
 261    fi
 262
 263 @@ -1700,9 +1696,8 @@
 264  dnl ----------------------------- Checking for Time Support
 265  echo "${nl}Checking for Time Support..."
 266  AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 267 -[AC_TRY_COMPILE([#include <sys/types.h>
 268 -#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
 269 -  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
 270 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 271 +#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
 272
 273  if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
 274      AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
 275 @@ -1711,14 +1706,14 @@
 276  dnl ----------------------------- Checking for Networking Support
 277  echo "${nl}Checking for Networking support..."
 278  AC_MSG_CHECKING(for in_addr in netinet/in.h)
 279 -AC_TRY_COMPILE([
 280 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 281  #include <sys/types.h>
 282  #include <netinet/in.h>
 283 -],[
 284 +]], [[
 285  struct in_addr arg;
 286  arg.s_addr = htonl(INADDR_ANY);
 287 -], [ have_in_addr="1"
 288 -msg=yes ] , [ have_in_addr="0"
 289 +]])],[ have_in_addr="1"
 290 +msg=yes  ],[ have_in_addr="0"
 291  msg=no ])
 292  AC_MSG_RESULT([$msg])
 293
 294 @@ -1920,12 +1915,13 @@
 295  dir=include/arch/unix
 296  test -d $dir || $MKDIR $dir
 297
 298 -AC_OUTPUT([
 299 +AC_CONFIG_FILES([
 300         $MAKEFILE1 $MAKEFILE2 $MAKEFILE3
 301         include/apr.h
 302         build/apr_rules.mk
 303         apr-config
 304 -],[
 305 +])
 306 +AC_CONFIG_COMMANDS([default],[[
 307  for i in $SAVE_FILES; do
 308    if cmp -s $i $i.save 2>/dev/null; then
 309      mv $i.save $i
 310 @@ -1934,7 +1930,8 @@
 311    rm -f $i.save
 312  done
 313  chmod +x apr-config
 314 -])
 315 +]],[[]])
 316 +AC_OUTPUT
 317
 318  dnl ----------------------------- Fixup Makefiles for VPATH support
 319
 320 --- httpd-2.0.48/./srclib/pcre/configure.in~configure
 321 +++ httpd-2.0.48/./srclib/pcre/configure.in
 322 @@ -3,7 +3,8 @@
 323  dnl This is required at the start; the name is the name of a file
 324  dnl it should be seeing, to verify it is in the same directory.
 325
 326 -AC_INIT(dftables.c)
 327 +AC_INIT
 328 +AC_CONFIG_SRCDIR([dftables.c])
 329
 330  dnl Arrange to build config.h from config.in. Note that pcre.h is
 331  dnl built differently, as it is just a "substitution" file.
 332 @@ -101,4 +102,6 @@
 333  AC_SUBST(PCRE_POSIXLIB_VERSION)
 334
 335  dnl This must be last; it determines what files are written as well as config.h
 336 -AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config])
 337 +AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config])
 338 +AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]])
 339 +AC_OUTPUT
 340 --- httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in~configure
 341 +++ httpd-2.0.48/./srclib/apr-util/xml/expat/configure.in
 342 @@ -10,7 +10,8 @@
 343  dnl   in the file COPYING that comes with this distribution.
 344  dnl
 345
 346 -AC_INIT(Makefile.in)
 347 +AC_INIT
 348 +AC_CONFIG_SRCDIR([Makefile.in])
 349  AC_CONFIG_AUX_DIR(conftools)
 350
 351  dnl
 352 @@ -45,7 +46,7 @@
 353
 354  AC_CONFIG_HEADER(config.h)
 355
 356 -AC_CANONICAL_SYSTEM
 357 +AC_CANONICAL_TARGET([])
 358  case "$host_alias" in
 359  *os2*)
 360      # Use a custom made libtool replacement
 361 @@ -106,4 +107,5 @@
 362
 363  AC_CHECK_FUNCS(memmove bcopy)
 364
 365 -AC_OUTPUT(Makefile lib/Makefile lib/expat.h)
 366 +AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h])
 367 +AC_OUTPUT
 368 --- httpd-2.0.48/./srclib/apr-util/configure.in~configure
 369 +++ httpd-2.0.48/./srclib/apr-util/configure.in
 370 @@ -2,8 +2,9 @@
 371  dnl Process this file with autoconf to produce a configure script
 372  dnl
 373
 374 -AC_PREREQ(2.13)
 375 -AC_INIT(export_vars.sh.in)
 376 +AC_PREREQ(2.57)
 377 +AC_INIT
 378 +AC_CONFIG_SRCDIR([export_vars.sh.in])
 379
 380  AC_CONFIG_HEADER(include/private/apu_config.h)
 381  AC_CONFIG_AUX_DIR(build)
 382 @@ -30,7 +31,7 @@
 383    USE_VPATH=1
 384  fi
 385
 386 -AC_CANONICAL_SYSTEM
 387 +AC_CANONICAL_TARGET([])
 388
 389  dnl
 390  dnl compute the top directory of the build