Ethereal-dev: Re: [Ethereal-dev] Bug in make-version.pl?

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Gerald Combs <gerald@xxxxxxxxxxxx>
Date: Thu, 16 Dec 2004 13:26:17 -0600
Thomas Boehne wrote:

> My previous fix seems to be incorrect, as I expected. This is what I
> am using now, it is not confusing me and seems to work:
> 
>         if (! open(FILE, "<$vconf_file")) {
>             print STDERR "Version configuration file $vconf_file not found.  Using defaults.\n";
>             return 1;
>         }

I just checked this change in, as well as...

> By the way, after downloading the release source code I found out how
> to compile a release from the svn tree -- I had to create an empty
> svnversion.h file, and a version.conf file that contains "enable: 0".
> I hope this was the correct way to do it.

a fix for svnversion.h not being created when ".svn/" isn't present.
Make-version.pl should now have the following behavior:

  - If the "-p/--package-version" argument is used, update configure.in
    and config.nmake.  Don't touch svnversion.h.

    Otherwise:

    - If ".svn/" is present AND versioning is enabled (which is the
      default), define SVNVERSION in svnversion.h.

    - Otherwise, comment out SVNVERSION in svnversion.h.

You should only have "enable: 0" in "version.conf" if you don't want
SVNVERSION defined.  The lack of a "version.conf" shouldn't keep you
from compiling.