-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #94 from ofalk/devel
Prepare new release, including cmake support, updated autotools and a few small fixes
- Loading branch information
Showing
9 changed files
with
158 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely. | |
| To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | ||
|
|
||
| # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
| # serial 11 (pkg-config-0.29.1) | ||
| # serial 12 (pkg-config-0.29.2) | ||
|
|
||
| dnl Copyright © 2004 Scott James Remnant <[email protected]>. | ||
| dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> | ||
|
|
@@ -63,7 +63,7 @@ dnl | |
| dnl See the "Since" comment for each macro you use to see what version | ||
| dnl of the macros you require. | ||
| m4_defun([PKG_PREREQ], | ||
| [m4_define([PKG_MACROS_VERSION], [0.29.1]) | ||
| [m4_define([PKG_MACROS_VERSION], [0.29.2]) | ||
| m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | ||
| [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | ||
| ])dnl PKG_PREREQ | ||
|
|
@@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | |
| AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | ||
| pkg_failed=no | ||
| AC_MSG_CHECKING([for $1]) | ||
| AC_MSG_CHECKING([for $2]) | ||
| _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | ||
| _PKG_CONFIG([$1][_LIBS], [libs], [$2]) | ||
|
|
@@ -174,11 +174,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. | |
| See the pkg-config man page for more details.]) | ||
| if test $pkg_failed = yes; then | ||
| AC_MSG_RESULT([no]) | ||
| AC_MSG_RESULT([no]) | ||
| _PKG_SHORT_ERRORS_SUPPORTED | ||
| if test $_pkg_short_errors_supported = yes; then | ||
| $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
| else | ||
| else | ||
| $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
| fi | ||
| # Put the nasty error message in config.log where it belongs | ||
|
|
@@ -195,7 +195,7 @@ installed software in a non-standard prefix. | |
| _PKG_TEXT])[]dnl | ||
| ]) | ||
| elif test $pkg_failed = untried; then | ||
| AC_MSG_RESULT([no]) | ||
| AC_MSG_RESULT([no]) | ||
| m4_default([$4], [AC_MSG_FAILURE( | ||
| [The pkg-config script could not be found or is too old. Make sure it | ||
| is in your PATH or set the PKG_CONFIG environment variable to the full | ||
|
|
@@ -296,74 +296,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) | |
| AS_VAR_IF([$1], [""], [$5], [$4])dnl | ||
| ])dnl PKG_CHECK_VAR | ||
|
|
||
| dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
| dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], | ||
| dnl [DESCRIPTION], [DEFAULT]) | ||
| dnl ------------------------------------------ | ||
| dnl | ||
| dnl Prepare a "--with-" configure option using the lowercase | ||
| dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and | ||
| dnl PKG_CHECK_MODULES in a single macro. | ||
| AC_DEFUN([PKG_WITH_MODULES], | ||
| [ | ||
| m4_pushdef([with_arg], m4_tolower([$1])) | ||
| m4_pushdef([description], | ||
| [m4_default([$5], [build with ]with_arg[ support])]) | ||
| m4_pushdef([def_arg], [m4_default([$6], [auto])]) | ||
| m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) | ||
| m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) | ||
| m4_case(def_arg, | ||
| [yes],[m4_pushdef([with_without], [--without-]with_arg)], | ||
| [m4_pushdef([with_without],[--with-]with_arg)]) | ||
| AC_ARG_WITH(with_arg, | ||
| AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, | ||
| [AS_TR_SH([with_]with_arg)=def_arg]) | ||
| AS_CASE([$AS_TR_SH([with_]with_arg)], | ||
| [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], | ||
| [auto],[PKG_CHECK_MODULES([$1],[$2], | ||
| [m4_n([def_action_if_found]) $3], | ||
| [m4_n([def_action_if_not_found]) $4])]) | ||
| m4_popdef([with_arg]) | ||
| m4_popdef([description]) | ||
| m4_popdef([def_arg]) | ||
| ])dnl PKG_WITH_MODULES | ||
|
|
||
| dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
| dnl [DESCRIPTION], [DEFAULT]) | ||
| dnl ----------------------------------------------- | ||
| dnl | ||
| dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES | ||
| dnl check._[VARIABLE-PREFIX] is exported as make variable. | ||
| AC_DEFUN([PKG_HAVE_WITH_MODULES], | ||
| [ | ||
| PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) | ||
| AM_CONDITIONAL([HAVE_][$1], | ||
| [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) | ||
| ])dnl PKG_HAVE_WITH_MODULES | ||
|
|
||
| dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
| dnl [DESCRIPTION], [DEFAULT]) | ||
| dnl ------------------------------------------------------ | ||
| dnl | ||
| dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after | ||
| dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make | ||
| dnl and preprocessor variable. | ||
| AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], | ||
| [ | ||
| PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) | ||
| AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], | ||
| [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) | ||
| ])dnl PKG_HAVE_DEFINE_WITH_MODULES | ||
|
|
||
| # Copyright (C) 2002-2021 Free Software Foundation, Inc. | ||
| # | ||
| # This file is free software; the Free Software Foundation | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| SET(PACKAGE_VERSION @PROJECT_VERSION@) | ||
| IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) | ||
| SET(PACKAGE_VERSION_EXACT "true") | ||
| ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) | ||
| IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) | ||
| SET(PACKAGE_VERSION_COMPATIBLE "true") | ||
| ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) | ||
| SET(PACKAGE_VERSION_UNSUITABLE "true") | ||
| ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) | ||
| IF (PACKAGE_VERSION_UNSUITABLE) | ||
| MESSAGE("VERSION CHECK FAILED FOR ${PACKAGE_FIND_NAME}. WANTED ${PACKAGE_FIND_VERSION}, HAVE ${PACKAGE_VERSION}") | ||
| ENDIF(PACKAGE_VERSION_UNSUITABLE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| SET(prefix "@CMAKE_INSTALL_PREFIX@") | ||
| SET(exec_prefix "@CMAKE_INSTALL_PREFIX@") | ||
| SET(dnet_FOUND "TRUE") | ||
|
|
||
| include("${CMAKE_CURRENT_LIST_DIR}/dnetTargets.cmake") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.