$ git clone http://tcclient.ion.nu/tc_client.git
commit 60fb594cb5f56f57209a8d6a96c9d90855ff7086
Author: Alicia <...>
Date: Sat Jan 9 23:46:57 2016 +0100
configure/Makefile: added a summary of utilities and features enabled/available at the end of configure (or manually with 'make confinfo')
diff --git a/ChangeLog b/ChangeLog
index fc0609b..2231d60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ tc_client-gtk: made automatically opening cam streams an option which can be dis
libcamera: fixed compiler warnings.
libcamera: added support for cameras on windows through the ESCAPI library.
testbuilds.sh: added a warning to prevent users from trying to use it to test their build, which is not what it does.
+configure/Makefile: added a summary of utilities and features enabled/available at the end of configure (or manually with 'make confinfo')
0.36:
Implemented /whois <nick/ID> to check someone's username.
Changed the /whois output to be more human-readable in cases where the user isn't logged in.
diff --git a/Makefile b/Makefile
index ae3fce2..8caca6d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,22 @@ CURSEDCHAT_OBJ=utilities/cursedchat/cursedchat.o utilities/cursedchat/buffer.o u
TC_CLIENT_GTK_OBJ=utilities/gtk/camviewer.o utilities/gtk/userlist.o utilities/gtk/media.o utilities/gtk/compat.o utilities/gtk/config.o utilities/gtk/gui.o utilities/stringutils.o utilities/gtk/logging.o utilities/compat.o libcamera.a
LIBCAMERA_OBJ=utilities/libcamera/camera.o utilities/libcamera/camera_img.o
UTILS=irchack modbot
+CONFINFO=|Will enable the IRC utility irchack|Will enable the bot utility modbot
ifdef GTK_LIBS
ifdef AVCODEC_LIBS
ifdef AVUTIL_LIBS
ifdef SWSCALE_LIBS
+ CONFINFO+=|Will enable the graphical utilities tc_client-gtk and camviewer
UTILS+=camviewer tc_client-gtk
CFLAGS+=$(GTK_CFLAGS) $(AVCODEC_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
INSTALLDEPS+=tc_client-gtk gtkgui.glade
ifdef AO_LIBS
ifdef AVRESAMPLE_LIBS
+ CONFINFO+=| Will enable experimental mic support
CFLAGS+=-DHAVE_AVRESAMPLE=1 $(AVRESAMPLE_CFLAGS) $(AO_CFLAGS)
endif
ifdef SWRESAMPLE_LIBS
+ CONFINFO+=| Will enable experimental mic support
CFLAGS+=-DHAVE_SWRESAMPLE=1 $(SWRESAMPLE_CFLAGS) $(AO_CFLAGS)
endif
endif
@@ -33,8 +37,11 @@ ifdef SWSCALE_LIBS
LDFLAGS+=-mwindows
# Using ESCAPI for cam support on windows, http://sol.gfxile.net/escapi/
ifneq ($(wildcard escapi),)
+ CONFINFO+=| Will enable escapi windows camera support
CFLAGS+=-DHAVE_ESCAPI
LIBCAMERA_OBJ+=utilities/libcamera/camera_escapi.o escapi/escapi.o
+ else
+ CONFINFO+=| escapi windows camera support will not be enabled
endif
windowstargets: camviewer tc_client-gtk tc_client-gtk-camthread
@echo
@@ -46,8 +53,11 @@ ifdef SWSCALE_LIBS
@echo 'To build the gtk+ GUI, enter this directory from a MinGW shell and type make'
endif
ifdef LIBV4L2_LIBS
+ CONFINFO+=| Will enable v4l2 camera support
CFLAGS+=-DHAVE_V4L2 $(LIBV4L2_CFLAGS)
LIBCAMERA_OBJ+=utilities/libcamera/camera_v4l2.o
+ else
+ CONFINFO+=| v4l2 camera support will not be enabled
endif
endif
endif
@@ -55,6 +65,7 @@ endif
endif
ifdef CURSES_LIBS
ifdef READLINE_LIBS
+ CONFINFO+=|Will enable the curses utility cursedchat
UTILS+=cursedchat
CFLAGS+=$(CURSES_CFLAGS) $(READLINE_CFLAGS)
INSTALLDEPS+=cursedchat
@@ -143,3 +154,13 @@ ifdef READLINE_LIBS
install -m 755 -D cursedchat "$(PREFIX)/bin/tc_client-cursedchat"
endif
endif
+
+CONFINFO+=|
+ifeq ($(findstring tc_client-gtk,$(UTILS)),)
+ CONFINFO+=|The graphical utilities tc_client-gtk and camviewer will not be enabled
+endif
+ifeq ($(findstring cursedchat,$(UTILS)),)
+ CONFINFO+=|The curses utility cursedchat will not be enabled
+endif
+confinfo:
+ @echo "$(CONFINFO)" | tr '|' '\n'
diff --git a/configure b/configure
index fa7ca24..1846612 100755
--- a/configure
+++ b/configure
@@ -180,3 +180,4 @@ fi
rm -f endiantest.c endiantest
echo Done
+make confinfo