#21 autoheader-2.69 doesn't update config.h.in on vtun-3.0.3

None
pending
Bishop
None
5
2013-07-08
2013-07-04
Andrey Mazo
No

Running autoheader in vtun-3.0.3 leads to:

autoheader-2.69: warning: missing template: ENABLE_NAT_HACK
autoheader-2.69: Use AC_DEFINE([ENABLE_NAT_HACK], [], [Description])
autoheader-2.69: warning: missing template: HAVE_LZO
autoheader-2.69: warning: missing template: HAVE_SETPROC_TITLE
autoheader-2.69: warning: missing template: HAVE_SHAPER
autoheader-2.69: warning: missing template: HAVE_SSL
autoheader-2.69: warning: missing template: HAVE_SSL_AES
autoheader-2.69: warning: missing template: HAVE_SSL_BLOWFISH
autoheader-2.69: warning: missing template: HAVE_SSL_EVP
autoheader-2.69: warning: missing template: HAVE_ZLIB
autoheader-2.69: warning: missing template: VTUN_VER

The attached patch adds default values and descriptions to all AC_DEFINE(), AC_DEFINE_UNQUOTED() and AC_SEARCH_LIBS.
It also changes AC_INIT() call to a more sensitive package name and version.

1 Attachments

Related

Patches: #23

Discussion

  • Bishop
    Bishop
    2013-07-06

    I don't like the AC_INIT with the version hard-coded. I haven't had time to read the documentation yet -- can we use just '3' for the version without jeopardizing anything? This one change to the configure.in needs to be looked at later in relation to the $REL stuff at the end, so they both work to get the right version automatically.

    I'd like to see this patch in 304.

     
  • Bishop
    Bishop
    2013-07-07

    • status: open --> pending
    • assigned_to: Bishop
    • Group: -->
     
  • Andrey Mazo
    Andrey Mazo
    2013-07-08

    I've tried to resolve the issue with different values of version in AC_INIT() and VTUN_VER.

    I've used the trick mentioned in autoconf manual and implemented in their own configure.ac.

    I've moved the version guessing shell code to a separate shell script which is run at autoconf-time (not configure-time as before) and replaced all usage of VTUN_VER with PACKAGE_VERSION.
    Now ./configure --version and vtund -h reports the same version.

    Changes to config.h.in and configure are not included in the patch as they are generated from configure.in.
    The patch is created against branch-3_X2 commit 'Buy in rfe3561826/bug32/pbz5668 code to add an %h macro to up/downs'.

     
    Last edit: Andrey Mazo 2013-07-08
  • Andrey Mazo
    Andrey Mazo
    2013-07-08

    This is one more patch for configure.in.
    It has nothing to do with the previous two patches but continues the series of small configure.in cleanups.

    It uses special autoconf macros for help string to be properly aligned.
    It also fixes several typos.

    The resulting diff to configure for indent only part is like:

    ---with-ssl-headers=DIR  Crypto Include files location
    ---with-ssl-lib=DIR      Crypto Library location
    ---with-lzo-headers=DIR     LZO Include files location
    ---with-lzo-lib=DIR         LZO Library location
    ---with-blowfish-headers=DIR     Blowfish Include files location
    ---with-socks-lib=DIR         SOCKS Library location
    +  --with-ssl-headers=DIR  Crypto Include files location
    +  --with-ssl-lib=DIR      Crypto Library location
    +  --with-lzo-headers=DIR  LZO Include files location
    +  --with-lzo-lib=DIR      LZO Library location
    +  --with-blowfish-headers=DIR
    +                          Blowfish Include files location
    +  --with-socks-lib=DIR    SOCKS Library location