Add HAVE_CONFIG_H def. this is useful when embedding the library in o…

…ther libs/using the code directly.
libsndfile · Aug 7, 2019 · bdbd1ed · bdbd1ed
1 parent cfb5dbd
commit bdbd1ed
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,6 +20,7 @@ include(CheckSymbolExists)
 include(CheckTypeSize)
 include(CMakePushCheckState)
 include(ClipMode)
+add_definitions(-DHAVE_CONFIG_H)
 
 set(SAMPLERATE_SRC
 	${PROJECT_SOURCE_DIR}/src/samplerate.c

diff --git a/Makefile.am b/Makefile.am
@@ -27,7 +27,8 @@ CLEANFILES = src/src_sinc.s
 # MinGW requires -no-undefined if a DLL is to be built.
 src_libsamplerate_la_LDFLAGS = -no-undefined -version-info $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG)
 src_libsamplerate_la_SOURCES = src/samplerate.c src/src_sinc.c src/src_zoh.c src/src_linear.c \
-	src/common.h src/float_cast.h src/fastest_coeffs.h src/mid_qual_coeffs.h src/high_qual_coeffs.h
+	src/common.h src/float_cast.h src/fastest_coeffs.h src/mid_qual_coeffs.h src/high_qual_coeffs.h \
+	src/src_config.h
 
 #-------------------------------------------------------------------------------
 # An extra check for bad asm.

diff --git a/configure.ac b/configure.ac
@@ -223,7 +223,7 @@ dnl ============================================================================
 dnl  Compiler stuff.
 
 AS_IF([test "x$enable_flags_setting" = "xyes"], [
-		AX_APPEND_COMPILE_FLAGS([-O2 -pipe], [CFLAGS])
+		AX_APPEND_COMPILE_FLAGS([-DHAVE_CONFIG_H -O2 -pipe], [CFLAGS])
 
 		AS_CASE([${host_os}],
 			[darwin*], [

diff --git a/examples/audio_out.c b/examples/audio_out.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <config.h>
+#include "src_config.h"
 
 #include "audio_out.h"
 

diff --git a/examples/timewarp-file.c b/examples/timewarp-file.c
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/examples/varispeed-play.c b/examples/varispeed-play.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "config.h"
+#include "src_config.h"
 
 #include <float_cast.h>
 

diff --git a/src/float_cast.h b/src/float_cast.h
@@ -35,7 +35,7 @@
 **		long int lrint  (double x) ;
 */
 
-#include "config.h"
+#include "src_config.h"
 
 /*
 **	The presence of the required functions are detected during the configure

diff --git a/src/samplerate.c b/src/samplerate.c
@@ -10,7 +10,7 @@
 #include	<stdlib.h>
 #include	<string.h>
 
-#include	"config.h"
+#include	"src_config.h"
 
 #include	"samplerate.h"
 #include	"float_cast.h"

diff --git a/src/src_config.h b/src/src_config.h
@@ -0,0 +1,12 @@
+/*
+** Copyright (c) 1999-2016, Erik de Castro Lopo <erikd@mega-nerd.com>
+** All rights reserved.
+**
+** This code is released under 2-clause BSD license. Please see the
+** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
+*/
+
+// allow config.h to be optional
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
diff --git a/src/src_linear.c b/src/src_linear.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
+#include "src_config.h"
 #include "float_cast.h"
 #include "common.h"
 

diff --git a/src/src_sinc.c b/src/src_sinc.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
+#include "src_config.h"
 #include "float_cast.h"
 #include "common.h"
 

diff --git a/src/src_zoh.c b/src/src_zoh.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
+#include "src_config.h"
 #include "float_cast.h"
 #include "common.h"
 

diff --git a/tests/calc_snr.c b/tests/calc_snr.c
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #include "util.h"
 

diff --git a/tests/callback_hang_test.c b/tests/callback_hang_test.c
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tests/multi_channel_test.c b/tests/multi_channel_test.c
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tests/multichan_throughput_test.c b/tests/multichan_throughput_test.c
@@ -14,7 +14,7 @@
 
 #include <samplerate.h>
 
-#include "config.h"
+#include "src_config.h"
 
 #include "util.h"
 #include "float_cast.h"

diff --git a/tests/snr_bw_test.c b/tests/snr_bw_test.c
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/tests/src-evaluate.c b/tests/src-evaluate.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "config.h"
+#include "src_config.h"
 
 #if (HAVE_FFTW3 && HAVE_SNDFILE && HAVE_SYS_TIMES_H)
 

diff --git a/tests/throughput_test.c b/tests/throughput_test.c
@@ -14,7 +14,7 @@
 
 #include <samplerate.h>
 
-#include "config.h"
+#include "src_config.h"
 
 #include "util.h"
 #include "float_cast.h"

diff --git a/tests/util.h b/tests/util.h
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #define	ABS(a)			(((a) < 0) ? - (a) : (a))
 #define MIN(a,b)		(((a) < (b)) ? (a) : (b))

diff --git a/tests/varispeed_test.c b/tests/varispeed_test.c
@@ -6,7 +6,7 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
-#include "config.h"
+#include "src_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>