apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1400203 - in /apr/apr/branches/1.5.x: ./ build/apr_hints.m4
Date Fri, 19 Oct 2012 18:11:51 GMT
Author: sf
Date: Fri Oct 19 18:11:50 2012
New Revision: 1400203

URL: http://svn.apache.org/viewvc?rev=1400203&view=rev
Log:
Merge r1400200 from trunk:

Fix Linux 3.x detection

Submitted by: Gilles Espinasse <g esp free fr>
PR: 54001


Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/build/apr_hints.m4

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1400200

Modified: apr/apr/branches/1.5.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/build/apr_hints.m4?rev=1400203&r1=1400202&r2=1400203&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.5.x/build/apr_hints.m4 Fri Oct 19 18:11:50 2012
@@ -119,15 +119,7 @@ dnl	       # Not a problem in 10.20.  Ot
 	APR_ADDTO(CPPFLAGS, [-DHPUX -D_REENTRANT])
 	;;
     *-linux*)
-        case `uname -r` in
-	    2.* )  APR_ADDTO(CPPFLAGS, [-DLINUX=2])
-	           ;;
-	    1.* )  APR_ADDTO(CPPFLAGS, [-DLINUX=1])
-	           ;;
-	    * )
-	           ;;
-        esac
-	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_GNU_SOURCE])
+	APR_ADDTO(CPPFLAGS, [-DLINUX -D_REENTRANT -D_GNU_SOURCE])
 	;;
     *-lynx-lynxos)
 	APR_ADDTO(CPPFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])



Mime
View raw message