d426c948bf
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2988 6952d904-891a-0410-993b-d76249ca496b
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
diff -Nuar openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile
|
|
--- openldap-2.4.19.orig/contrib/slapd-modules/smbk5pwd/Makefile 2009-10-02 21:16:53.000000000 +0000
|
|
+++ openldap-2.4.19/contrib/slapd-modules/smbk5pwd/Makefile 2009-11-03 21:01:41.199550611 +0000
|
|
@@ -13,22 +13,26 @@
|
|
# <http://www.OpenLDAP.org/license.html>.
|
|
|
|
LIBTOOL=../../../libtool
|
|
-OPT=-g -O2
|
|
+#OPT=
|
|
CC=gcc
|
|
|
|
# Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
|
|
-DEFS=-DDO_KRB5 -DDO_SAMBA
|
|
+#DEFS=
|
|
|
|
-HEIMDAL_INC=-I/usr/heimdal/include
|
|
+#KRB5_INC=
|
|
SSL_INC=
|
|
LDAP_INC=-I../../../include -I../../../servers/slapd
|
|
-INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
|
|
+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC)
|
|
|
|
-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
|
|
+KRB5_LIB=-lkrb5 -lkadm5srv
|
|
SSL_LIB=-lcrypto
|
|
-LDAP_LIB=-lldap_r -llber
|
|
-LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
|
|
-
|
|
+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber
|
|
+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS)))
|
|
+ LIBS=$(LDAP_LIB) $(SSL_LIB)
|
|
+else
|
|
+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB)
|
|
+endif
|
|
+
|
|
prefix=/usr/local
|
|
exec_prefix=$(prefix)
|
|
ldap_subdir=/openldap
|
|
@@ -41,10 +45,10 @@
|
|
|
|
|
|
smbk5pwd.lo: smbk5pwd.c
|
|
- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
|
|
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
|
|
|
|
smbk5pwd.la: smbk5pwd.lo
|
|
- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
|
|
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
|
|
-rpath $(moduledir) -module -o $@ $? $(LIBS)
|
|
|
|
clean:
|