libaacs | branch: master | npzacs <[email protected]> | Mon Sep 27 22:26:28 2010 +0300| [7d644a1e7f89f125c2f358b1fc37cfcad5eed6b4] | committer: npzacs
Use libgcrypt-config Link against libgcrypt (Thanks to Brynet <[email protected]>) > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=7d644a1e7f89f125c2f358b1fc37cfcad5eed6b4 --- configure.ac | 12 ++++++++++-- src/Makefile.am | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index db903a6..17266ef 100644 --- a/configure.ac +++ b/configure.ac @@ -63,8 +63,16 @@ AC_CHECK_LIB([pthread], [pthread_mutex_init],, [AC_MSG_ERROR($library_not_found)]) # gcrypt check -AC_CHECK_LIB([gcrypt], [gcry_check_version],, - [AC_MSG_ERROR($library_not_found)]) +AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) +if test x"$LIBGCRYPT_CONFIG" = xno; then + AC_MSG_ERROR([libgcrypt not found on system]) +else + LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` + LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` + LIBGCRYPT_LIBS+= -lgpg-error + AC_SUBST(LIBGCRYPT_CFLAGS) + AC_SUBST(LIBGCRYPT_LIBS) +fi # function testing for supported compiler options check_cc_options() diff --git a/src/Makefile.am b/src/Makefile.am index 6993413..7cf7a12 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ SET_DEBUG_OPTS = @SET_DEBUG_OPTS@ SET_INCLUDES = -I$(top_srcdir) -Ifile AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \ - $(SET_DEBUG_OPTS) $(SET_INCLUDES) + $(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS) AM_YFLAGS = -d CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS") @@ -41,7 +41,7 @@ libaacs_la_SOURCES=libaacs/aacs.h \ util/strutl.h libaacs_ladir= $(includedir)/libaacs libaacs_la_HEADERS= libaacs/aacs.h file/filesystem.h -libaacs_la_LDFLAGS= -version-info $(LIB_VERSION_INFO) +libaacs_la_LDFLAGS= $(LIBGCRYPT_LIBS) -version-info $(LIB_VERSION_INFO) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libaacs.pc _______________________________________________ libaacs-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libaacs-devel
