Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* Added custom macros for pkg-config binary and modules detection.

* Use those macros in most bindings..
  • Loading branch information...
commit 7820b22690933b392e41243d93b9f579c0e4d6f6 1 parent b99a709
Romain Beauxis toots authored

Showing 2 changed files with 4 additions and 15 deletions. Show diff stats Hide diff stats

  1. +1 12 configure.ac
  2. +3 3 src/Makefile.in
13 configure.ac
@@ -19,18 +19,7 @@ AC_PROG_CC()
19 19 AC_CHECK_TOOL([AR],[ar],no)
20 20 AC_SUBST(AR)
21 21 PKG_PROG_PKG_CONFIG()
22   -#PKG_CHECK_MODULES(libasound2, alsa, , [AC_MSG_ERROR(libasound2 not found.)])
23   -
24   -# PKG_CHECK_MODULES loses when you need --libs-only-[lL]
25   -if ! $PKG_CONFIG --exists alsa; then
26   - AC_MSG_ERROR([libasound2 not found])
27   -fi
28   -libasound2_CFLAGS=`$PKG_CONFIG --cflags alsa`
29   -AC_SUBST([libasound2_CFLAGS])
30   -libasound2_LIBS=`$PKG_CONFIG --libs-only-l alsa`
31   -AC_SUBST([libasound2_LIBS])
32   -libasound2_LDFLAGS=`$PKG_CONFIG --libs-only-L alsa`
33   -AC_SUBST([libasound2_LDFLAGS])
  22 +PKG_CONFIG_CHECK_MODULE([alsa])
34 23
35 24 # substitutions to perform
36 25 AC_SUBST(VERSION)
6 src/Makefile.in
@@ -28,13 +28,13 @@ SOURCES = alsa.mli alsa.ml alsa_stubs.c
28 28 RESULT = alsa
29 29 OCAMLDOCFLAGS = -stars
30 30 LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *.a *.so)
31   -ACLIBS = @LIBS@ @libasound2_LIBS@
32   -LDFLAGS = @LDFLAGS@ @libasound2_LDFLAGS@
  31 +ACLIBS = @LIBS@
  32 +LDFLAGS = @LDFLAGS@
33 33 CLIBS = $(ACLIBS:-l%=%)
34 34 LIBDIRS = $(LDFLAGS:-L%=%)
35 35 CC = @CC@
36 36 AR = @AR@
37   -CFLAGS = @CFLAGS@ @libasound2_CFLAGS@ -Wall -DCAML_NAME_SPACE
  37 +CFLAGS = @CFLAGS@ -Wall -DCAML_NAME_SPACE
38 38 CPPFLAGS = @CPPFLAGS@
39 39 NO_CUSTOM = yes
40 40 OCAMLFLAGS = @OCAMLFLAGS@

0 comments on commit 7820b22

Please sign in to comment.
Something went wrong with that request. Please try again.