kimbo · kimbo · Oct 30, 2019 · Oct 30, 2019 · Oct 30, 2019 · Oct 30, 2019
diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
@@ -13,4 +13,6 @@ jobs:
       run: sudo apt-get install libcurl4-openssl-dev libsdl2-dev
     - name: make
       run: make
+    - name: make with sound support
+      run: make with-sound
 
diff --git a/.travis.yml b/.travis.yml
@@ -47,6 +47,7 @@ before_script:
 
 script:
     - make
+    - make with-sound
 
 # whitelist branches to avoid testing feature branches twice (as branch and as pull request)
 branches:

diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
+OBJS = doh.o
 TARGET = doh
-OBJS = doh.o sound/doh-sound.o
-SOUND_LIBS = -lSDL2 -lpthread
-LDLIBS = $(SOUND_LIBS) `curl-config --libs`
+LDLIBS = `curl-config --libs`
 CFLAGS := $(CFLAGS) -W -Wall -pedantic -g `curl-config --cflags`
 MANUAL = doh.1
 
@@ -15,5 +14,13 @@ install:
 	install -m 0755 $(TARGET) $(DESTDIR)$(BINDIR)
 	install -m 0744 $(MANUAL) $(MANDIR)/man1/
 
+with-sound: OBJS = doh.o sound/doh-sound.o
+with-sound: LDLIBS = -lSDL2 -lpthread `curl-config --libs`
+with-sound: CFLAGS := $(CFLAGS) -DHAS_SOUND -W -Wall -pedantic -g `curl-config --cflags`
+with-sound:
+	if [ "$$(./sdl2-util.sh --check)" = "no" ]; then \
+		./sdl2-util.sh --install; \
+	fi && $(MAKE) clean && $(MAKE) LDLIBS="$(LDLIBS)" CFLAGS="$(CFLAGS)" OBJS="$(OBJS)"
+
 clean:
 	rm -f $(OBJS) $(TARGET)
diff --git a/doh.c b/doh.c
@@ -55,10 +55,13 @@ enum iptrans { v4, v6, v46 };
 #include "version.h"
 
 /* doh-sound related stuff */
+#ifdef HAS_SOUND
 #include "sound/doh-sound.h"
 #include <pthread.h>
+#include <errno.h>
 pthread_t sound_thread;
 static int playing = false;
+#endif
 
 #ifdef _WIN32
 #define FMT_SIZE_T "Iu"
@@ -722,7 +725,9 @@ static void help(const char *msg)
   fprintf(stderr, "Usage: doh [options] <host> [URL]\n"
         "  -h  this help\n"
         "  -k  insecure mode - don't validate TLS certificate\n"
+#ifdef HAS_SOUND
 	"  -s  play doh sound\n"
+#endif
         "  -t  test mode\n"
         "  -v  verbose mode\n"
         "  -4  use only IPv4 transport\n"
@@ -788,14 +793,16 @@ int main(int argc, char **argv)
     case 'h': /* help */
       help(NULL);
       break;
+#ifdef HAS_SOUND
     case 's':
       if (pthread_create(&sound_thread, NULL, play_sound, NULL) != 0) {
-        fprintf(stderr, "playing sound failed\n");
+        fprintf(stderr, "pthread_create failed: %s\n", strerror(errno));
         playing = false;
       } else {
         playing = true;
       }
       break;
+#endif
     default:
       help("unrecognized option");
       break;
@@ -951,9 +958,11 @@ int main(int argc, char **argv)
       printf("CNAME: %s\n", d.cname[i].alloc);
   }
 
+#ifdef HAS_SOUND
   if (playing) {
 	  pthread_join(sound_thread, NULL);
   }
+#endif
 
   doh_cleanup(&d);
   if (headers != NULL)

diff --git a/sdl2-util.sh b/sdl2-util.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#set -x
+install_SDL2() {
+	curl --silent -L https://www.libsdl.org/release/SDL2-2.0.10.tar.gz | tar xz -k
+	cd SDL2-2.0.10
+	./configure
+	make
+	sudo make install
+	cd ../
+}
+check_SDL2_installed() {
+       echo -e "#include<SDL2/SDL.h>\nint main(){}" | gcc -lSDL2 -xc - && echo "yes" || echo "no"
+}
+if [ "$1" = "--check" ]; then
+	check_SDL2_installed
+elif [ "$1" = "--install" ]; then
+	if [ "$(check_SDL2_installed)" = "yes" ]; then
+		echo "SDL2 already installed" >&2
+		# cleanup
+		rm a.out
+	else
+		echo "SDL2 is not installed, installing..." >&2
+	       install_SDL2
+	fi
+fi
diff --git a/sound/doh-sound.c b/sound/doh-sound.c
@@ -66,7 +66,7 @@ void *play_sound(void *args)
 
 	// wait until we're done playing
 	while (audio_len > 0) {
-		SDL_Delay(100);
+		SDL_Delay(10);
 	}
 
 	// shut everything down
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ before_script: @@
     script:
         - make
+        - make with-sound
     # whitelist branches to avoid testing feature branches twice (as branch and as pull request)
     branches:
@@ Expand Down @@