[pubcookie-dev] CVS update: jjminer; webiso/pubcookie configure.ac,1.89,1.90 stamp-h.in,1.45,1.46

[miner at doit.wisc.edu]

Update of /usr/local/cvsroot/webiso/pubcookie
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv5590
 
 Modified Files:
 	configure.ac stamp-h.in 
 Log Message:
     Added generation of the "Windows Build Number" to configure, as well as
     autogeneration of PubcookieFilter.h and PubCookieFilter.rc
 



Index: webiso/pubcookie/configure.ac
diff -c webiso/pubcookie/configure.ac:1.89 webiso/pubcookie/configure.ac:1.90
*** webiso/pubcookie/configure.ac:1.89	Wed Nov 23 11:48:02 2005
--- webiso/pubcookie/configure.ac	Tue Nov 29 16:25:11 2005
***************
*** 1,6 ****
  # Process this file with autoconf to produce a configure script.
  
! AC_REVISION($Revision: 1.89 $)
  
  dnl Unfortunately, this must come before the seperate version splits, which are
  dnl definted below.  Please set them first, and then set the second argument of
--- 1,6 ----
  # Process this file with autoconf to produce a configure script.
  
! AC_REVISION($Revision: 1.90 $)
  
  dnl Unfortunately, this must come before the seperate version splits, which are
  dnl definted below.  Please set them first, and then set the second argument of
***************
*** 31,36 ****
--- 31,49 ----
  AC_SUBST(PBC_VERSION_PATCH, "$PBC_VERSION_PATCH")
  AC_SUBST(PBC_VERSION_TYPE, "$PBC_VERSION_TYPE") 
  
+ dnl The Windows "Build Number" ..  Unfortunately doesn't support using a text
+ dnl string, so we'll just kinda make it up.  ** Anyone got a better way? **
+ 
+ PBC_WIN_BUILD_NUMBER=`echo $PBC_VERSION_TYPE | sed -e 's/[[^0-9]]*//'`
+ if test "x$PBC_WIN_BUILD_NUMBER" = "x"; then
+     # Aparently this is a production release, give it #0.
+     # Yes, this might be a problem, because the betas will actually have a
+     # *higher* number.
+     PBC_WIN_BUILD_NUMBER=0
+ fi
+ 
+ AC_SUBST(PBC_WIN_BUILD_NUMBER, "$PBC_WIN_BUILD_NUMBER") 
+ 
  # Set default prefix to /usr/local/pubcookie
  AC_PREFIX_DEFAULT(/usr/local/pubcookie)
  
***************
*** 914,920 ****
  
  AM_MAINTAINER_MODE
  
! AC_CONFIG_FILES([Makefile src/pbc_path.h src/pbc_version.h cgic/Makefile])
  AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
  
  
--- 927,934 ----
  
  AM_MAINTAINER_MODE
  
! AC_CONFIG_FILES([Makefile src/pbc_path.h src/pbc_version.h cgic/Makefile
!                  src/Win32/PubCookieFilter.h src/Win32/PubCookieFilter.rc])
  AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
  
  


Index: webiso/pubcookie/stamp-h.in
diff -c webiso/pubcookie/stamp-h.in:1.45 webiso/pubcookie/stamp-h.in:1.46
*** webiso/pubcookie/stamp-h.in:1.45	Wed Nov 23 11:48:34 2005
--- webiso/pubcookie/stamp-h.in	Tue Nov 29 16:25:11 2005
***************
*** 1 ****
! Wed Nov 23 11:48:12 PST 2005
--- 1 ----
! Tue Nov 29 18:18:11 CST 2005



end of message