From 80e6c5ff31d1574cf413b56b92543b4157654950 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 30 Apr 2026 19:40:58 +0200 Subject: [PATCH] add samples and IPX service configuration --- .gitea/workflows/source-release.yml | 2 +- Makefile.in | 10 +++---- configure | 42 ++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/source-release.yml b/.gitea/workflows/source-release.yml index 3e8e4e2..d2cbd98 100644 --- a/.gitea/workflows/source-release.yml +++ b/.gitea/workflows/source-release.yml @@ -121,7 +121,7 @@ jobs: - name: Run distcheck run: | set -e - make distcheck + make distcheck DISTCHECK_CONFIGURE_FLAGS='--libexecdir=$$dc_install_base/libexec --with-systemdsystemunitdir=$$dc_install_base/lib/systemd/system' - name: Collect dist archives id: pkg diff --git a/Makefile.in b/Makefile.in index 4b9c5fb..e8061ac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -324,21 +324,17 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = po src tools ipxripd +SUBDIRS = po src tools samples ipxripd conf EXTRA_DIST = \ autogen.sh \ scripts/config.ipx \ - scripts/init.ipx \ - Samples/ipxrcv.c \ - Samples/ipxsend.c \ - Samples/rip.c \ - Samples/sap.c \ - Samples/samples.h + scripts/init.ipx DISTCLEANFILES = \ po/stamp-po diff --git a/configure b/configure index 19efd94..40551b6 100755 --- a/configure +++ b/configure @@ -647,6 +647,9 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +ENABLE_SYSTEMD_FALSE +ENABLE_SYSTEMD_TRUE +systemdsystemunitdir POSUB LTLIBINTL LIBINTL @@ -772,6 +775,7 @@ with_gnu_ld enable_rpath with_libiconv_prefix with_libintl_prefix +with_systemdsystemunitdir ' ac_precious_vars='build_alias host_alias @@ -1426,6 +1430,9 @@ Optional Packages: --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir + --with-systemdsystemunitdir=DIR + systemd system unit directory; use "no" to disable + systemd unit installation Some influential environment variables: CC C compiler command @@ -8930,7 +8937,34 @@ fi printf "%s\n" "#define LOCALEDIR \"${datadir}/locale\"" >>confdefs.h -ac_config_files="$ac_config_files Makefile src/Makefile tools/Makefile ipxripd/Makefile po/Makefile.in" + + +# Check whether --with-systemdsystemunitdir was given. +if test ${with_systemdsystemunitdir+y} +then : + withval=$with_systemdsystemunitdir; systemdsystemunitdir="${withval}" +else case e in #( + e) systemdsystemunitdir='${prefix}/lib/systemd/system' ;; +esac +fi + + +if test "x${systemdsystemunitdir}" = "xno" +then : + systemdsystemunitdir='' +fi + + + if test "x${systemdsystemunitdir}" != "x"; then + ENABLE_SYSTEMD_TRUE= + ENABLE_SYSTEMD_FALSE='#' +else + ENABLE_SYSTEMD_TRUE='#' + ENABLE_SYSTEMD_FALSE= +fi + + +ac_config_files="$ac_config_files Makefile src/Makefile tools/Makefile ipxripd/Makefile conf/Makefile samples/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -9081,6 +9115,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_SYSTEMD_TRUE}" && test -z "${ENABLE_SYSTEMD_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_SYSTEMD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -9684,6 +9722,8 @@ do "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "ipxripd/Makefile") CONFIG_FILES="$CONFIG_FILES ipxripd/Makefile" ;; + "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;; + "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;