[PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule

speechd-discuss

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule

From:	Christopher Brannon
Subject:	[PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule
Date:	Wed, 15 Sep 2010 21:24:43 -0500

From: Andrei Kholodnyi <address@hidden>
To: address@hidden

Reviewed-by: Christopher Brannon <cmbrannon79 at gmail.com>
---
 configure.ac                  |   29 ++++++++++++++++-------------
 src/audio/Makefile.am         |    6 ++++--
 src/c/api/Makefile.am         |    4 ++--
 src/c/clients/say/Makefile.am |    2 +-
 src/modules/Makefile.am       |   18 +++++++++---------
 src/server/Makefile.am        |    4 ++--
 src/tests/Makefile.am         |    2 +-
 7 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index b94860b..6b95596 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,16 +75,26 @@ AC_CHECK_LIB(m,
 AC_CHECK_LIB(dl,
         main, echo "",
         echo "*** Required dl library missing! See INSTALL .";exit 1)
-AC_CHECK_LIB(dotconf,
-        main, echo "",
-        echo "*** Required DotConf library missing! See INSTALL .";exit 1)
-AC_CHECK_LIB(glib-2.0,
-        g_list_append, echo "",
-        echo "*** Required Glib-2.0 library missing! See INSTALL .";exit 1)
 AC_CHECK_LIB(pthread,
         pthread_create, echo "",
         echo "*** Required pthread library missing! See INSTALL .";exit 1)
 
+PKG_CHECK_MODULES(GLIB,glib-2.0,,exit)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+PKG_CHECK_MODULES(GTHREAD,gthread-2.0,,exit)
+AC_SUBST(GTHREAD_CFLAGS)
+AC_SUBST(GTHREAD_LIBS)
+
+PKG_CHECK_MODULES(GMODULE,gmodule-2.0,,exit)
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+
+PKG_CHECK_MODULES(DOTCONF,dotconf,,exit)
+AC_SUBST(DOTCONF_CFLAGS)
+AC_SUBST(DOTCONF_LIBS)
+
 dnl Check for libsndfile.
 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2, ac_cv_sndfile=1, ac_cv_sndfile=0)
 
@@ -342,13 +352,6 @@ AC_SUBST(SPD_AUDIO_LIBS)
 
 AC_PATH_PROG([PYTHON],[python])
 
-glib_include=`pkg-config --cflags glib-2.0`
-AC_SUBST(glib_include)
-glib_libs=`pkg-config --libs glib-2.0`
-AC_SUBST(glib_libs)
-gthread_libs=`pkg-config --libs gthread-2.0`
-AC_SUBST(gthread_libs)
-
 AC_SUBST(datadir)
 
 spdconfdir='${sysconfdir}/speech-dispatcher'
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index d356d46..0d67162 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -4,9 +4,10 @@ inc_local = "-I$(top_srcdir)/include/"
 
 include_HEADERS = spd_audio_plugin.h
 
-am_cflags = -DLOCALEDIR=\"$(localedir)\" -I/usr/include/ $(inc_local) 
@glib_include@
+am_cflags = -DLOCALEDIR=\"$(localedir)\" $(inc_local)
 
 spdlib_LTLIBRARIES = libsdaudio.la
+libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS)
 libsdaudio_la_SOURCES = spd_audio.c spd_audio.h spd_audio_plugin.h 
static_plugins.c
 
 if nas_support
@@ -31,5 +32,6 @@ endif
 
 EXTRA_DIST = alsa.c libao.c oss.c nas.c pulse.c static_plugins.c.in
 
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I/usr/include/ $(inc_local) 
@glib_include@
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local)
 libsdaudio_la_LDFLAGS = -version-info 
@LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@ -lpthread 
$(SPD_AUDIO_LIBS)
+libsdaudio_la_LIBADD = $(GLIB_LIBS)
diff --git a/src/c/api/Makefile.am b/src/c/api/Makefile.am
index 1c380a5..d763655 100644
--- a/src/c/api/Makefile.am
+++ b/src/c/api/Makefile.am
@@ -2,12 +2,12 @@
 localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/include/"
 
-AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE 
-I/usr/include/ $(inc_local) @glib_include@ 
-DSPD_SPAWN_CMD=\""@prefix@/bin/speech-dispatcher"\"
+AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE 
-I/usr/include/ $(inc_local) $(GLIB_CFLAGS) 
-DSPD_SPAWN_CMD=\""@prefix@/bin/speech-dispatcher"\"
 
 lib_LTLIBRARIES = libspeechd.la
 libspeechd_la_SOURCES = libspeechd.c
 libspeechd_la_HEADERS = libspeechd.h
 libspeechd_ladir = $(includedir)
 libspeechd_la_LDFLAGS = -version-info 
@LIB_SPD_CURRENT@:@LIB_SPD_REVISION@:@LIB_SPD_AGE@ -lpthread
-libspeechd_la_LIBADD = @glib_libs@
+libspeechd_la_LIBADD = $(GLIB_LIBS)
 
diff --git a/src/c/clients/say/Makefile.am b/src/c/clients/say/Makefile.am
index efb4bca..d13f1be 100644
--- a/src/c/clients/say/Makefile.am
+++ b/src/c/clients/say/Makefile.am
@@ -3,7 +3,7 @@ localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/include/"
 c_api = $(top_builddir)/src/c/api
 
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ 
-I$(top_srcdir)/src/c/api
+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local) -I$(top_srcdir)/src/c/api
 
 bin_PROGRAMS = spd-say
 spd_say_SOURCES = say.c options.c options.h
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index f411124..1979084 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -6,7 +6,7 @@ SNDFILE_LIBS = @SNDFILE_LIBS@
 
 EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c 
festival_client.h ivona_client.c dummy.c dummy-message.wav
 
-AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" 
-DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ 
-L$(top_builddir)/src/audio -I$(top_srcdir)/src/audio $(ibmtts_include) 
@SNDFILE_CFLAGS@ -D_GNU_SOURCE
+AM_CFLAGS = @ERROR_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" 
-DDATADIR=\"$(snddatadir)\" $(inc_local) $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) 
$(GTHREAD_CFLAGS) -L$(top_builddir)/src/audio -I$(top_srcdir)/src/audio 
$(ibmtts_include) @SNDFILE_CFLAGS@ -D_GNU_SOURCE
 
 modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
@@ -30,30 +30,30 @@ endif
 
 sd_flite_SOURCES = flite.c module_main.c module_utils.c module_utils.h
 sd_flite_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_flite_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
$(flite_kal) $(flite_basic) -lpthread -ldotconf @glib_libs@ @gthread_libs@
+sd_flite_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
$(flite_kal) $(flite_basic) -lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) 
$(GTHREAD_LIBS)
 
 sd_generic_SOURCES = generic.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
-sd_generic_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
-ldotconf @glib_libs@ @gthread_libs@
+sd_generic_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 sd_festival_SOURCES = festival.c festival_client.c festival_client.h 
module_main.c module_utils.c module_utils.h
 sd_festival_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_festival_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
-lpthread -ldotconf @glib_libs@ @gthread_libs@ @EXTRA_SOCKET_LIBS@
+sd_festival_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio 
-lpthread $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS) @EXTRA_SOCKET_LIBS@
 
 sd_ibmtts_SOURCES = ibmtts.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
 sd_ibmtts_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_ibmtts_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lm 
-lpthread -ldotconf -libmeci @SNDFILE_LIBS@ @glib_libs@ @gthread_libs@
+sd_ibmtts_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lm 
-lpthread -libmeci @SNDFILE_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 sd_cicero_SOURCES = cicero.c module_main.c module_utils.c module_utils.h
-sd_cicero_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
-ldotconf @glib_libs@ @gthread_libs@
+sd_cicero_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 sd_espeak_SOURCES = espeak.c module_main.c module_utils.c module_utils.h
 sd_espeak_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_espeak_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lespeak 
-ldotconf @glib_libs@ @SNDFILE_LIBS@ @gthread_libs@ @EXTRA_ESPEAK_LIBS@
+sd_espeak_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lespeak 
@SNDFILE_LIBS@ @EXTRA_ESPEAK_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 sd_ivona_SOURCES = ivona.c ivona_client.c ivona_client.h module_main.c 
module_utils.c module_utils.h
 sd_ivona_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_ivona_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -ldumbtts 
-lpthread -ldotconf @glib_libs@ @SNDFILE_LIBS@ @gthread_libs@
+sd_ivona_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -ldumbtts 
-lpthread @SNDFILE_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 sd_dummy_SOURCES = dummy.c module_main.c module_utils.c 
module_utils_addvoice.c module_utils.h
 sd_dummy_LDFLAGS = @RPATH@ '$(spdlibdir)'
