[gentoo-commits] gentoo-x86 commit in media-sound/sox/files: sox-14.2.0-distro.patch

[Peter Volkov (pva)]

pva         08/11/22 21:11:36

  Added:                sox-14.2.0-distro.patch
  Log:
  Don't try to get distro name from /etc/issue, bug #246299 thank Albert W. Hopkins for report.
  (Portage version: 2.2_rc15/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)

Revision  Changes    Path
1.1                  media-sound/sox/files/sox-14.2.0-distro.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/files/sox-14.2.0-distro.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/files/sox-14.2.0-distro.patch?rev=1.1&content-type=text/plain

Index: sox-14.2.0-distro.patch
===================================================================
=== modified file 'configure.ac'
--- configure.ac	2008-11-11 12:27:08 +0000
+++ configure.ac	2008-11-11 12:28:01 +0000
@@ -117,15 +117,23 @@
 AC_SUBST(APP_LDFLAGS)
 AC_SUBST(WARN_CFLAGS)
 
-dnl Get distro name from /etc/issue
-if test -r /etc/issue; then
-  AC_MSG_CHECKING([distro name])
-  DISTRO=`sed -e "s/.[0-9][0-9;]*[mJH]//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/  */ /g" -e "s/^ //" -e "s/ $//"`
-  AC_MSG_RESULT("$DISTRO")
-  AC_SUBST(DISTRO)
-  AC_DEFINE(HAVE_DISTRO, 1, [1 if DISTRO is defined])
-  have_distro=yes
+AC_ARG_WITH(distro,
+    AC_HELP_STRING([--with-distro=distro],
+        [Provide distribution name, by default will try to grep /etc/issue]))
+
+if test "$with_distro" != "no"; then
+  DISTRO=$with_distro
+else
+  dnl Get distro name from /etc/issue
+  if test -r /etc/issue; then
+    AC_MSG_CHECKING([distro name])
+    DISTRO=`sed -e "s/.[0-9][0-9;]*[mJH]//g" < /etc/issue|tr "\n" " " | sed -e "s/(\\\\?\\\\\\\\.*//" -e "s/  */ /g" -e "s/^ //" -e "s/ $//"`
+    AC_MSG_RESULT("$DISTRO")
+  fi
 fi
+AC_SUBST(DISTRO)
+AC_DEFINE(HAVE_DISTRO, 1, [1 if DISTRO is defined])
+have_distro=yes
 AM_CONDITIONAL(HAVE_DISTRO, test x$have_distro = xyes)
 
 dnl Check for system dependent features.