1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
Description: Use pkg-config to configure libmikmod
Author: Stephen Kitt <skitt@debian.org>
--- a/configure.in
+++ b/configure.in
@@ -36,12 +36,10 @@
AC_SUBST(RSVG_LIBS)
#### Check for mikmod.h header ####
-AC_CHECK_HEADER(mikmod.h,, AC_MSG_ERROR([libmikmod is required to compile gweled]))
+PKG_CHECK_MODULES([libmikmod], [libmikmod],, AC_MSG_ERROR([libmikmod is required to compile gweled]))
-MIKMOD_CFLAGS=`libmikmod-config --cflags`
-MIKMOD_LIBS=`libmikmod-config --libs`
-AC_SUBST(MIKMOD_CFLAGS)
-AC_SUBST(MIKMOD_LIBS)
+AC_SUBST(libmikmod_CFLAGS)
+AC_SUBST(libmikmod_LIBS)
AC_CHECK_HEADER(pthread.h, [],
AC_MSG_ERROR([*** Cannot find pthread.h header]))
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,8 +176,8 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-MIKMOD_CFLAGS = @MIKMOD_CFLAGS@
-MIKMOD_LIBS = @MIKMOD_LIBS@
+MIKMOD_CFLAGS = @libmikmod_CFLAGS@
+MIKMOD_LIBS = @libmikmod_LIBS@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@
AM_CFLAGS = \
@GTK_CFLAGS@ \
@RSVG_CFLAGS@ \
- @MIKMOD_CFLAGS@ \
+ @libmikmod_CFLAGS@ \
@PTHREAD_CFLAGS@
bin_PROGRAMS = gweled
@@ -29,6 +29,6 @@
games-setgid-io.c games-setgid-io.h \
games-scores-dialog-private.h
-gweled_LDADD = @GTK_LIBS@ @RSVG_LIBS@ @MIKMOD_LIBS@ @PTHREAD_LIBS@
+gweled_LDADD = @GTK_LIBS@ @RSVG_LIBS@ @libmikmod_LIBS@ @PTHREAD_LIBS@
|