-sd_dummy_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
-ldotconf @glib_libs@ @SNDFILE_LIBS@ @gthread_libs@
+sd_dummy_LDADD = $(top_builddir)/src/common/libcommon.la -lsdaudio -lpthread 
@SNDFILE_LIBS@ $(DOTCONF_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index fb90268..15dc622 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -2,9 +2,9 @@
 bin_PROGRAMS = speech-dispatcher
 speech_dispatcher_SOURCES = speechd.c speechd.h server.c server.h history.c 
history.h module.c module.h config.c config.h parse.c parse.h set.c set.h msg.h 
alloc.c alloc.h compare.c compare.h speaking.c speaking.h options.c options.h 
output.c output.h sem_functions.c sem_functions.h index_marking.c 
index_marking.h
 
-speech_dispatcher_LDADD=$(top_builddir)/src/common/libcommon.la -ldotconf 
-lglib-2.0 -lgmodule-2.0 @glib_libs@ @gthread_libs@ -lpthread 
@EXTRA_SOCKET_LIBS@
+speech_dispatcher_LDADD = $(top_builddir)/src/common/libcommon.la 
$(DOTCONF_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) -lpthread 
@EXTRA_SOCKET_LIBS@
 speech_dispatcher_LDFLAGS = @RDYNAMIC@
 
 inc_local = -I$(top_srcdir)/include/
 localedir = $(datadir)/locale
-AM_CFLAGS = @ERROR_CFLAGS@ $(inc_local) -I$(localedir) @glib_include@ 
-DSYS_CONF=\"@address@hidden" -DSND_DATA=\"@address@hidden" 
-DMODULEBINDIR=\"@address@hidden"  -DVERSION=\"@address@hidden" 
-DPACKAGE=\"@address@hidden" -D_GNU_SOURCE
+AM_CFLAGS = @ERROR_CFLAGS@ $(inc_local) -I$(localedir) $(DOTCONF_CFLAGS) 
$(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(GTHREAD_CFLAGS) 
-DSYS_CONF=\"@address@hidden" -DSND_DATA=\"@address@hidden" 
-DMODULEBINDIR=\"@address@hidden" -DVERSION=\"@address@hidden" 
-DPACKAGE=\"@address@hidden" -D_GNU_SOURCE
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 314f423..40933d7 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,7 +3,7 @@ localedir = $(datadir)/locale
 inc_local = "-I$(top_srcdir)/include/"
 c_api = $(top_builddir)/src/c/api
 
-AM_CFLAGS = -I$(top_srcdir)/src/c/api -DLOCALEDIR=\"$(localedir)\" 
$(inc_local) @glib_include@ -I../audio/
+AM_CFLAGS = -I$(top_srcdir)/src/c/api -DLOCALEDIR=\"$(localedir)\" 
$(inc_local) -I../audio/
 
 bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery
 
-- 
1.7.2.3

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH 2/3] moved debug defines to libspeechd.c, (continued)
- [PATCH 2/3] moved debug defines to libspeechd.c, Andrei Kholodnyi, 2010/09/11
  - [PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule, Andrei Kholodnyi, 2010/09/11
    - [PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule, Christopher Brannon, 2010/09/13
    - [PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule, Andrei Kholodnyi, 2010/09/13
    - [PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule, Christopher Brannon, 2010/09/15
    - [PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule, Andrei Kholodnyi, 2010/09/16
- [PATCH 1/3] added pkgconfig support, Christopher Brannon, 2010/09/11
  - [PATCH 1/3] added pkgconfig support, Andrei Kholodnyi, 2010/09/12
- [PATCH 1/3] added pkgconfig support, Christopher Brannon, 2010/09/15
  - [PATCH 2/3] moved debug defines to libspeechd.c, Christopher Brannon, 2010/09/15
  - [PATCH 3/3] use pkg-config to detect dotconf, glib, gthread and gmodule, Christopher Brannon <=

Prev by Date: [PATCH 2/3] moved debug defines to libspeechd.c
Next by Date: [PATCH] Rework the do_list_voices function, and fix a memory leak.
Previous by thread: [PATCH 2/3] moved debug defines to libspeechd.c
Next by thread: [PATCH] Memory leak in module_utils.c
Index(es):
- Date
- Thread