Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
nettle
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitry Baryshkov
nettle
Commits
d7522caf
Commit
d7522caf
authored
12 years ago
by
Niels Möller
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of git.lysator.liu.se:/nettle/nettle
parents
859d515d
b8e111bd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+7
-1
7 additions, 1 deletion
ChangeLog
Makefile.in
+3
-3
3 additions, 3 deletions
Makefile.in
configure.ac
+12
-0
12 additions, 0 deletions
configure.ac
with
22 additions
and
4 deletions
ChangeLog
+
7
−
1
View file @
d7522caf
...
...
@@ -8,8 +8,14 @@
2012-12-15 Niels Möller <nisse@lysator.liu.se>
Based on a patch from Alon Bar-Lev:
* Makefile.in (LIBTARGETS, SHLIBTARGET): Define as empty if static
or shared libraries, respectively, are disabled.
(TARGETS): Deleted @IF_SHARED@ conditional, now in the definition
of SHLIBTARGET.
From Alon Bar-Lev:
* configure.ac: Check for ar program.
* configure.ac: Check for ar program.
New option --disable-static.
* config.make.in (AR): Use configured value.
2012-12-13 Niels Möller <nisse@lysator.liu.se>
...
...
This diff is collapsed.
Click to expand it.
Makefile.in
+
3
−
3
View file @
d7522caf
...
...
@@ -20,8 +20,8 @@ include config.make
PRE_CPPFLAGS
=
-I
.
# FIXME: Add configuration of LIBEXT?
LIBTARGETS
=
libnettle.a @IF_HOGWEED@ libhogweed.a
SHLIBTARGETS
=
$(
LIBNETTLE_FORLINK
)
@IF_HOGWEED@
$(
LIBHOGWEED_FORLINK
)
LIBTARGETS
=
@IF_STATIC@
libnettle.a @IF_HOGWEED@ libhogweed.a
SHLIBTARGETS
=
@IF_SHARED@
$(
LIBNETTLE_FORLINK
)
@IF_HOGWEED@
$(
LIBHOGWEED_FORLINK
)
getopt_SOURCES
=
getopt.c getopt1.c
getopt_TARGETS
=
$(
getopt_SOURCES:.c
=
.
$(
OBJEXT
))
...
...
@@ -32,7 +32,7 @@ internal_TARGETS = $(internal_SOURCES:.c=.$(OBJEXT))
TARGETS
=
aesdata
$(
EXEEXT
)
desdata
$(
EXEEXT
)
twofishdata
$(
EXEEXT
)
\
shadata
$(
EXEEXT
)
gcmdata
$(
EXEEXT
)
\
$(
getopt_TARGETS
)
$(
internal_TARGETS
)
\
$(
LIBTARGETS
)
@IF_SHARED@
$(
SHLIBTARGETS
)
$(
LIBTARGETS
)
$(
SHLIBTARGETS
)
IMPLICIT_TARGETS
=
@IF_DLL@
$(
LIBNETTLE_FILE
)
$(
LIBHOGWEED_FILE
)
DOCTARGETS
=
@IF_DOCUMENTATION@ nettle.info nettle.html nettle.pdf
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
12
−
0
View file @
d7522caf
...
...
@@ -43,6 +43,10 @@ AC_ARG_ENABLE(assembler,
AC_HELP_STRING([--disable-assembler],[Disable assembler code]),,
[enable_assembler=yes])
AC_ARG_ENABLE(static,
AC_HELP_STRING([--disable-static], [Do not build any static library]),,
[enable_static=yes])
AC_ARG_ENABLE(shared,
AC_HELP_STRING([--disable-shared], [Do not build any shared library]),,
[enable_shared=yes])
...
...
@@ -572,6 +576,12 @@ else
IF_HOGWEED='#'
fi
if test "x$enable_static" = xyes ; then
IF_STATIC=''
else
IF_STATIC='#'
fi
if test "x$enable_shared" = xyes ; then
IF_SHARED=''
else
...
...
@@ -601,6 +611,7 @@ else
fi
AC_SUBST(IF_HOGWEED)
AC_SUBST(IF_STATIC)
AC_SUBST(IF_SHARED)
AC_SUBST(IF_DOCUMENTATION)
AC_SUBST(IF_DLL)
...
...
@@ -683,6 +694,7 @@ AC_MSG_NOTICE([summary of build options:
Install prefix: ${prefix}
Library directory: ${libdir}
Compiler: ${CC}
Static libraries: ${enable_static}
Shared libraries: ${enable_shared}
Public key crypto: ${enable_public_key}
Documentation: ${enable_documentation}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment