You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2010/05/28 17:54:40 UTC

svn commit: r949211 - /apr/apr/trunk/configure.in

Author: wrowe
Date: Fri May 28 15:54:40 2010
New Revision: 949211

URL: http://svn.apache.org/viewvc?rev=949211&view=rev
Log:
Solve ELF-32 builds on ia64-hpux

Modified:
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=949211&r1=949210&r2=949211&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Fri May 28 15:54:40 2010
@@ -1260,6 +1260,7 @@ APR_FLAG_HEADERS(
     kernel/OS.h		\
     net/errno.h		\
     netinet/in.h	\
+    netinet/ip.h	\
     netinet/sctp.h      \
     netinet/sctp_uio.h  \
     sys/file.h		\
@@ -1300,6 +1301,12 @@ else
    netinet_tcph=0
 fi
 
+AC_CHECK_DECL(SOL_IP, , , [
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netinet/ip.h>
+])
+
 AC_SUBST(arpa_ineth)
 AC_SUBST(conioh)
 AC_SUBST(ctypeh)
@@ -1313,6 +1320,7 @@ AC_SUBST(limitsh)
 AC_SUBST(mswsockh)
 AC_SUBST(netdbh)
 AC_SUBST(netinet_inh)
+AC_SUBST(netinet_inp)
 AC_SUBST(netinet_sctph)
 AC_SUBST(netinet_sctp_uioh)
 AC_SUBST(netinet_tcph)
@@ -1758,9 +1766,8 @@ if test "$dsotype" = "any"; then
         *darwin[[0-8]]\.*) 
           # Original Darwin, not for 9.0!:
           AC_CHECK_FUNC(NSLinkModule, [dsotype=dyld]);;
-        *-hpux[[1-9]]\.*|*-hpux1[[01]]*)
-          # shl is specific to hpux(?), and is suboptimal for 64 bit builds,
-          # and most unlikely to be the choice of 12.x developers.
+        hppa*-hpux[[1-9]]\.*|hppa*-hpux1[[01]]*)
+          # shl is specific to parisc hpux SOM binaries, not used for 64 bit
           AC_CHECK_LIB(dld, shl_load, [have_shl=1])
           if test "$ac_cv_sizeof_voidp$have_shl" = "41"; then
             dsotype=shl; APR_ADDTO(LIBS,-ldld)



Re: svn commit: r949211 - /apr/apr/trunk/configure.in

Posted by Joe Orton <jo...@redhat.com>.
On Fri, May 28, 2010 at 03:54:40PM -0000, William Rowe wrote:
> Author: wrowe
> Date: Fri May 28 15:54:40 2010
> New Revision: 949211
> 
> URL: http://svn.apache.org/viewvc?rev=949211&view=rev
> Log:
> Solve ELF-32 builds on ia64-hpux

Did you mean to include the configure changes in that commit?

> --- apr/apr/trunk/configure.in (original)
> +++ apr/apr/trunk/configure.in Fri May 28 15:54:40 2010
> @@ -1260,6 +1260,7 @@ APR_FLAG_HEADERS(
>      kernel/OS.h		\
>      net/errno.h		\
>      netinet/in.h	\
> +    netinet/ip.h	\
>      netinet/sctp.h      \
>      netinet/sctp_uio.h  \
>      sys/file.h		\
> @@ -1300,6 +1301,12 @@ else
>     netinet_tcph=0
>  fi
>  
> +AC_CHECK_DECL(SOL_IP, , , [
...