]>
Commit | Line | Data |
---|---|---|
e43c8efb JB |
1 | diff -Nur auth_ldap-1.6.0.orig/Makefile.in auth_ldap-1.6.0/Makefile.in |
2 | --- auth_ldap-1.6.0.orig/Makefile.in Wed Jul 4 16:37:55 2001 | |
3 | +++ auth_ldap-1.6.0/Makefile.in Tue Feb 19 14:05:51 2002 | |
4 | @@ -14,11 +14,11 @@ | |
3c1f924e PG |
5 | AIX_LDFLAGS_SHLIB=@AIX_LDFLAGS_SHLIB@ |
6 | MYCC=@MYCC@ | |
7 | ||
8 | -all: auth_ldap.so | |
9 | +all: mod_auth_ldap.so | |
10 | ||
11 | html: FAQ.html Changes.html auth_ldap.html | |
12 | ||
e43c8efb JB |
13 | -OBJS=auth_ldap.o auth_ldap_config.o auth_ldap_cache.o auth_ldap_cache_mgr.o |
14 | +OBJS=mod_auth_ldap.o auth_ldap_config.o auth_ldap_cache.o auth_ldap_cache_mgr.o | |
15 | ||
16 | CFLAGS=`$(APXS) -q CFLAGS` $(FRONTPAGE) $(SSL) $(SHARED_CACHE) $(OPENLDAP) | |
17 | CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB` | |
3c1f924e PG |
18 | @@ -27,7 +27,7 @@ |
19 | LD_SHLIB=`$(APXS) -q LD_SHLIB` | |
20 | LDFLAGS_SHLIB=$(EXTRA_LDFLAGS) `$(APXS) -q LDFLAGS_SHLIB` $(AIX_LDFLAGS_SHLIB) | |
21 | ||
22 | -auth_ldap.so: $(OBJS) $(AIX_EXP) | |
23 | +mod_auth_ldap.so: $(OBJS) $(AIX_EXP) | |
24 | @echo $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS) $(LIBS) | |
25 | @$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS) $(LIBS) | |
26 | ||
27 | @@ -46,8 +46,9 @@ | |
28 | cd .. && tar cvzf $$tar $$dirname/ --exclude-from=/tmp/excl.$$$$; \ | |
29 | rm -f /tmp/excl.$$$$ | |
30 | ||
31 | -install: auth_ldap.so | |
32 | - $(APXS) -i $(ACTIVATE) auth_ldap.so | |
33 | +install: mod_auth_ldap.so | |
34 | + mkdir -p $(DESTDIR)/usr/lib/apache | |
35 | + install $< $(DESTDIR)/usr/lib/apache | |
36 | ||
37 | clean: | |
38 | rm -f *.so *.o *~ core $(AIX_EXP) TAGS | |
e43c8efb JB |
39 | @@ -58,7 +59,7 @@ |
40 | $(AIX_EXP): | |
41 | @echo auth_ldap_module > $@ | |
42 | ||
43 | -auth_ldap.o: auth_ldap.h auth_ldap_cache_mgr.h | |
44 | +mod_auth_ldap.o: auth_ldap.h auth_ldap_cache_mgr.h | |
45 | auth_ldap_config.o: auth_ldap.h auth_ldap_cache_mgr.h | |
46 | auth_ldap_cache.o: auth_ldap.h auth_ldap_cache_mgr.h | |
47 | auth_ldap_cache_mgr.o: auth_ldap.h auth_ldap_cache_mgr.h | |
48 | diff -Nur auth_ldap-1.6.0.orig/configure.in auth_ldap-1.6.0/configure.in | |
49 | --- auth_ldap-1.6.0.orig/configure.in Wed Jul 4 16:40:26 2001 | |
50 | +++ auth_ldap-1.6.0/configure.in Tue Feb 19 14:06:28 2002 | |
51 | @@ -1,4 +1,4 @@ | |
52 | -AC_INIT(auth_ldap.c) | |
53 | +AC_INIT(mod_auth_ldap.c) | |
54 | AC_ARG_WITH(apxs, --with-apxs Path to Apache's apxs command, test $withval = no || APXS=$withval) | |
55 | AC_ARG_WITH(ldap-sdk, --with-ldap-sdk=netscape|openldap Specify the LDAP SDK to use) | |
56 | AC_ARG_WITH(sdk-directory, --with-sdk-headers Specify the path to the LDAP SDK header files) | |
57 | @@ -7,7 +7,7 @@ | |
58 | AC_ARG_WITH(ssl, --with-ssl Build with ssl support, test $withval = no || SSL=-DWITH_SSL) | |
59 | AC_ARG_WITH(shared-cache, --with-shared-cache Build with shared cache support, | |
60 | test $withval = no || SHARED_CACHE=-DWITH_SHARED_LDAP_CACHE, SHARED_CACHE=-DWITH_SHARED_LDAP_CACHE) | |
61 | -AC_ARG_WITH(activate, --with-activate Activate auth_ldap.so in http.conf, | |
62 | +AC_ARG_WITH(activate, --with-activate Activate mod_auth_ldap.so in http.conf, | |
63 | test $withval = yes && ACTIVATE=-a) | |
64 | AC_ARG_WITH(frontpage, --with-frontpage Enable FrontPage hack, | |
65 | test $withval=no || FRONTPAGE=-DAUTH_LDAP_FRONTPAGE_HACK) | |
66 | @@ -20,7 +20,7 @@ | |
67 | ||
68 | case $target in | |
69 | *aix*) | |
70 | - AIX_EXP=auth_ldap.exp | |
71 | + AIX_EXP=mod_auth_ldap.exp | |
72 | AIX_LDFLAGS_SHLIB=-bE:`echo $@|sed -e 's:\.so$$:.exp:'` | |
73 | ;; | |
74 | esac | |
75 | @@ -39,13 +39,13 @@ | |
76 | AC_CHECK_PROG(APXS, apxs, apxs, $with_apxs) | |
77 | ||
78 | AC_MSG_CHECKING(whether apxs works) | |
79 | -test -z "$APXS" && AC_MSG_ERROR(Cannot build auth_ldap without a valid apxs program) | |
80 | +test -z "$APXS" && AC_MSG_ERROR(Cannot build mod_auth_ldap without a valid apxs program) | |
81 | $APXS -q CFLAGS > /dev/null | |
82 | if test $? = 0; then | |
83 | AC_MSG_RESULT(yes) | |
84 | else | |
85 | AC_MSG_RESULT(no) | |
86 | - AC_MSG_ERROR(Cannot build auth_ldap without a valid apxs program) | |
87 | + AC_MSG_ERROR(Cannot build mod_auth_ldap without a valid apxs program) | |
88 | fi | |
89 | ||
90 | if test -n "$with_sdk_headers"; then |