Mercurial > dropbear

changeset 1614:03df3b9f6048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mention localoptions.h being build directory, fix underscore in CHANGES
author Matt Johnston <matt@ucc.asn.au>
date Thu, 01 Mar 2018 22:12:30 +0800
parents caa9bb54dfa0
children cd23631dab5c
files CHANGES INSTALL default_options.h options.h
diffstat 4 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Wed Feb 28 15:10:14 2018 +0100
+++ b/CHANGES	Thu Mar 01 22:12:30 2018 +0800
@@ -2,12 +2,12 @@
 
 > > > Configuration/compatibility changes
   IMPORTANT
-  Custom configuration is now specified in local_options.h rather than options.h
+  Custom configuration is now specified in localoptions.h rather than options.h
   Available options and defaults can be seen in default_options.h
 
   To migrate your configuration, compare your customised options.h against the
   upstream options.h from your relevant version. Any customised options should
-  be put in localoptions.h
+  be put in localoptions.h in the build directory.
 
 - "configure --enable-static" should now be used instead of "make STATIC=1"
   This will avoid 'hardened build' flags that conflict with static binaries
--- a/INSTALL	Wed Feb 28 15:10:14 2018 +0100
+++ b/INSTALL	Thu Mar 01 22:12:30 2018 +0800
@@ -3,6 +3,8 @@
 - Edit localoptions.h to set which features you want. Available options
   are described in default_options.h, these will be overridden by
   anything set in localoptions.h
+  localoptions.h should be located in the build directory if you are
+  building out of tree.
 
 - If using a Mercurial or Git checkout, "autoconf; autoheader"
 
--- a/default_options.h	Wed Feb 28 15:10:14 2018 +0100
+++ b/default_options.h	Thu Mar 01 22:12:30 2018 +0800
@@ -6,8 +6,8 @@
 default_options.h  documents compile-time options, and provides default values.
 
 Local customisation should be added to localoptions.h which is
-used if it exists. Options defined there will override any options in this
-file.
+used if it exists in the build directory. Options defined there will override 
+any options in this file.
 
 Options can also be defined with -DDROPBEAR_XXX=[0,1] in Makefile CFLAGS
 
--- a/options.h	Wed Feb 28 15:10:14 2018 +0100
+++ b/options.h	Thu Mar 01 22:12:30 2018 +0800
@@ -5,6 +5,7 @@
             > > > Don't edit this file any more! < < <
             
 Local compile-time configuration should be defined in localoptions.h
+in the build directory.
 See default_options.h.in for a description of the available options.
 */