diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-07 18:13:17 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-07 18:13:17 +0000 |
| commit | e066b69435f814b48e7646c75e3db4b726bf5cf6 (patch) | |
| tree | 0d6380e81c1e32f7a4146652208e8d1c55ac2ae9 | |
| parent | a65a9e72c0273fee579788f57c48b27ef933a9a7 (diff) | |
| download | xine-lib-e066b69435f814b48e7646c75e3db4b726bf5cf6.tar.gz xine-lib-e066b69435f814b48e7646c75e3db4b726bf5cf6.tar.bz2 | |
Correctly fall back on internal libxdg-basedir.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 615f2c04c..97b78cf66 100644 --- a/configure.ac +++ b/configure.ac @@ -241,8 +241,11 @@ AC_SUBST([DYNAMIC_LD_LIBS]) AC_ARG_WITH([external-libxdg-basedir], [AS_HELP_STRING([--without-external-libxdg-basedir], [use internal copy of libxdg-basedir])]) +have_xdg_basedir=no if test x"$with_external_libxdg_basedir" != x"no"; then - PKG_CHECK_MODULES([XDG_BASEDIR], [libxdg-basedir >= 1]) + 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"no"]) +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"]) |