Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

* Use those macros in most bindings..
  • Loading branch information...
commit 7820b22690933b392e41243d93b9f579c0e4d6f6 1 parent b99a709
@toots toots authored
Showing with 4 additions and 15 deletions.
  1. +1 −12 configure.ac
  2. +3 −3 src/Makefile.in
View
13 configure.ac
@@ -19,18 +19,7 @@ AC_PROG_CC()
AC_CHECK_TOOL([AR],[ar],no)
AC_SUBST(AR)
PKG_PROG_PKG_CONFIG()
-#PKG_CHECK_MODULES(libasound2, alsa, , [AC_MSG_ERROR(libasound2 not found.)])
-
-# PKG_CHECK_MODULES loses when you need --libs-only-[lL]
-if ! $PKG_CONFIG --exists alsa; then
- AC_MSG_ERROR([libasound2 not found])
-fi
-libasound2_CFLAGS=`$PKG_CONFIG --cflags alsa`
-AC_SUBST([libasound2_CFLAGS])
-libasound2_LIBS=`$PKG_CONFIG --libs-only-l alsa`
-AC_SUBST([libasound2_LIBS])
-libasound2_LDFLAGS=`$PKG_CONFIG --libs-only-L alsa`
-AC_SUBST([libasound2_LDFLAGS])
+PKG_CONFIG_CHECK_MODULE([alsa])
# substitutions to perform
AC_SUBST(VERSION)
View
6 src/Makefile.in
@@ -28,13 +28,13 @@ SOURCES = alsa.mli alsa.ml alsa_stubs.c
RESULT = alsa
OCAMLDOCFLAGS = -stars
LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *.a *.so)
-ACLIBS = @LIBS@ @libasound2_LIBS@
-LDFLAGS = @LDFLAGS@ @libasound2_LDFLAGS@
+ACLIBS = @LIBS@
+LDFLAGS = @LDFLAGS@
CLIBS = $(ACLIBS:-l%=%)
LIBDIRS = $(LDFLAGS:-L%=%)
CC = @CC@
AR = @AR@
-CFLAGS = @CFLAGS@ @libasound2_CFLAGS@ -Wall -DCAML_NAME_SPACE
+CFLAGS = @CFLAGS@ -Wall -DCAML_NAME_SPACE
CPPFLAGS = @CPPFLAGS@
NO_CUSTOM = yes
OCAMLFLAGS = @OCAMLFLAGS@
Please sign in to comment.
Something went wrong with that request. Please try again.