Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
opendht
Commits
3ecbc9ad
Commit
3ecbc9ad
authored
8 years ago
by
Adrien Béraud
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #95 from sim590/consistent-so-versionning
autotools: versionning consistent with CMake
parents
2362db85
b5a7a0ca
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+12
-1
12 additions, 1 deletion
configure.ac
src/Makefile.am
+1
-1
1 addition, 1 deletion
src/Makefile.am
with
13 additions
and
2 deletions
configure.ac
+
12
−
1
View file @
3ecbc9ad
AC_INIT(opendht, 0.6.1)
dnl define macros
m4_define([opendht_major_version], 0)
m4_define([opendht_minor_version], 6)
m4_define([opendht_patch_version], 1)
m4_define([opendht_version],
[opendht_major_version.opendht_minor_version.opendht_patch_version])
AC_INIT(opendht, [opendht_version])
AC_CONFIG_AUX_DIR(ac)
AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
AC_CANONICAL_HOST
AC_SUBST(OPENDHT_MAJOR_VERSION, opendht_major_version)
AC_SUBST(OPENDHT_MINOR_VERSION, opendht_minor_version)
AC_SUBST(OPENDHT_PATCH_VERSION, opendht_patch_version)
AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, adds stricter warnings, disables optimization]))
AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, adds stricter warnings, disables optimization]))
AS_IF([test "x$enable_debug" = "xyes"],
AS_IF([test "x$enable_debug" = "xyes"],
[CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -O0"],
[CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -O0"],
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
1
−
1
View file @
3ecbc9ad
...
@@ -3,7 +3,7 @@ SUBDIRS = argon2
...
@@ -3,7 +3,7 @@ SUBDIRS = argon2
lib_LTLIBRARIES
=
libopendht.la
lib_LTLIBRARIES
=
libopendht.la
AM_CPPFLAGS
=
-I
../include/opendht
AM_CPPFLAGS
=
-I
../include/opendht
libopendht_la_LDFLAGS
=
@LDFLAGS@ @GnuTLS_LIBS@ @Nettle_LIBS@
libopendht_la_LDFLAGS
=
@LDFLAGS@ @GnuTLS_LIBS@ @Nettle_LIBS@
-version-number
@OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
libopendht_la_LIBADD
=
./argon2/libargon2.la
libopendht_la_LIBADD
=
./argon2/libargon2.la
libopendht_la_SOURCES
=
\
libopendht_la_SOURCES
=
\
...
...
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