Skip to content

Commit

Permalink
do not source /etc/os-release, it clobbers key configure variables
Browse files Browse the repository at this point in the history
  • Loading branch information
kinkie committed Oct 31, 2024
1 parent 8c67b37 commit 0e1e9e3
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,17 @@ AC_MSG_RESULT($squid_host_os (version $squid_host_os_version))
# on windows squid_host_os is either mingw or cygwin, version is 32

AS_IF([test -e /etc/os-release],[
. /etc/os-release
printed_os_name="no"
AS_IF([test "x$PRETTY_NAME" != "x"],[
AC_MSG_NOTICE([Building on $PRETTY_NAME])
printed_os_name="yes"
squid_cv_linux_distro_name=`grep '^PRETTY_NAME=' /etc/os-release | sed 's/^[[^"]]*"//;s/".*$//'`
AS_IF([test "x$squid_cv_linux_distro_name" = "x"],[
squid_cv_linux_distro_name=`grep '^NAME=' /etc/os-release | sed 's/^[[^"]]*"//;s/".*$//'`
])
AS_IF([test "x$printed_os_name" = "xno" -a "x$NAME" != "x"],[
AC_MSG_NOTICE([Building on $NAME])
printed_os_name="yes"
AS_IF([test "x$squid_cv_linux_distro_name" != "x"],[
AC_MSG_NOTICE([Building on $squid_cv_linux_distro_name])
])
])



AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
Expand Down

0 comments on commit 0e1e9e3

Please sign in to comment.