No need to run configure before 'make rpm'

Update ci-rpm accorgingly; the system openssl libs will cause it
to fail, though we do still need it for building eapol_test

diff --git a/.github/workflows/ci-rpm.yml b/.github/workflows/ci-rpm.yml
index 5e9c8980f3f04cfc3b0e22d1fdd946dcba55f053..a58426ba27330482dc6a2f239401bd5f0333661c 100644 (file)
--- a/.github/workflows/ci-rpm.yml
+++ b/.github/workflows/ci-rpm.yml
@@ -142,7 +142,6 @@ jobs:
     - name: Build RPMs
       run: |
         [ -r /opt/rh/devtoolset-8/enable ] && source /opt/rh/devtoolset-8/enable || :
-        ./configure
         make rpm
       working-directory: freeradius
 
@@ -165,6 +164,7 @@ jobs:
         [ -r /opt/rh/devtoolset-8/enable ] && source /opt/rh/devtoolset-8/enable || :
         echo "top_srcdir:=$(pwd)" > Make.inc
         echo "BUILD_DIR:=build" >> Make.inc
+        ./configure --without-openssl
         make -j `nproc` eapol_test
         mv scripts/ci/eapol_test/eapol_test ../rpms
       working-directory: freeradius

diff --git a/Makefile b/Makefile
index dfec7e81abd84a12e7dd96b4ecad118625925bd2..4f45d033e5c097bd5875619d543f0ae491b55cbe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,12 +43,14 @@ endif
 #  the debian packages.
 #
 ifneq "$(MAKECMDGOALS)" "deb"
+ifneq "$(MAKECMDGOALS)" "rpm"
 ifeq "$(findstring crossbuild,$(MAKECMDGOALS))" ""
 $(if $(wildcard Make.inc),,$(error Missing 'Make.inc' Run './configure [options]' and retry))
 
 include Make.inc
 endif
 endif
+endif
 
 #
 #  'configure' was not run?  Get the version number from the file.
@@ -84,6 +86,7 @@ PROTOCOLS    := \
 #  Don't try to do a local build.
 #
 ifneq "$(MAKECMDGOALS)" "deb"
+ifneq "$(MAKECMDGOALS)" "rpm"
 ifeq "$(findstring crossbuild,$(MAKECMDGOALS))" ""
 #
 #  Include all of the autoconf definitions into the Make variable space
@@ -141,6 +144,7 @@ endif
 include scripts/boiler.mk
 endif
 endif
+endif
 
 #
 # The $(R) is a magic variable not defined anywhere in this source.