Skip to content

Commit

Permalink
Use autoconf to generate compiler options
Browse files Browse the repository at this point in the history
Hopefully this means we'll break on fewer platforms.

Also, remove some of the extra optimization flags (e.g. -O3
-fomit-frame-pointer), which don't really do much.
  • Loading branch information
dlitz committed Feb 16, 2013
1 parent 6e3d2bd commit 95918a1
Show file tree
Hide file tree
Showing 14 changed files with 2,946 additions and 141 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -9,12 +9,15 @@
MANIFEST

# Autoconf
/aclocal.m4
/buildenv
/autom4te.cache
/autoscan.log
/config.h
/config.log
/config.status
src/config.h
src/stamp-h1

# Python versions
/tools/py/
Expand Down
10 changes: 9 additions & 1 deletion COPYRIGHT
Expand Up @@ -54,14 +54,22 @@ the public domain. Most are distributed with the following notice:
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

Exception:
Exceptions:

- Portions of HMAC.py and setup.py are derived from Python 2.2, and
are therefore Copyright (c) 2001, 2002, 2003 Python Software
Foundation (All Rights Reserved). They are licensed by the PSF
under the terms of the Python 2.2 license. (See the file
LEGAL/copy/LICENSE.python-2.2 for details.)

- The various GNU autotools (autoconf, automake, aclocal, etc.) are
used during the build process. This includes macros from
autoconf-archive, which are located in the m4/ directory. As is
customary, some files from the GNU autotools are included in the
source tree (in the root directory, and in the build-aux/
directory). These files are merely part of the build process, and
are not included in binary builds of the software.

EXPORT RESTRICTIONS:

Note that the export or re-export of cryptographic software and/or
Expand Down
5 changes: 3 additions & 2 deletions MANIFEST.in
@@ -1,7 +1,8 @@
include MANIFEST.in
include ACKS ChangeLog COPYRIGHT Doc/* TODO
include ACKS build-aux/* ChangeLog COPYRIGHT Doc/* TODO
graft LEGAL
recursive-include src *.h *.c
include buildenv.in
include src/config.h.in
include *.py
include configure configure.ac
include configure
12 changes: 9 additions & 3 deletions bootstrap.sh
Expand Up @@ -2,6 +2,12 @@
# Generates ./src/config.h.in and ./configure

set -e
aclocal
autoheader
autoconf
aclocal --force -I m4
autoconf --force
autoheader --force

# The following line is needed to generate build-aux/*, but it will fail
# because we have no Makefile.am
mkdir -p build-aux
echo "** You can ignore the following error about a missing Makefile.am"
automake --add-missing --copy || true

0 comments on commit 95918a1

Please sign in to comment.