|
Lines 57-63
Link Here
|
| 57 |
nl=' |
57 |
nl=' |
| 58 |
' |
58 |
' |
| 59 |
dnl Check that mkdir -p works |
59 |
dnl Check that mkdir -p works |
| 60 |
APR_MKDIR_P_CHECK($top_srcdir/build/mkdir.sh) |
60 |
APR_MKDIR_P_CHECK($ac_top_srcdir/build/mkdir.sh) |
| 61 |
|
61 |
|
| 62 |
dnl ## Run configure for packages Apache uses |
62 |
dnl ## Run configure for packages Apache uses |
| 63 |
|
63 |
|
|
Lines 93-99
Link Here
|
| 93 |
|
93 |
|
| 94 |
dnl We have to find apr-N-config when we reconfigure APR. |
94 |
dnl We have to find apr-N-config when we reconfigure APR. |
| 95 |
for majorver in 1 2; do |
95 |
for majorver in 1 2; do |
| 96 |
test_apr_config="$srcdir/srclib/apr/apr-${majorver}-config" |
96 |
test_apr_config="${ac_top_build_prefix}srclib/apr/apr-${majorver}-config" |
| 97 |
if test -f $test_apr_config; then |
97 |
if test -f $test_apr_config; then |
| 98 |
apr_config=$test_apr_config |
98 |
apr_config=$test_apr_config |
| 99 |
fi |
99 |
fi |
|
Lines 143-149
Link Here
|
| 143 |
AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" |
143 |
AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" |
| 144 |
AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS" |
144 |
AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS" |
| 145 |
dnl APR and APR-Util major versions must match |
145 |
dnl APR and APR-Util major versions must match |
| 146 |
apu_config="${srcdir}/srclib/apr-util/apu-${apr_major_version}-config" |
146 |
apu_config="${ac_top_build_prefix}srclib/apr-util/apu-${apr_major_version}-config" |
| 147 |
fi |
147 |
fi |
| 148 |
|
148 |
|
| 149 |
APR_ADDTO(LDFLAGS, `$apu_config --ldflags`) |
149 |
APR_ADDTO(LDFLAGS, `$apu_config --ldflags`) |