[pubcookie-dev] WEBISO CVS update: willey; webiso/pubcookie Makefile.in,1.46,1.47 configure.ac,1.47,1.48

Stephen Willey willey at cac.washington.edu
Thu Dec 11 13:48:46 PST 2003 

Update of /usr/local/cvsroot/webiso/pubcookie
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv11182
 
 Modified Files:
 	Makefile.in configure.ac 
 Log Message:
 Merge from UWash3 branch



Index: webiso/pubcookie/Makefile.in
diff -c webiso/pubcookie/Makefile.in:1.46 webiso/pubcookie/Makefile.in:1.47
*** webiso/pubcookie/Makefile.in:1.46	Tue Sep 23 17:48:48 2003
--- webiso/pubcookie/Makefile.in	Thu Dec 11 13:48:43 2003
***************
*** 4,10 ****
  #
  # @configure_input@
  # 
! # $Id: Makefile.in,v 1.46 2003/09/24 00:48:48 willey Exp $
  
  @SET_MAKE@
  
--- 4,10 ----
  #
  # @configure_input@
  # 
! # $Id: Makefile.in,v 1.47 2003/12/11 21:48:43 willey Exp $
  
  @SET_MAKE@
  
***************
*** 96,101 ****
--- 96,102 ----
  		  $(builddir)/src/verify_kerberos4.o \
  		  $(builddir)/src/verify_kerberos5.o \
  		  $(builddir)/src/verify_shadow.o \
+ 		  $(builddir)/src/verify_uwsecurid.o \
  		  $(builddir)/src/verify_ldap.o \
  		  @SNPRINTF_0@ \
  		  $(builddir)/src/verify.o
***************
*** 107,123 ****
--- 108,127 ----
  		   $(srcdir)/src/verify_kerberos4.c \
  		   $(srcdir)/src/verify_kerberos5.c \
  		   $(srcdir)/src/verify_shadow.c \
+ 		   $(srcdir)/src/verify_uwsecurid.c \
  		   $(srcdir)/src/verify_ldap.c
  
  FLAVOR_SRC=$(srcdir)/src/flavor.c \
  		   $(srcdir)/src/ntmpl.c \
  		   @SNPRINTF_C@ \
  		   $(srcdir)/src/flavor_basic.c \
+ 		   $(srcdir)/src/flavor_uwsecurid.c \
  		   $(srcdir)/src/flavor_getcred.c
  
  INDEX_OBJ=$(builddir)/src/index.cgi.o $(builddir)/src/flavor.o \
  		  $(builddir)/src/flavor_basic.o \
  		  $(builddir)/src/flavor_getcred.o \
+ 		  $(builddir)/src/flavor_uwsecurid.o \
  		  $(builddir)/src/ntmpl.o \
  		  @SNPRINTF_0@ \
  		  $(VERIFIERS)
***************
*** 179,209 ****
  LIB_TESTS=base64 pbc_myconfig myconf
  
  LOGIN_TEMPLATES=$(srcdir)/src/login_templates.generic/error \
! 				$(srcdir)/src/login_templates.generic/login \
! 			    $(srcdir)/src/login_templates.generic/login_bad_auth \
! 			    $(srcdir)/src/login_templates.generic/login_cache_creds_wrong \
! 			    $(srcdir)/src/login_templates.generic/login_nolcookie \
! 				$(srcdir)/src/login_templates.generic/login_reauth \
! 				$(srcdir)/src/login_templates.generic/logout_already_weblogin \
! 				$(srcdir)/src/login_templates.generic/logout_app \
! 				$(srcdir)/src/login_templates.generic/logout_app_custom \
! 				$(srcdir)/src/login_templates.generic/logout_part1 \
! 				$(srcdir)/src/login_templates.generic/logout_part2 \
! 				$(srcdir)/src/login_templates.generic/logout_postscript_still_others \
! 				$(srcdir)/src/login_templates.generic/logout_postscript_still_weblogin \
! 				$(srcdir)/src/login_templates.generic/logout_still_weblogin \
! 				$(srcdir)/src/login_templates.generic/logout_time_remaining \
! 				$(srcdir)/src/login_templates.generic/logout_weblogin \
! 				$(srcdir)/src/login_templates.generic/nonpost_redirect \
! 				$(srcdir)/src/login_templates.generic/notok_part1 \
! 				$(srcdir)/src/login_templates.generic/notok_part2 \
! 				$(srcdir)/src/login_templates.generic/pinit_response1 \
! 				$(srcdir)/src/login_templates.generic/pinit_response2 \
! 				$(srcdir)/src/login_templates.generic/status \
! 				$(srcdir)/src/login_templates.generic/welcome_back \
! 				$(srcdir)/src/login_templates.generic/login_user_static \
! 				$(srcdir)/src/login_templates.generic/login_user_form_field \
! 				$(srcdir)/src/login_templates.generic/login_pinit
  
  LOGIN_IMAGES=$(srcdir)/src/login_templates.generic/images/check.gif \
  			 $(srcdir)/src/login_templates.generic/images/icon-excl.gif \
