apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1400205 - in /apr/apr/branches/1.4.x: ./ CHANGES build/apr_hints.m4
Date Fri, 19 Oct 2012 18:14:45 GMT
Author: sf
Date: Fri Oct 19 18:14:44 2012
New Revision: 1400205

URL: http://svn.apache.org/viewvc?rev=1400205&view=rev
Log:
Merge r1400200 from trunk, add CHANGES entry:

Fix Linux 3.x detection

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

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

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

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=1400205&r1=1400204&r2=1400205&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Fri Oct 19 18:14:44 2012
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.7
 
+  *) configure: Fix Linux 3.x detection. PR 54001. [Gilles Espinasse
+     <g esp free fr>]
+
   *) apr_time_exp_*() on Windows: Fix error in the tm_yday field of
      apr_time_exp_t for times within leap years.  PR 53175.
      [Jeff Trawick]

Modified: apr/apr/branches/1.4.x/build/apr_hints.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_hints.m4?rev=1400205&r1=1400204&r2=1400205&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_hints.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_hints.m4 Fri Oct 19 18:14:44 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