SDL configured through pkg-config instead of sdl-config
This commit is contained in:
parent
79d5004c22
commit
f19590daaa
|
@ -13,7 +13,7 @@ saving and player control through keyboard.
|
||||||
Requirements
|
Requirements
|
||||||
------------
|
------------
|
||||||
|
|
||||||
Audacious >= 3.5, 1.0.6 <= SDL < 2, Glib >= 2.28, Gtk+ >= 2.8
|
Audacious >= 3.5, 1.2 <= SDL < 2, Glib >= 2.28, Gtk+ >= 2.8
|
||||||
|
|
||||||
**Install deps in Ubuntu**
|
**Install deps in Ubuntu**
|
||||||
|
|
||||||
|
|
15
configure.ac
15
configure.ac
|
@ -33,7 +33,7 @@ else
|
||||||
AC_MSG_ERROR([*** pkg-config too old; version 0.14 or better required.])
|
AC_MSG_ERROR([*** pkg-config too old; version 0.14 or better required.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check some dependencies
|
# Check dependencies
|
||||||
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28,,)
|
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28,,)
|
||||||
AC_SUBST(GLIB_LIBS)
|
AC_SUBST(GLIB_LIBS)
|
||||||
AC_SUBST(GLIB_CFLAGS)
|
AC_SUBST(GLIB_CFLAGS)
|
||||||
|
@ -46,16 +46,9 @@ PKG_CHECK_MODULES(AUDACIOUS, audacious >= 3.5,,)
|
||||||
AC_SUBST(AUDACIOUS_LIBS)
|
AC_SUBST(AUDACIOUS_LIBS)
|
||||||
AC_SUBST(AUDACIOUS_CFLAGS)
|
AC_SUBST(AUDACIOUS_CFLAGS)
|
||||||
|
|
||||||
AC_PATH_PROG(SDL_CONFIG, [sdl-config], [no])
|
PKG_CHECK_MODULES(SDL, sdl >= 1.2,,)
|
||||||
if test x$SDL_CONFIG = xno ; then
|
AC_SUBST(SDL_LIBS)
|
||||||
AC_MSG_ERROR([
|
AC_SUBST(SDL_CFLAGS)
|
||||||
*** sdl-config not found.
|
|
||||||
*** If you have installed from binaries, probably you have not
|
|
||||||
*** installed SDL development package.
|
|
||||||
*** See http://www.libsdl.org
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
AM_PATH_SDL(1.0.6,,AC_MSG_ERROR([*** SDL >= 1.0.6 not installed - please install first]))
|
|
||||||
|
|
||||||
# Check for header files.
|
# Check for header files.
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
|
|
Loading…
Reference in New Issue