Browse Source

configure/automake: Remove work-arounds

Change-Id: I97a085248e6cbcd15daf96c0c23f31cdcd02e06b
changes/67/17367/1
Harald Welte 2 years ago
parent
commit
5b5d6cee9b
  1. 5
      Makefile.am
  2. 10
      configure.ac
  3. 1
      debian/rules

5
Makefile.am

@ -7,6 +7,11 @@ pkgconfig_DATA = libosmo-rspro.pc
EXTRA_DIST = asn1 .version README.md contrib/remsim-apitool.py
AM_DISTCHECK_CONFIGURE_FLAGS = \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
--with-usbdropdir=$$dc_install_base/$(usbdropdir) \
--with-serialconfdir=$$dc_install_base/$(serialconfdir)
pkgcofigdir = $(libdir)/pkgconfig
@RELMAKE@

10
configure.ac

@ -69,16 +69,14 @@ if test "$osmo_ac_build_client" = "yes"; then
PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)
PKG_CHECK_MODULES(USB, libusb-1.0)
# we cannot use the below command, as 'make distcheck' would fail due to the lack
# of ${prefix} being involved :(
#ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`
#serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`
ifd_dropdir="${libdir}/pcsc"
serialconfdir="${sysconfdir}/reader.conf.d"
ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`
# allow user to override the dropdir for the PCSC driver bundle
AC_ARG_WITH(usbdropdir, [--with-usbdropdir PCSC bundle location],
[usbdropdir="${withval}"], [usbdropdir="${ifd_dropdir}"])
AC_SUBST(usbdropdir)
_serialconfdir=`pkg-config --variable=serialconfdir libpcsclite`
AC_ARG_WITH(serialconfdir, [--with-serialconfdir PCSC config directory location],
[serialconfdir="${withval}"], [serialconfdir="${_serialconfdir}"])
AC_SUBST(serialconfdir)
fi
AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")

1
debian/rules vendored

@ -15,7 +15,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_auto_configure:
dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system \
--with-usbdropdir=$(USBDROPDIR) \
--enable-manuals
#override_dh_clean:

Loading…
Cancel
Save