1. Force libuuid usage for IBM i (os400). uuid functions from libc do not work on this platform (IBM/ibmi-oss-issues#82)

2. Added additional compilation parameters for building on IBM i

Author: rgala

build/apr_hints.m4

@@ -427,12 +427,19 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
         AC_DEFINE(HAVE_ZOS_PTHREADS, 1, [Define for z/OS pthread API nuances])
         APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
         ;;
-    *-ibm-as400)
+    *-ibm-as400 | *-ibm-os400)
         APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
         APR_SETIFNULL(apr_process_lock_is_global, [yes])
         APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
         APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
         APR_SETIFNULL(apr_getservbyname_is_thread_safe, [yes])
+        APR_SETIFNULL(ac_cv_func_uuid_create, [no])
+        APR_SETIFNULL(ac_cv_func_uuid_generate, [yes])
+        APR_SETIFNULL(ac_cv_search_uuid_create, [no])
+        APR_SETIFNULL(ac_cv_search_uuid_generate, [yes])
+        APR_ADDTO(CFLAGS, [-D_THREAD_SAFE -D_LINUX_SOURCE_COMPAT -pthread])
+        APR_SETVAR(SHELL, [/qopensys/bin/sh])
+        APR_SETVAR(CONFIG_SHELL, [/qopensys/bin/sh])
         ;;
     *mingw*)
         APR_ADDTO(INTERNAL_CPPFLAGS, -DBINPATH=$apr_builddir/test/.libs)

configure.in

@@ -1476,7 +1476,7 @@ case $host in
                                   USE_SHMEM_SHMGET)
         fi
         ;;
-    *aix* )
+    *aix* | *os400 )
         # AIX cannot lseek() shared memory, and we always truncate/lseek together
         APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET)
        ;;