[Debian-astro-commits] [gyoto] 73/221: Change SONAME depending on built-in features and by default add "-unreleased" to the SONAME.
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 69522f0aad85d65531c3d30131a4af12b70c99b9
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Thu Oct 30 12:12:30 2014 +0100
Change SONAME depending on built-in features and by default add "-unreleased" to the SONAME.
---
INSTALL | 11 +++++++++++
Makefile.in | 1 +
bin/Makefile.am | 4 ++--
bin/Makefile.in | 9 +++++----
configure | 44 +++++++++++++++++++++++++++++++++++++-------
configure.ac | 35 ++++++++++++++++++++++++++---------
lib/Makefile.am | 8 ++++----
lib/Makefile.in | 32 ++++++++++++++++++--------------
lib/gyoto-uninstalled.pc.in | 2 +-
lib/gyoto.pc.in | 2 +-
yorick/Makefile.in | 2 +-
yorick/stdplug/Makefile.in | 2 +-
12 files changed, 108 insertions(+), 44 deletions(-)
diff --git a/INSTALL b/INSTALL
index c9c9d10..487aaa5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -75,6 +75,17 @@ CFITIO are in /opt/local:
CPPFLAGS=-I/opt/local/include \
LDFLAGS=-L/opt/local/lib
+If compiling a release (rather than the master branch from git) for
+binary distribution, you should use the --enable-release argument to
+get rid of "-unreleased" in the SONAME. Don't do that when compiling
+anything which is not an official release, though. The unqualified
+name libgyoto.* is reserved for full-featured, official releases. The
+configure script takes care of adding suffixes when some features are
+disabled, e.g. libgyoto-nompi.*. Note that there is no guarantee that
+two -unreleased builds are ABI compatible, even if they share the same
+SONAME, because the version information is incremented only
+immediately before making and official release.
+
III- BUILD
==========
$ make
diff --git a/Makefile.in b/Makefile.in
index 32daddf..35faf27 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -249,6 +249,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FEATURES = @FEATURES@
FGREP = @FGREP@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
diff --git a/bin/Makefile.am b/bin/Makefile.am
index fc8a652..5cc3b68 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -19,12 +19,12 @@ CLEANFILES += gyoto-mpi-worker. at sovers@.1
endif
gyoto_SOURCES = gyoto.C
-gyoto_LDADD = @top_builddir@/lib/libgyoto.la
+gyoto_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la
gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
gyoto_mpi_worker_ at sovers@_SOURCES = gyoto-mpi-worker.C
-gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto.la -lboost_mpi -lboost_serialization
+gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la -lboost_mpi -lboost_serialization
gyoto_mpi_worker_ at sovers@_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_mpi_worker_ at sovers@_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 32e00b6..1e16c33 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -111,7 +111,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
am_gyoto_OBJECTS = gyoto-gyoto.$(OBJEXT)
gyoto_OBJECTS = $(am_gyoto_OBJECTS)
-gyoto_DEPENDENCIES = @top_builddir@/lib/libgyoto.la
+gyoto_DEPENDENCIES = @top_builddir@/lib/libgyoto at FEATURES@.la
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -124,7 +124,7 @@ am_gyoto_mpi_worker_ at sovers@_OBJECTS = \
gyoto_mpi_worker_ at sovers@_OBJECTS = \
$(am_gyoto_mpi_worker_ at sovers@_OBJECTS)
gyoto_mpi_worker_ at sovers@_DEPENDENCIES = \
- @top_builddir@/lib/libgyoto.la
+ @top_builddir@/lib/libgyoto at FEATURES@.la
gyoto_mpi_worker_ at sovers@_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -258,6 +258,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FEATURES = @FEATURES@
FGREP = @FGREP@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
@@ -395,11 +396,11 @@ AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CLEANFILES = example-*.fits $(am__append_5)
dist_man_MANS = $(am__append_2) $(am__append_4)
gyoto_SOURCES = gyoto.C
-gyoto_LDADD = @top_builddir@/lib/libgyoto.la
+gyoto_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la
gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
gyoto_mpi_worker_ at sovers@_SOURCES = gyoto-mpi-worker.C
-gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto.la -lboost_mpi -lboost_serialization
+gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la -lboost_mpi -lboost_serialization
gyoto_mpi_worker_ at sovers@_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_mpi_worker_ at sovers@_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
@BUILD_GYOTO_TRUE at CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto --resolution=32 --nthreads=8
diff --git a/configure b/configure
index 35ff7a4..f386dde 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
mySUBDIRS
+sovers
+FEATURES
BUILD_GYOTO_FALSE
BUILD_GYOTO_TRUE
pkg_libs
@@ -693,7 +695,6 @@ BOOST_CPPFLAGS
DISTCHECK_CONFIGURE_FLAGS
BOOST_ROOT
HAVE_CXX11
-sovers
VERSINFO
CXXCPP
CPP
@@ -830,6 +831,7 @@ enable_dependency_tracking
with_gnu_ld
with_sysroot
enable_libtool_lock
+enable_release
enable_c__11
with_mpi
with_boost
@@ -1508,6 +1510,8 @@ Optional Features:
--disable-dependency-tracking
speeds up one-time build
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-release enable a release build (remove -unreleased from
+ SONAME)
--disable-c++11 disable C++11 features (including advanced
integrators)
--enable-native append "-march=native" to CXXFLAGS if supported
@@ -15452,14 +15456,17 @@ ac_config_headers="$ac_config_headers config.h include/GyotoConfig.h"
VERSINFO=3:0:1
-sovers=`echo $VERSINFO | tr : _`
-
+FEATURES=""
+# Check whether --enable-release was given.
+if test "${enable_release+set}" = set; then :
+ enableval=$enable_release;
+fi
-cat >>confdefs.h <<_ACEOF
-#define GYOTO_SOVERS "${sovers}"
-_ACEOF
+if test "x$enable_release" != "xyes"; then :
+ FEATURES+="-unreleased"
+fi
# Checks for programs.
@@ -15877,8 +15884,11 @@ fi
if test "x$with_boost" != "x" && test "x$with_boost" != "xno"; then :
if test "x$have_boost" == "xno"; then :
as_fn_error $? "Boost requested but not found" "$LINENO" 5
+else
+ FEATURES+="-noboost"
fi
+
fi
# If --with-mpi=auto is used, try to find MPI, but use standard C compiler if it is not found.
@@ -15978,6 +15988,8 @@ else
if test "x$with_mpi" == xyes; then :
as_fn_error $? "MPI requested but not found" "$LINENO" 5
+else
+ FEATURES+="-nompi"
fi
fi
@@ -17277,7 +17289,7 @@ if test "${enable_pthreads+set}" = set; then :
fi
fi
-if test "x$use_pthreads" = "xyes"; then :
+if test "x$use_pthreads" == "xyes"; then :
ac_ext=c
@@ -17674,6 +17686,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+else
+ FEATURES+="-nopthreads"
fi
## UDUNITS
@@ -17893,6 +17907,8 @@ if test "x$have_udunits" == "xno"; then :
*** UDUNITS requested but not found! ***
****************************************" "$LINENO" 5
+else
+ FEATURES+="-nounits"
fi
@@ -18108,6 +18124,8 @@ if test "x$have_xerces" == "xno"; then :
if test "x$with_xerces" == "xyes"; then :
as_fn_error $? "xerces requested but not found" "$LINENO" 5
+else
+ FEATURES+="-noxml"
fi
if test "x$have_mpi" == "xyes"; then :
@@ -18325,6 +18343,8 @@ if test "x$have_cfitsio" == "xno"; then :
if test "x$with_cfitsio" == "xyes"; then :
as_fn_error $? "cfitsio requested but not found" "$LINENO" 5
+else
+ FEATURES+="-nofits"
fi
@@ -18505,6 +18525,16 @@ else
fi
+sovers=`echo $VERSINFO | tr : _`
+sovers+=$FEATURES
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define GYOTO_SOVERS "${sovers}"
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile bin/Makefile doc/Makefile doc/user_guide/Makefile lib/Makefile lib/gyoto.pc lib/gyoto-uninstalled.pc"
if test "x$YORICK" != "x"; then :
diff --git a/configure.ac b/configure.ac
index f0a9d72..2e982a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,11 +14,15 @@ LT_INIT([dlopen disable-static])
AC_CONFIG_HEADERS([config.h include/GyotoConfig.h])
VERSINFO=3:0:1
-sovers=`echo $VERSINFO | tr : _`
AC_SUBST([VERSINFO])
-AC_SUBST([sovers])
-AC_DEFINE_UNQUOTED([GYOTO_SOVERS], ["${sovers}"], [Gyoto ABI version])
+FEATURES=""
+AC_ARG_ENABLE([release],
+ [AS_HELP_STRING([--enable-release],
+ [enable a release build (remove -unreleased from SONAME)])])
+AS_IF([test "x$enable_release" != "xyes"],
+ [FEATURES+="-unreleased"])
+
# Checks for programs.
@@ -50,7 +54,9 @@ AS_IF([test "x$HAVE_CXX11" = "x1"],
)
AS_IF([test "x$with_boost" != "x" && test "x$with_boost" != "xno"],
[AS_IF([test "x$have_boost" == "xno"],
- [AC_MSG_ERROR([Boost requested but not found])])]
+ [AC_MSG_ERROR([Boost requested but not found])],
+ [FEATURES+="-noboost"])
+ ]
)
# If --with-mpi=auto is used, try to find MPI, but use standard C compiler if it is not found.
@@ -81,7 +87,8 @@ AS_IF([test "x$have_mpi" == xyes],
AC_DEFINE([HAVE_MPI], [1], [Define to 1 if you have MPI])],
[ AS_IF([test "x$with_mpi" == xyes],
[ AC_ERROR([MPI requested but not found])
- ])
+ ],
+ [FEATURES+="-nompi"])
])
AM_CONDITIONAL(HAVE_MPI, [test "x$have_mpi" == xyes])
@@ -249,7 +256,8 @@ AC_ARG_ENABLE([pthreads],
[AS_HELP_STRING([--disable-pthreads],
[disable POSIX threads parallelization])],
[AS_IF([test "x$enable_pthreads" = "xno"], [use_pthreads=no])])
-AS_IF([test "x$use_pthreads" = "xyes"], [AX_PTHREAD])
+AS_IF([test "x$use_pthreads" == "xyes"], [AX_PTHREAD],
+ [FEATURES+="-nopthreads"])
## UDUNITS
# Check for UDUNITS
@@ -352,7 +360,8 @@ AS_IF([test "x$have_udunits" == "xno"],
****************************************
*** UDUNITS requested but not found! ***
****************************************])
- ]
+ ],
+ [FEATURES+="-nounits"]
)
],
[use_udunits=yes
@@ -454,7 +463,8 @@ AS_IF([test "x$have_xerces" == "xno"],
[
AS_IF([test "x$with_xerces" == "xyes"],
[AC_MSG_ERROR([xerces requested but not found])
- ]
+ ],
+ [FEATURES+="-noxml"]
)
AS_IF([test "x$have_mpi" == "xyes"],
[AC_MSG_ERROR([The MPI feature set requires Xerces. Please reconfigure with --without-mpi or with --with-xerces.])])
@@ -557,7 +567,8 @@ AS_IF([test "x$with_cfitsio" != "xno"],
AS_IF([test "x$have_cfitsio" == "xno"],
[AS_IF([test "x$with_cfitsio" == "xyes"],
[AC_MSG_ERROR([cfitsio requested but not found])
- ]
+ ],
+ [FEATURES+="-nofits"]
)
],
[use_cfitsio=yes
@@ -675,6 +686,12 @@ AS_IF([test "x$build_exec" == xyes], [mySUBDIRS="$mySUBDIRS bin"])
AM_CONDITIONAL([BUILD_GYOTO], [test "x$use_xerces" != "x" && test "x$use_cfitsio" != "x"])
+sovers=`echo $VERSINFO | tr : _`
+sovers+=$FEATURES
+AC_SUBST([FEATURES])
+AC_SUBST([sovers])
+AC_DEFINE_UNQUOTED([GYOTO_SOVERS], ["${sovers}"], [Gyoto ABI version])
+
AC_CONFIG_FILES([Makefile
bin/Makefile
doc/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2481968..676e1c0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,14 +13,14 @@ library_includedir=$(includedir)/Gyoto
library_include_HEADERS=$(top_srcdir)/include/*.h
# MAIN LIBRARY
-lib_LTLIBRARIES = libgyoto.la
-libgyoto_la_SOURCES = Astrobj.C Factory.C Register.C SmartPointer.C Utils.C Metric.C \
+lib_LTLIBRARIES = libgyoto at FEATURES@.la
+libgyoto at FEATURES@_la_SOURCES = Astrobj.C Factory.C Register.C SmartPointer.C Utils.C Metric.C \
WIP.C Worldline.C Photon.C Scenery.C \
WorldlineIntegState.C Error.C Screen.C Spectrum.C \
Spectrometer.C ComplexSpectrometer.C UniformSpectrometer.C \
ThinDisk.C Converters.C Functors.C Hooks.C
-libgyoto_la_LIBS = $(XERCESLDFLAGS)
-libgyoto_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSINFO)
+libgyoto at FEATURES@_la_LIBS = $(XERCESLDFLAGS)
+libgyoto at FEATURES@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSINFO)
# STANDARD PLUGIN
soverdir=$(pkglibdir)/@sovers@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c55bad7..c396c07 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -164,17 +164,18 @@ libgyoto_stdplug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(libgyoto_stdplug_la_LDFLAGS) \
$(LDFLAGS) -o $@
-libgyoto_la_LIBADD =
-am_libgyoto_la_OBJECTS = Astrobj.lo Factory.lo Register.lo \
+libgyoto at FEATURES@_la_LIBADD =
+am_libgyoto at FEATURES@_la_OBJECTS = Astrobj.lo Factory.lo Register.lo \
SmartPointer.lo Utils.lo Metric.lo WIP.lo Worldline.lo \
Photon.lo Scenery.lo WorldlineIntegState.lo Error.lo Screen.lo \
Spectrum.lo Spectrometer.lo ComplexSpectrometer.lo \
UniformSpectrometer.lo ThinDisk.lo Converters.lo Functors.lo \
Hooks.lo
-libgyoto_la_OBJECTS = $(am_libgyoto_la_OBJECTS)
-libgyoto_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(libgyoto_la_LDFLAGS) $(LDFLAGS) -o $@
+libgyoto at FEATURES@_la_OBJECTS = $(am_libgyoto at FEATURES@_la_OBJECTS)
+libgyoto at FEATURES@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libgyoto at FEATURES@_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -210,10 +211,12 @@ am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = $(libgyoto_lorene_la_SOURCES) $(libgyoto_stdplug_la_SOURCES) \
- $(EXTRA_libgyoto_stdplug_la_SOURCES) $(libgyoto_la_SOURCES)
+ $(EXTRA_libgyoto_stdplug_la_SOURCES) \
+ $(libgyoto at FEATURES@_la_SOURCES)
DIST_SOURCES = $(libgyoto_lorene_la_SOURCES) \
$(libgyoto_stdplug_la_SOURCES) \
- $(EXTRA_libgyoto_stdplug_la_SOURCES) $(libgyoto_la_SOURCES)
+ $(EXTRA_libgyoto_stdplug_la_SOURCES) \
+ $(libgyoto at FEATURES@_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -279,6 +282,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FEATURES = @FEATURES@
FGREP = @FGREP@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
@@ -420,15 +424,15 @@ library_includedir = $(includedir)/Gyoto
library_include_HEADERS = $(top_srcdir)/include/*.h
# MAIN LIBRARY
-lib_LTLIBRARIES = libgyoto.la
-libgyoto_la_SOURCES = Astrobj.C Factory.C Register.C SmartPointer.C Utils.C Metric.C \
+lib_LTLIBRARIES = libgyoto at FEATURES@.la
+libgyoto at FEATURES@_la_SOURCES = Astrobj.C Factory.C Register.C SmartPointer.C Utils.C Metric.C \
WIP.C Worldline.C Photon.C Scenery.C \
WorldlineIntegState.C Error.C Screen.C Spectrum.C \
Spectrometer.C ComplexSpectrometer.C UniformSpectrometer.C \
ThinDisk.C Converters.C Functors.C Hooks.C
-libgyoto_la_LIBS = $(XERCESLDFLAGS)
-libgyoto_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSINFO)
+libgyoto at FEATURES@_la_LIBS = $(XERCESLDFLAGS)
+libgyoto at FEATURES@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSINFO)
# STANDARD PLUGIN
soverdir = $(pkglibdir)/@sovers@
@@ -570,8 +574,8 @@ libgyoto-lorene.la: $(libgyoto_lorene_la_OBJECTS) $(libgyoto_lorene_la_DEPENDENC
libgyoto-stdplug.la: $(libgyoto_stdplug_la_OBJECTS) $(libgyoto_stdplug_la_DEPENDENCIES) $(EXTRA_libgyoto_stdplug_la_DEPENDENCIES)
$(AM_V_CXXLD)$(libgyoto_stdplug_la_LINK) -rpath $(soverdir) $(libgyoto_stdplug_la_OBJECTS) $(libgyoto_stdplug_la_LIBADD) $(LIBS)
-libgyoto.la: $(libgyoto_la_OBJECTS) $(libgyoto_la_DEPENDENCIES) $(EXTRA_libgyoto_la_DEPENDENCIES)
- $(AM_V_CXXLD)$(libgyoto_la_LINK) -rpath $(libdir) $(libgyoto_la_OBJECTS) $(libgyoto_la_LIBADD) $(LIBS)
+libgyoto at FEATURES@.la: $(libgyoto at FEATURES@_la_OBJECTS) $(libgyoto at FEATURES@_la_DEPENDENCIES) $(EXTRA_libgyoto at FEATURES@_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libgyoto at FEATURES@_la_LINK) -rpath $(libdir) $(libgyoto at FEATURES@_la_OBJECTS) $(libgyoto at FEATURES@_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/lib/gyoto-uninstalled.pc.in b/lib/gyoto-uninstalled.pc.in
index b328790..f11a7dd 100644
--- a/lib/gyoto-uninstalled.pc.in
+++ b/lib/gyoto-uninstalled.pc.in
@@ -22,6 +22,6 @@ Version: @VERSION@
URL: http://gyoto.obspm.fr
Requires: @pkg_requires@
Conflicts:
-Libs: -L${libdir} -lgyoto -ldl @pkg_libs@ @PTHREAD_LIBS@
+Libs: -L${libdir} -lgyoto at FEATURES@ -ldl @pkg_libs@ @PTHREAD_LIBS@
Libs.private:
Cflags: @CXXFLAGS@ -I${includedir} @pkg_cflags@ @PTHREAD_CFLAGS@ @BOOST_CPPFLAGS@
diff --git a/lib/gyoto.pc.in b/lib/gyoto.pc.in
index a86d004..0981afe 100644
--- a/lib/gyoto.pc.in
+++ b/lib/gyoto.pc.in
@@ -21,6 +21,6 @@ Version: @VERSION@
URL: http://gyoto.obspm.fr
Requires: @pkg_requires@
Conflicts:
-Libs: -L${libdir} -lgyoto -ldl @pkg_libs@ @PTHREAD_LIBS@
+Libs: -L${libdir} -lgyoto at FEATURES@ -ldl @pkg_libs@ @PTHREAD_LIBS@
Libs.private:
Cflags: @CXXFLAGS@ -I${includedir}/Gyoto @pkg_cflags@ @PTHREAD_CFLAGS@ @BOOST_CPPFLAGS@
diff --git a/yorick/Makefile.in b/yorick/Makefile.in
index 7203834..470a6f7 100644
--- a/yorick/Makefile.in
+++ b/yorick/Makefile.in
@@ -46,7 +46,7 @@ OBJS=gyoto_utils.o gyoto_Metric.o gyoto_Photon.o \
PKG_EXENAME=yorick
# PKG_DEPLIBS=-Lsomedir -lsomelib for dependencies of this package
-PKG_DEPLIBS=-L../lib/.libs -lgyoto $(XERCESLDFLAGS) $(PTHREAD_LIBS)
+PKG_DEPLIBS=-L../lib/.libs -lgyoto at FEATURES@ $(XERCESLDFLAGS) $(PTHREAD_LIBS)
# set compiler (or rarely loader) flags specific to this package
PKG_CFLAGS= -I../include $(XERCESCPPFLAGS) $(UDUNITS_CPPFLAGS) $(BOOST_CPPFLAGS) $(PTHREAD_CFLAGS)
PKG_LDFLAGS= $(PTHREAD_CFLAGS)
diff --git a/yorick/stdplug/Makefile.in b/yorick/stdplug/Makefile.in
index 555c7a3..96b63b8 100644
--- a/yorick/stdplug/Makefile.in
+++ b/yorick/stdplug/Makefile.in
@@ -48,7 +48,7 @@ OBJS = StdPlug.o gyoto_KerrBL.o gyoto_KerrKS.o \
PKG_EXENAME=yorick
# PKG_DEPLIBS=-Lsomedir -lsomelib for dependencies of this package
-PKG_DEPLIBS=-L../../lib/.libs -lgyoto $(PTHREADS_LIBS)
+PKG_DEPLIBS=-L../../lib/.libs -lgyoto at FEATURES@ $(PTHREADS_LIBS)
ifeq ($(SYS),Darwin)
PKG_DEPLIBS+=-bundle_loader ../../lib/.libs/libgyoto-stdplug.$(plugin_sfx) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list