From ea844727f7ebbea228915d6f35da40d3e5fea0f6 Mon Sep 17 00:00:00 2001 From: snow Date: Fri, 1 May 2020 20:19:55 -0700 Subject: [PATCH] Add support for --enable-envsys when running ./configure --- wmbattery/Makefile.in | 9 +++++++++ wmbattery/configure.ac | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/wmbattery/Makefile.in b/wmbattery/Makefile.in index 5b9a3a3..12a538c 100644 --- a/wmbattery/Makefile.in +++ b/wmbattery/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @Xlib_LIBS@ @Xext_LIBS@ @libXpm_LIBS@ USE_HAL = @USE_HAL@ USE_UPOWER = @USE_UPOWER@ +USE_ENVSYS = @USE_ENVSYS@ all: wmbattery @@ -80,6 +81,14 @@ upower.o: upower.c $(CC) $(CPPFLAGS) $(CFLAGS) -c upower.c -o upower.o endif +ifdef USE_ENVSYS +CPPFLAGS += -DENVSYS +LIBS += -lprop +OBJS += envsys.o +envsys.o: envsys.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c envsys.c -o envsys.o +endif + wmbattery: $(OBJS) $(CC) -o wmbattery $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/wmbattery/configure.ac b/wmbattery/configure.ac index 2796d2a..2413c83 100644 --- a/wmbattery/configure.ac +++ b/wmbattery/configure.ac @@ -39,6 +39,13 @@ AS_IF([test x$enable_upower != xno], [ PKG_CHECK_MODULES([upower], [upower-glib]) AC_SUBST(USE_UPOWER, 1) ]) +AC_ARG_ENABLE(envsys, AS_HELP_STRING([--enable-envsys], [enable envsys]), + [], [enable_envsys=no]) +AS_IF([test x$enable_envsys != xno], [ + AC_CHECK_HEADERS(sys/envsys.h) + AC_CHECK_HEADERS(prop/proplib.h) + AC_SUBST(USE_ENVSYS, 1) +]) dnl Checks for header files. AC_HEADER_STDC