head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.8
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.6
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.4
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.2
	pkgsrc-2025Q2-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2025.03.30.09.32.57;	author nia;	state Exp;
branches;
next	;
commitid	tEOCV9YJOZ3AB4PF;


desc
@@


1.1
log
@openal-soft-cxx14: Import the last version requiring only C++14.

This is intended for systems with compilers new enough to build
C++14 but not new enough to build C++20, of which there are many.
@
text
@$NetBSD$

Allow the Makefile to specify the default config file path.

--- alc/alconfig.cpp.orig	2025-03-30 09:19:12.176855304 +0000
+++ alc/alconfig.cpp
@@@@ -364,7 +364,7 @@@@ void ReadALConfig()
 
 void ReadALConfig()
 {
-    const char *str{"/etc/openal/alsoft.conf"};
+    const char *str{SYS_CONF_DIR"/alsoft.conf"};
 
     TRACE("Loading config %s...\n", str);
     al::ifstream f{str};
@@@@ -372,7 +372,7 @@@@ void ReadALConfig()
         LoadConfigFromFile(f);
     f.close();
 
-    std::string confpaths{al::getenv("XDG_CONFIG_DIRS").value_or("/etc/xdg")};
+    std::string confpaths{al::getenv("XDG_CONFIG_DIRS").value_or(SYS_CONF_DIR"/xdg")};
     /* Go through the list in reverse, since "the order of base directories
      * denotes their importance; the first directory listed is the most
      * important". Ergo, we need to load the settings from the later dirs
@