--- 183,228 ----
  LIB_TESTS=base64 pbc_myconfig myconf
  
  LOGIN_TEMPLATES=$(srcdir)/src/login_templates.generic/error \
! 		$(srcdir)/src/login_templates.generic/login \
! 		$(srcdir)/src/login_templates.generic/login_auth_prob_uwsecurid \
! 		$(srcdir)/src/login_templates.generic/login_bad_auth \
! 		$(srcdir)/src/login_templates.generic/login_bad_auth_static_user \
! 		$(srcdir)/src/login_templates.generic/login_bad_auth_static_user \
! 		$(srcdir)/src/login_templates.generic/login_bad_auth_static_user \
! 		$(srcdir)/src/login_templates.generic/login_cache_creds_wrong \
! 		$(srcdir)/src/login_templates.generic/login_expired \
! 		$(srcdir)/src/login_templates.generic/login_next_prn \
! 		$(srcdir)/src/login_templates.generic/login_expired \
! 		$(srcdir)/src/login_templates.generic/login_nolcookie \
! 		$(srcdir)/src/login_templates.generic/login_pass_form_field \
! 		$(srcdir)/src/login_templates.generic/login_pass_static \
! 		$(srcdir)/src/login_templates.generic/login_pinit \
! 		$(srcdir)/src/login_templates.generic/login_reauth \
! 		$(srcdir)/src/login_templates.generic/login_unauth_grant \
! 		$(srcdir)/src/login_templates.generic/login_user_form_field \
! 		$(srcdir)/src/login_templates.generic/login_user_hidden \
! 		$(srcdir)/src/login_templates.generic/login_user_static \
! 		$(srcdir)/src/login_templates.generic/login_uwsecurid \
! 		$(srcdir)/src/login_templates.generic/logout_already_weblogin \
! 		$(srcdir)/src/login_templates.generic/logout_app \
! 		$(srcdir)/src/login_templates.generic/logout_app_custom \
! 		$(srcdir)/src/login_templates.generic/logout_part1 \
! 		$(srcdir)/src/login_templates.generic/logout_part2 \
! 		$(srcdir)/src/login_templates.generic/logout_postscript_still_others \
! 		$(srcdir)/src/login_templates.generic/logout_postscript_still_weblogin \
! 		$(srcdir)/src/login_templates.generic/logout_still_known \
! 		$(srcdir)/src/login_templates.generic/logout_still_weblogin \
! 		$(srcdir)/src/login_templates.generic/logout_time_remaining \
! 		$(srcdir)/src/login_templates.generic/logout_weblogin \
! 		$(srcdir)/src/login_templates.generic/nonpost_redirect \
! 		$(srcdir)/src/login_templates.generic/notok_part1 \
! 		$(srcdir)/src/login_templates.generic/notok_part2 \
! 		$(srcdir)/src/login_templates.generic/pinit_response1 \
! 		$(srcdir)/src/login_templates.generic/pinit_response2 \
! 		$(srcdir)/src/login_templates.generic/status \
! 		$(srcdir)/src/login_templates.generic/welcome_back \
! 		$(srcdir)/src/login_templates.generic/README
! 
  
  LOGIN_IMAGES=$(srcdir)/src/login_templates.generic/images/check.gif \
  			 $(srcdir)/src/login_templates.generic/images/icon-excl.gif \
***************
*** 284,292 ****
  dtest:	$(builddir)/src/dtest.o $(LIB_OBJ)
  	$(CC) $(CFLAGS) -o $@ $(builddir)/src/dtest.o $(LIB_OBJ) $(LDFLAGS)
  
- vtest: $(VERIFIERS) $(LIB_OBJ)
- 	$(CC) ${CFLAGS} -DTEST_VERIFY -o $@ $(VERIFIERS) $(LIB_OBJ) $(LDFLAGS) $(EXTRA_LIBS)
- 
  ntmpl_test: $(srcdir)/src/ntmpl.c $(LIB_OBJ)
  	$(CC) ${CFLAGS} -DTEST_NTMPL -o $@ $(srcdir)/src/ntmpl.c $(LIB_OBJ) $(LDFLAGS) $(EXTRA_LIBS)
  
--- 303,308 ----
***************
*** 403,412 ****
  # Test Targets
  
  test:: verify
  	./verify alwaystrue nobody nothing
  
  verify: $(VERIFY_SRC) $(LIB_OBJ) $(builddir)/cgic/libcgic.a
! 	$(CC) $(CFLAGS) -g -o verify -DTEST_VERIFY $(VERIFY_SRC) $(LDFLAGS) $(LOGINLIBS) $(LIB_OBJ)
  
  tests: $(TEST_FILES)
  
