test1

Author: LukashonakV

Makefile.am

@@ -2,14 +2,49 @@ AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
 
+CLEANFILES = $(NULL)
+
+# Install the pkgconfig file for the library
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcava.pc
+
+# Generate the pkgconfig file
+libcava.pc: Makefile.am
+	@echo "Generating $@..."
+	@mkdir -p $(@D)
+	@echo "prefix=$(prefix)" > $@
+	@echo "exec_prefix=$(exec_prefix)" >> $@
+	@echo "libdir=$(libdir)" >> $@
+	@echo "includedir=$(includedir)" >> $@
+	@echo "Name: $(PKG_CONFIG_NAME)" >> $@
+	@echo "Description: $(PKG_CONFIG_DESC)" >> $@
+	@echo "Version: $(PKG_CONFIG_VERSION)" >> $@
+	@echo "Libs: -L\$(libdir) -lcava" >> $@ # Link against libcava library
+	@echo "Cflags: -I\$(includedir)/cava -I\$(includedir)/cava/input -I\$(includedir)/cava/output" >> $@
+
+# Clean up the generated pkgconfig file
+CLEANFILES += libcava.pc
+
+# Define the library to be built
+# 'lib' directory implies shared library by default with Automake.
+# Use 'noinst_LTLIBRARIES' if you don't want to install it but build it for internal use.
+lib_LTLIBRARIES = libcava.la
+
 bin_PROGRAMS = cava
 cavadir = $(top_srcdir)
-cava_SOURCES = cava.c cavacore.c config.c input/common.c input/fifo.c input/shmem.c \
+cava_SOURCES = cava.c
+libcava_la_SOURCES = cavacore.c config.c input/common.c input/fifo.c input/shmem.c \
                output/common.c output/terminal_noncurses.c output/raw.c output/noritake.c
-cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \
-           -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE_EXTENDED \
-		   -DFONTDIR=\"@FONT_DIR@\" -DFONTFILE=\"@FONT_FILE@\" \
-		   -I$(top_builddir) -I$(top_builddir)/include
+cava_CPPFLAGS = \
+	-DPACKAGE=\"$(PACKAGE)\" \
+	-DVERSION=\"$(VERSION)\" \
+	-D_POSIX_SOURCE \
+	-D_POSIX_C_SOURCE=200809L \
+	-D_XOPEN_SOURCE_EXTENDED \
+	-DFONTDIR=\"@FONT_DIR@\" \
+	-DFONTFILE=\"@FONT_FILE@\" \
+	-I$(top_builddir) \
+	-I$(top_builddir)/include
 cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-unknown-warning-option -Wno-maybe-uninitialized -Wno-vla-parameter
 
 EXTRA_DIST = \
@@ -51,7 +86,7 @@ endif
 
 if FREEBSD
 if CAVAFONT
-    CLEANFILES = cava.bdf cava.fnt
+    CLEANFILES += cava.bdf cava.fnt
 
 cava.fnt: ${srcdir}/cava.psf
 	${PSF2BDF} --fontname="-gnu-cava-medium-r-normal--16-160-75-75-c-80-iso10646-1" ${srcdir}/cava.psf cava.bdf
@@ -60,43 +95,45 @@ endif
 endif
 
 if ALSA
-    cava_SOURCES += input/alsa.c input/alsa.h
+    libcava_la_SOURCES += input/alsa.c input/alsa.h
 endif
 
 if PORTAUDIO
-    cava_SOURCES += input/portaudio.c input/portaudio.h
+    libcava_la_SOURCES += input/portaudio.c input/portaudio.h
 endif
 
 if PIPEWIRE
-    cava_SOURCES += input/pipewire.c input/pipewire.h
+    libcava_la_SOURCES += input/pipewire.c input/pipewire.h
 endif
 
 if PULSE
-    cava_SOURCES += input/pulse.c input/pulse.h
+    libcava_la_SOURCES += input/pulse.c input/pulse.h
 endif
 
 if SNDIO
-    cava_SOURCES += input/sndio.c input/sndio.h
+    libcava_la_SOURCES += input/sndio.c input/sndio.h
 endif
 
 if OSS
-    cava_SOURCES += input/oss.c input/oss.h
+    libcava_la_SOURCES += input/oss.c input/oss.h
 endif
 
 if JACK
-    cava_SOURCES += input/jack.c input/jack.h
+    libcava_la_SOURCES += input/jack.c input/jack.h
 endif
 
 if NCURSES
-    cava_SOURCES += output/terminal_ncurses.c output/terminal_bcircle.c \
+    libcava_la_SOURCES += output/terminal_ncurses.c output/terminal_bcircle.c \
                     output/terminal_ncurses.h output/terminal_bcircle.h
 
 endif
 
 if SDL
-    cava_SOURCES += output/sdl_cava.c output/sdl_cava.h
+    libcava_la_SOURCES += output/sdl_cava.c output/sdl_cava.h
 endif
 
 if SDL_GLSL
-    cava_SOURCES += output/sdl_glsl.c output/sdl_glsl.h
+    libcava_la_SOURCES += output/sdl_glsl.c output/sdl_glsl.h
 endif
+
+cava_SOURCES += $(libcava_la_SOURCES)

config.c

@@ -591,7 +591,9 @@ bool validate_config(struct config_params *p, struct error_s *error) {
 
 bool load_config(char configPath[PATH_MAX], struct config_params *p, struct error_s *error) {
     free_config(p);
-
+#ifdef _WIN32
+    p->hFile = NULL;
+#endif
     FILE *fp;
     bool result;
     char *cava_config_home = get_cava_config_home(error);
@@ -643,6 +645,33 @@ bool load_config(char configPath[PATH_MAX], struct config_params *p, struct erro
             strcpy(configPath, newPath);
         }
 #endif
+        // expand env variables in configPath
+        char *cfgPathOrig = (char *)malloc(PATH_MAX * sizeof(char));
+        strcpy(cfgPathOrig, configPath);
+        configPath[0] = '\0';
+        const char *delimiter = "/";
+        short int addDelimiter = 0;
+        char *env = NULL;
+
+        if (*cfgPathOrig == *delimiter)
+            addDelimiter = 1;
+
+        for (char *pch = strtok(cfgPathOrig, delimiter); pch != NULL;
+             pch = strtok(NULL, delimiter)) {
+            if (addDelimiter == 1)
+                strcat(configPath, delimiter);
+            if (*pch == '$')
+                env = getenv(pch + 1);
+            if (env && *env) {
+                strcat(configPath, env);
+                env = NULL;
+            } else
+                strcat(configPath, pch);
+            addDelimiter = 1;
+        }
+
+        free(cfgPathOrig);
+
         fp = fopen(configPath, "rb");
         if (fp) {
             fclose(fp);

configure.ac

@@ -475,12 +475,14 @@ if test -z "$FONT_DIR" ; then
   FONT_DIR="$DEFAULT_FONT_DIR"
 fi
 
+# --- Define the program name and version for the pkgconfig file ---
+PKG_CONFIG_NAME="libcava"
+PKG_CONFIG_VERSION="$VERSION"
+PKG_CONFIG_DESC="A lightweight, customizable audio visualizer"
 
+AC_SUBST([PKG_CONFIG_NAME])
+AC_SUBST([PKG_CONFIG_VERSION])
+AC_SUBST([PKG_CONFIG_DESC])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-
-
-
-
-