[pubcookie-dev] Re: CVS update: jjminer; webiso/pubcookie configure,1.87,1.88 stamp-h.in,1.40,1.41

[Jon Miner]

Incidentally, when I re-ran autoheader after changing configure.ac, it
wanted to remove
    /* Define to revert to DES encryption */
    #undef PBC_USE_DES_CRYPT
from config.h.in..

I didn't check the file in, because I didn't want to break things, but
was an incomplete merge done from aes-branch?  Things in config.h.in are
supposed to come from configure.ac, so I suspect that maybe there was a
--disable-aes option that didn't make the merge?

Looking at ViewCVS, it appears that the option is --enable-defalt-des
was added in 1.77.2.1 (on aes-branch), but it doesn't look like they
were ever merged back like the other changes were..

<http://webiso-cvs.cac.washington.edu/index.cgi/configure.ac.diff?r1=1.77&r2=1.77.2.1>

I would guess that the merge happened from "src/", since all the actual
code that changed was in there, which got the updated config.h.in, but
missed configure.ac a level up..

Steve or Nathan, can you confirm?  I can add it back and regenerate, but
since we don't use AES, I don't want to break it..

jon

* Jon Miner (miner at doit.wisc.edu) [051004 17:32]:
> Update of /usr/local/cvsroot/webiso/pubcookie
>  In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv15986
>  
>  Modified Files:
>  	configure stamp-h.in 
>  Log Message:
>  
>      And, regenerated..
>  
> 
> 
> 
> Index: webiso/pubcookie/configure
> diff -c webiso/pubcookie/configure:1.87 webiso/pubcookie/configure:1.88
> *** webiso/pubcookie/configure:1.87	Thu Jun 16 14:36:39 2005
> --- webiso/pubcookie/configure	Tue Oct  4 15:32:05 2005
> ***************
> *** 1,5 ****
>   #! /bin/sh
> ! # From configure.ac Revision: 1.83 .
>   # Guess values for system-dependent variables and create Makefiles.
>   # Generated by GNU Autoconf 2.57 for Pubcookie 3.2.2 pre-beta1.
>   #
> --- 1,5 ----
>   #! /bin/sh
> ! # From configure.ac Revision: 1.84 .
>   # Guess values for system-dependent variables and create Makefiles.
>   # Generated by GNU Autoconf 2.57 for Pubcookie 3.2.2 pre-beta1.
>   #
> ***************
> *** 6608,6614 ****
>           int main() {
>   
>           if ( (strcmp(LDAP_VENDOR_NAME, "Sun Microsystems Inc.") == 0)
> !             && LDAP_VENDOR_VERSION >= 508 )
>               exit(0);
>   
>               exit(2);
> --- 6608,6614 ----
>           int main() {
>   
>           if ( (strcmp(LDAP_VENDOR_NAME, "Sun Microsystems Inc.") == 0)
> !             && LDAP_VENDOR_VERSION >= 500 )
>               exit(0);
>   
>               exit(2);
> 
> 
> Index: webiso/pubcookie/stamp-h.in
> diff -c webiso/pubcookie/stamp-h.in:1.40 webiso/pubcookie/stamp-h.in:1.41
> *** webiso/pubcookie/stamp-h.in:1.40	Thu Sep  1 12:37:03 2005
> --- webiso/pubcookie/stamp-h.in	Tue Oct  4 15:32:05 2005
> ***************
> *** 1 ****
> ! Mon Aug 29 08:43:39 PDT 2005
> --- 1 ----
> ! Tue Oct  4 17:29:27 CDT 2005
> 
> 
> 
> end of message
> _______________________________________________
> pubcookie-dev mailing list
> pubcookie-dev at u.washington.edu
> http://mailman1.u.washington.edu/mailman/listinfo/pubcookie-dev

-- 
.Jonathan J. Miner------------------Division of Information Technology.
|miner at doit.wisc.edu                 University Of Wisconsin - Madison|
|608/262.9655                               Room 3146 Computer Science|
`---------------------------------------------------------------------'

"If ever an interface managed to bring to computing the same design
 standards that went into, say, the platypus, CDE is it."
    - Michael Hall (Editor, linuxplanet)
                                                             (300/708)