diff options
| author | jscheel-guest <none@none> | 2010-01-11 14:07:25 +0100 |
|---|---|---|
| committer | jscheel-guest <none@none> | 2010-01-11 14:07:25 +0100 |
| commit | ebe9b35496a2382c7d851a7be22faa850331e8f4 (patch) | |
| tree | 597ce6a588605d71b94c884adba117a10fa0297c /configure.ac | |
| parent | 8f8c70fc5e2ce169b95290f9c672f3692c4b0826 (diff) | |
| parent | 07df287814b0b7e6875debecdb51bdd496872812 (diff) | |
| download | xine-lib-ebe9b35496a2382c7d851a7be22faa850331e8f4.tar.gz xine-lib-ebe9b35496a2382c7d851a7be22faa850331e8f4.tar.bz2 | |
Merge with 4d746db529dee2629e297297e0d751de95010792
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ce348262b..5adc5ce6f 100644 --- a/configure.ac +++ b/configure.ac @@ -239,10 +239,13 @@ AC_CHECK_LIB([c], [dlopen], [DYNAMIC_LD_LIBS=""], AC_SUBST([DYNAMIC_LD_LIBS]) AC_ARG_WITH([external-libxdg-basedir], - [AS_HELP_STRING([--with-external-libxdg-basedir], [use external copy of libxdg-basedir])]) + [AS_HELP_STRING([--without-external-libxdg-basedir], [use internal copy of libxdg-basedir])]) -if test x"$with_external_libxdg_basedir" = x"yes"; then - PKG_CHECK_MODULES([XDG_BASEDIR], [libxdg-basedir >= 0.1.3]) +have_xdg_basedir=no +if test x"$with_external_libxdg_basedir" != x"no"; then + PKG_CHECK_MODULES([XDG_BASEDIR], [libxdg-basedir >= 1], [have_xdg_basedir=yes], [have_xdg_basedir=no]) +fi +if test x"$have_xdg_basedir" = xyes; then XDG_BASEDIR_REQUIRES="libxdg-basedir" else XDG_BASEDIR_CPPFLAGS='-I$(top_srcdir)/contrib/libxdg-basedir' @@ -255,7 +258,7 @@ AC_SUBST([XDG_BASEDIR_CPPFLAGS]) AC_SUBST([XDG_BASEDIR_LIBS]) AC_SUBST([XDG_BASEDIR_DEPS]) -AM_CONDITIONAL([EXTERNAL_LIBXDG_BASEDIR], [test x"$with_external_libxdg_basedir" = x"yes"]) +AM_CONDITIONAL([EXTERNAL_LIBXDG_BASEDIR], [test x"$have_xdg_basedir" = xyes]) dnl Test for socket and network support library AC_CHECK_LIB([socket], [socket], [NET_LIBS="-lsocket $NET_LIBS"]) |