@@ -2,24 +2,24 @@ dnl $Id$
2
2
dnl config.m4 for extension dba
3
3
dnl don't forget to call PHP_EXTENSION(dba)
4
4
5
- AC_DEFUN ( AC_TEMP_LDFLAGS ,[
6
- old_LDFLAGS=" $LDFLAGS"
5
+ AC_DEFUN ( PHP_TEMP_LDFLAGS ,[
6
+ old_LDFLAGS=$LDFLAGS
7
7
LDFLAGS="$1 $LDFLAGS"
8
8
$2
9
- LDFLAGS=" $old_LDFLAGS"
9
+ LDFLAGS=$old_LDFLAGS
10
10
] )
11
11
12
12
13
13
dnl Assign INCLUDE/LFLAGS from PREFIX
14
- AC_DEFUN ( AC_DBA_STD_ASSIGN ,[
15
- if test "$THIS_PREFIX" != "" -a "$THIS_PREFIX" != "/usr"; then
14
+ AC_DEFUN ( PHP_DBA_STD_ASSIGN ,[
15
+ if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
16
16
THIS_INCLUDE="$THIS_PREFIX/include"
17
17
THIS_LFLAGS="$THIS_PREFIX/lib"
18
18
fi
19
19
] )
20
20
21
21
dnl Standard check
22
- AC_DEFUN ( AC_DBA_STD_CHECK ,[
22
+ AC_DEFUN ( PHP_DBA_STD_CHECK ,[
23
23
THIS_RESULT="yes"
24
24
if test "$THIS_PREFIX" != "/usr" -a "$THIS_INCLUDE" = ""; then
25
25
AC_MSG_ERROR ( cannot find necessary header file ( s ))
@@ -30,7 +30,7 @@ AC_DEFUN(AC_DBA_STD_CHECK,[
30
30
] )
31
31
32
32
dnl Attach THIS_x to DBA_x
33
- AC_DEFUN ( AC_DBA_STD_ATTACH ,[
33
+ AC_DEFUN ( PHP_DBA_STD_ATTACH ,[
34
34
PHP_ADD_INCLUDE($THIS_INCLUDE)
35
35
PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
36
36
@@ -64,13 +64,13 @@ AC_ARG_WITH(gdbm,
64
64
done
65
65
66
66
unset ac_cv_lib_gdbm_gdbm_open
67
- AC_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
67
+ PHP_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
68
68
AC_CHECK_LIB ( gdbm , gdbm_open , [ AC_DEFINE ( DBA_GDBM , 1 , [ ] ) THIS_LIBS="gdbm"] )
69
69
] )
70
70
71
- AC_DBA_STD_ASSIGN
72
- AC_DBA_STD_CHECK
73
- AC_DBA_STD_ATTACH
71
+ PHP_DBA_STD_ASSIGN
72
+ PHP_DBA_STD_CHECK
73
+ PHP_DBA_STD_ATTACH
74
74
fi
75
75
] )
76
76
AC_MSG_CHECKING ( for GDBM support )
@@ -94,14 +94,14 @@ AC_ARG_WITH(ndbm,
94
94
fi
95
95
96
96
for LIB in db1 ndbm c; do
97
- AC_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
97
+ PHP_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
98
98
AC_CHECK_LIB ( $LIB , dbm_open , [ AC_DEFINE ( DBA_NDBM ,1 , [ ] ) THIS_LIBS="$LIB"] )
99
99
] )
100
100
done
101
101
102
- AC_DBA_STD_ASSIGN
103
- AC_DBA_STD_CHECK
104
- AC_DBA_STD_ATTACH
102
+ PHP_DBA_STD_ASSIGN
103
+ PHP_DBA_STD_CHECK
104
+ PHP_DBA_STD_ATTACH
105
105
fi
106
106
] )
107
107
AC_MSG_CHECKING ( for NDBM support )
@@ -139,14 +139,14 @@ AC_ARG_WITH(db2,
139
139
fi
140
140
141
141
for LIB in db db2 c; do
142
- AC_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
142
+ PHP_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
143
143
AC_CHECK_LIB ( $LIB , db_appinit , [ AC_DEFINE ( DBA_DB2 ,1 ,[ ] ) THIS_LIBS="$LIB"] )
144
144
] )
145
145
done
146
146
147
- AC_DBA_STD_ASSIGN
148
- AC_DBA_STD_CHECK
149
- AC_DBA_STD_ATTACH
147
+ PHP_DBA_STD_ASSIGN
148
+ PHP_DBA_STD_CHECK
149
+ PHP_DBA_STD_ATTACH
150
150
fi
151
151
] )
152
152
AC_MSG_CHECKING ( for Berkeley DB2 support )
@@ -167,14 +167,14 @@ AC_ARG_WITH(db3,
167
167
fi
168
168
169
169
for LIB in db db-3; do
170
- AC_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
170
+ PHP_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
171
171
AC_CHECK_LIB ( $LIB , db_create , [ AC_DEFINE ( DBA_DB3 ,1 ,[ ] ) THIS_LIBS="$LIB"] )
172
172
] )
173
173
done
174
174
175
- AC_DBA_STD_ASSIGN
176
- AC_DBA_STD_CHECK
177
- AC_DBA_STD_ATTACH
175
+ PHP_DBA_STD_ASSIGN
176
+ PHP_DBA_STD_CHECK
177
+ PHP_DBA_STD_ATTACH
178
178
fi
179
179
] )
180
180
AC_MSG_CHECKING ( for Berkeley DB3 support )
@@ -190,14 +190,14 @@ AC_ARG_WITH(dbm,
190
190
done
191
191
192
192
for LIB in db1 dbm c; do
193
- AC_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
193
+ PHP_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
194
194
AC_CHECK_LIB ( $LIB , dbminit , [ AC_DEFINE ( DBA_DBM ,1 ,[ ] ) THIS_LIBS="$LIB"] )
195
195
] )
196
196
done
197
197
198
- AC_DBA_STD_ASSIGN
199
- AC_DBA_STD_CHECK
200
- AC_DBA_STD_ATTACH
198
+ PHP_DBA_STD_ASSIGN
199
+ PHP_DBA_STD_CHECK
200
+ PHP_DBA_STD_ATTACH
201
201
fi
202
202
] )
203
203
AC_MSG_CHECKING ( for DBM support )
@@ -213,14 +213,14 @@ AC_ARG_WITH(cdb,
213
213
done
214
214
215
215
for LIB in cdb c; do
216
- AC_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
216
+ PHP_TEMP_LDFLAGS (-L$THIS_PREFIX/lib,[
217
217
AC_CHECK_LIB ( $LIB , cdb_bread , [ AC_DEFINE ( DBA_CDB ,1 ,[ ] ) THIS_LIBS="$LIB"] )
218
218
] )
219
219
done
220
220
221
- AC_DBA_STD_ASSIGN
222
- AC_DBA_STD_CHECK
223
- AC_DBA_STD_ATTACH
221
+ PHP_DBA_STD_ASSIGN
222
+ PHP_DBA_STD_CHECK
223
+ PHP_DBA_STD_ATTACH
224
224
fi
225
225
] )
226
226
AC_MSG_CHECKING ( for CDB support )
0 commit comments