diff options
| author | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2012-10-19 18:14:44 +0000 |
|---|---|---|
| committer | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2012-10-19 18:14:44 +0000 |
| commit | 431d9669147e591402c2e822a82ecd17419c3571 (patch) | |
| tree | 48bd1a3e4fadb802d6c893b885c4b520e9a4340c | |
| parent | a29c8950661ad11b47969f8ab83c2daacba5525d (diff) | |
| download | libapr-431d9669147e591402c2e822a82ecd17419c3571.tar.gz | |
Merge r1400200 from trunk, add CHANGES entry:
Fix Linux 3.x detection
Submitted by: Gilles Espinasse <g esp free fr>
PR: 54001
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1400205 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | build/apr_hints.m4 | 10 |
2 files changed, 4 insertions, 9 deletions
@@ -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] diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index 4e062f433..19fdedfbb 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -119,15 +119,7 @@ dnl # Not a problem in 10.20. Otherwise, who knows? 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]) |