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

…ther libs/using the code directly.
libsndfile · Jul 27, 2019 · e4f0618 · e4f0618
1 parent b1f14c6
commit e4f0618
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,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/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,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "audio_out.h"
 

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

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

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

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

diff --git a/src/src_linear.c b/src/src_linear.c
@@ -10,7 +10,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "float_cast.h"
 #include "common.h"
 

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

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

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

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

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

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

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

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

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

diff --git a/tests/util.h b/tests/util.h
@@ -6,7 +6,9 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #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,9 @@
 ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING
 */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>