From: Paul L. <pdo...@us...> - 2005-12-01 06:12:46
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19631/script Modified Files: Makefile Makefile.ldap Makefile.mysql Log Message: Minor makefile adjustmenst/tips Index: Makefile.ldap =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.ldap 22 Nov 2005 20:55:25 -0000 1.4 --- Makefile.ldap 1 Dec 2005 06:12:37 -0000 1.5 *************** *** 64,72 **** # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004a"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: --- 64,72 ---- # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004g"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004g/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: *************** *** 85,89 **** # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004a/c-client # # FreeBSD: --- 85,89 ---- # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004g/c-client # # FreeBSD: *************** *** 158,162 **** --- 158,164 ---- # LDAP_FLAGS=-I/usr/local/include + #LDAP_FLAGS=-I/usr/include LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber + #LDAP_LDFLAGS=-L/usr/lib -lldap # Point this to the LDAP configuration file *************** *** 180,185 **** chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile --- 182,189 ---- chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) ! #filtercmd.o: filtercmd.c Makefile ! # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile Index: Makefile.mysql =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.mysql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.mysql 22 Nov 2005 20:55:25 -0000 1.3 --- Makefile.mysql 1 Dec 2005 06:12:37 -0000 1.4 *************** *** 64,72 **** # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004a"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: --- 64,72 ---- # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004g"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004g/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: *************** *** 85,89 **** # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004a/c-client # # FreeBSD: --- 85,89 ---- # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004g/c-client # # FreeBSD: *************** *** 157,162 **** # Change these as needed if you are using LDAP functionality # #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/lib # Point this to the LDAP configuration file --- 157,164 ---- # Change these as needed if you are using LDAP functionality # + #LDAP_FLAGS=-I/usr/local/include #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber ! #LDAP_LDFLAGS=-L/usr/lib -lldap # Point this to the LDAP configuration file *************** *** 180,185 **** chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile --- 182,189 ---- chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) ! #filtercmd.o: filtercmd.c Makefile ! # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile Index: Makefile =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 22 Nov 2005 20:55:25 -0000 1.3 --- Makefile 1 Dec 2005 06:12:37 -0000 1.4 *************** *** 64,72 **** # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004a"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: --- 64,72 ---- # is for use when you have manually downloaded the UW-IMAP c-client library # and placed it in a subdirectory below serversidefilter/script (in this case ! # called "imap-2004g"). You should be able to successfully compile with # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above. # LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto ! #LIBS=../../../plugins/serversidefilter/script/imap-2004g/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto # # FreeBSD: *************** *** 85,89 **** # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004a/c-client # # FreeBSD: --- 85,89 ---- # I=/usr/include/imap ! #I=../../../plugins/serversidefilter/script/imap-2004g/c-client # # FreeBSD: *************** *** 157,162 **** # Change these as needed if you are using LDAP functionality # #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/lib # Point this to the LDAP configuration file --- 157,164 ---- # Change these as needed if you are using LDAP functionality # + #LDAP_FLAGS=-I/usr/local/include #LDAP_FLAGS=-I/usr/include ! #LDAP_LDFLAGS=-L/usr/local/lib -lldap -llber ! #LDAP_LDFLAGS=-L/usr/lib -lldap # Point this to the LDAP configuration file *************** *** 180,185 **** chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile --- 182,189 ---- chmod 4750 filtercmd ! filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) ! #filtercmd.o: filtercmd.c Makefile ! # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) checkcreds_cclient.o: checkcreds_cclient.c Makefile |