--- 419,429 ----
  # Test Targets
  
  test:: verify
+ 	touch vtest
  	./verify alwaystrue nobody nothing
  
  verify: $(VERIFY_SRC) $(LIB_OBJ) $(builddir)/cgic/libcgic.a
! 	$(CC) $(CFLAGS) -o verify -DTEST_VERIFY $(VERIFY_SRC) $(LDFLAGS) $(LIB_OBJ) $(LOGINLIBS)
  
  tests: $(TEST_FILES)
  


Index: webiso/pubcookie/configure.ac
diff -c webiso/pubcookie/configure.ac:1.47 webiso/pubcookie/configure.ac:1.48
*** webiso/pubcookie/configure.ac:1.47	Wed Nov 26 14:20:51 2003
--- webiso/pubcookie/configure.ac	Thu Dec 11 13:48:44 2003
***************
*** 1,9 ****
  # Process this file with autoconf to produce a configure script.
  
! AC_REVISION($Revision: 1.47 $)
! AC_INIT(Pubcookie, [3.0.1 pre-beta1], pubcookie-dev at u.washington.edu)
  AC_CONFIG_SRCDIR([src/libpubcookie.c])
  AC_CONFIG_HEADER([src/config.h])
  
  # Set default prefix to /usr/local/pubcookie
  AC_PREFIX_DEFAULT(/usr/local/pubcookie)
--- 1,10 ----
  # Process this file with autoconf to produce a configure script.
  
! AC_REVISION($Revision: 1.48 $)
! AC_INIT(Pubcookie, [3.0.1 pre-beta2], pubcookie-dev at u.washington.edu)
  AC_CONFIG_SRCDIR([src/libpubcookie.c])
  AC_CONFIG_HEADER([src/config.h])
+ AC_LANG(C)
  
  # Set default prefix to /usr/local/pubcookie
  AC_PREFIX_DEFAULT(/usr/local/pubcookie)
***************
*** 305,311 ****
                    string.h strings.h sys/param.h sys/socket.h sys/time.h \
                    unistd.h getopt.h ctype.h stdarg.h stdio.h varargs.h\
                    sys/utsname.h time.h pwd.h sys/types.h assert.h sys/stat.h \
!                   sysexits.h mgoapi.h securid.h sys/resource.h fnmatch.h \
                    errno.h ])
  
  AC_CHECK_HEADER([syslog.h], 
--- 306,312 ----
                    string.h strings.h sys/param.h sys/socket.h sys/time.h \
                    unistd.h getopt.h ctype.h stdarg.h stdio.h varargs.h\
                    sys/utsname.h time.h pwd.h sys/types.h assert.h sys/stat.h \
!                   sysexits.h mgoapi.h sys/resource.h fnmatch.h \
                    errno.h ])
  
  AC_CHECK_HEADER([syslog.h], 
***************
*** 686,691 ****
--- 687,737 ----
  if test "$enable_shadow" = "yes"; then
      AC_CHECK_HEADERS([shadow.h crypt.h])
      AC_CHECK_LIB(crypt, crypt)
+ fi
+ 
+ AC_ARG_ENABLE(uwsecurid,
+     AC_HELP_STRING([--enable-uwsecurid],[Enable U. Wash. SecurID Verifier ]),
+ [ case "${enableval}" in
+    yes)
+     AC_DEFINE(ENABLE_UWSECURID, 1, [Define to 1 to support U. Wash. SecurID verifiers])
+     ;;
+   esac ])
+ 
+ if test "$enable_uwsecurid" = "yes"; then
+ 
+ # Find the mango Libraries!
+ 
+ if test -d "/usr/local/include"; then
+     CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ fi
+ 
+ if test -d "/usr/local/lib"; then
+     LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ fi
+ 
+ AC_ARG_WITH(mango-inc-dir,
+     AC_HELP_STRING([--with-mango-inc-dir=PATH], [U WASH ONLY: Mango include path]),
+ [ case "$withval" in
+    no)
+      ;;
+    *)
+      CPPFLAGS="$CPPFLAGS -I$withval"
+      ;;
+   esac ])
+ 
+ AC_ARG_WITH(mango-lib-dir,
+     AC_HELP_STRING([--with-mango-lib-dir=PATH], [U WASH ONLY: Mango lib path]),
+ [ case "$withval" in
+    no)
+      ;;
+    *)
+      LDFLAGS="$LDFLAGS -L$withval"
+      ;;
+   esac ])
+ 
+     AC_CHECK_HEADERS([mgoapi.h mgostuff.h])
+     LIBS="$LIBS -lmgoapi";
+     AC_CHECK_LIB(mgoapi)
  fi
  
  AC_ARG_ENABLE(dmalloc,



end of message

More information about the pubcookie-dev mailing list