61 lines
1.5 KiB
Diff
61 lines
1.5 KiB
Diff
|
diff -Nru gavl-1.2.0/configure.ac gavl-1.2.0-gil/configure.ac
|
||
|
|
--- gavl-1.2.0/configure.ac 2011-01-05 20:43:29.000000000 +0100
|
||
|
|
+++ gavl-1.2.0-gil/configure.ac 2011-03-10 04:42:14.000000000 +0100
|
||
|
|
@@ -262,6 +262,27 @@
|
||
|
|
AC_SUBST(TOP_SRCDIR)
|
||
|
|
|
||
|
|
dnl
|
||
|
|
+dnl System libraries
|
||
|
|
+dnl
|
||
|
|
+
|
||
|
|
+AC_ARG_ENABLE(libgdither,
|
||
|
|
+ [ --enable-libgdither System libgdither (experimental)])
|
||
|
|
+if test "${enable_libgdither}" = "yes"
|
||
|
|
+then
|
||
|
|
+ PKG_CHECK_MODULES(LIBGDITHER, libgdither,
|
||
|
|
+ [
|
||
|
|
+ AC_DEFINE(HAVE_LIBGDITHER, 1, [Define to 1 if you have the `libgdither' library (-lgdither).])
|
||
|
|
+ have_libgdither="true"
|
||
|
|
+ ],
|
||
|
|
+ [
|
||
|
|
+ have_libgdither="false"
|
||
|
|
+ ]
|
||
|
|
+ )
|
||
|
|
+fi
|
||
|
|
+AM_CONDITIONAL(HAVE_LIBGDITHER, [test x$have_libgdither = xtrue])
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+dnl
|
||
|
|
dnl Output variables
|
||
|
|
dnl
|
||
|
|
|
||
|
|
diff -Nru gavl-1.2.0/gavl/Makefile.am gavl-1.2.0-gil/gavl/Makefile.am
|
||
|
|
--- gavl-1.2.0/gavl/Makefile.am 2010-03-02 01:28:37.000000000 +0100
|
||
|
|
+++ gavl-1.2.0-gil/gavl/Makefile.am 2011-03-10 04:42:14.000000000 +0100
|
||
|
|
@@ -40,8 +40,15 @@
|
||
|
|
threednow_subdirs =
|
||
|
|
endif
|
||
|
|
|
||
|
|
+if HAVE_LIBGDITHER
|
||
|
|
+ MAYBE_LIBGDITHER_LA = @LIBGDITHER_LIBS@
|
||
|
|
+else
|
||
|
|
+ MAYBE_LIBGDITHER = libgdither
|
||
|
|
+ MAYBE_LIBGDITHER_LA = libgdither/libgdither.la
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
|
||
|
|
-SUBDIRS = hq c libgdither libsamplerate $(mmx_subdirs) \
|
||
|
|
+SUBDIRS = hq c $(MAYBE_LIBGDITHER) libsamplerate $(mmx_subdirs) \
|
||
|
|
$(sse_subdirs) \
|
||
|
|
$(sse2_subdirs) \
|
||
|
|
$(sse3_subdirs) \
|
||
|
|
@@ -114,7 +121,7 @@
|
||
|
|
$(threednow_libs) \
|
||
|
|
c/libgavl_c.la \
|
||
|
|
hq/libgavl_hq.la \
|
||
|
|
-libgdither/libgdither.la \
|
||
|
|
+$(MAYBE_LIBGDITHER_LA) \
|
||
|
|
libsamplerate/libsamplerate.la \
|
||
|
|
@LIBGAVL_LIBS@ \
|
||
|
|
-lm
|