diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-23 21:49:11 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-26 12:25:18 +1000 |
| commit | 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3 (patch) | |
| tree | 6ab9addd61df3cffa26339d0ed81b94f51081970 | |
| parent | 9bd08c690fc687c4d69bb70536f3079a9184476d (diff) | |
configure: Unify all library defines that require a specific version.
This patch moves all libraries that require a specific version into a single
location instead or duplicating them across the configure.ac file.
Libraries that do not require specific versions are left where they are.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7acdbee18..82d86db12 100644 --- a/configure.ac +++ b/configure.ac @@ -740,3 +740,11 @@ REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]" +dnl List of libraries that require a specific version +LIBAPPLEWM="applewm >= 1.4" +LIBDRI="dri >= 7.1.0" +LIBDRM="libdrm >= 2.3.0" +LIBGL="gl >= 7.1.0" LIBXEXT="xext >= 1.0.99.4" +LIBXI="xi >= 1.2.99.1" +LIBPCIACCESS="pciaccess >= 0.8.0" +LIBGLIB="glib-2.0 >= 2.16" @@ -905,3 +913,3 @@ if test "x$GLX" = xyes; then PKG_CHECK_MODULES([XLIB], [x11]) - PKG_CHECK_MODULES([GL], $GLPROTO [gl >= 7.1.0]) + PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL) AC_SUBST(XLIB_CFLAGS) @@ -932,3 +940,3 @@ if test "x$DRI" = xyes; then PKG_CHECK_MODULES([DRIPROTO], [$DRIPROTO]) - PKG_CHECK_MODULES([DRI], $GLPROTO [dri >= 7.1.0]) + PKG_CHECK_MODULES([DRI], $GLPROTO $LIBDRI) AC_SUBST(DRIPROTO_CFLAGS) @@ -950,3 +958,3 @@ AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) if test "x$DRI" = xyes || test "x$DRI2" = xyes; then - PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) + PKG_CHECK_MODULES([LIBDRM], $LIBDRM) AC_SUBST(LIBDRM_CFLAGS) @@ -1197,3 +1205,3 @@ AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes]) if test "x$UNITTESTS" != xno ; then - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16], + PKG_CHECK_MODULES([GLIB], $LIBGLIB, [HAVE_GLIB=yes], [HAVE_GLIB=no]) @@ -1446,3 +1454,3 @@ if test "x$XORG" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS) SAVE_LIBS=$LIBS @@ -1752,3 +1760,3 @@ if test "x$XQUARTZ" = xyes; then - PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO [applewm >= 1.4] xfixes x11) + PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11) @@ -1781,3 +1789,3 @@ dnl DMX DDX PKG_CHECK_MODULES([DMXMODULES], - [xmuu $LIBXEXT x11 xrender xfixes xfont xi >= 1.2.99.1 $DMXPROTO xau $XDMCP_MODULES], + [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no]) @@ -1820,3 +1828,3 @@ dnl Linux sources in DMX require <linux/keyboard.h> AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS) - PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi $LIBXEXT x11]) + PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx $LIBXI $LIBXEXT x11]) AC_SUBST(DMXXIEXAMPLES_DEP_LIBS) @@ -1900,3 +1908,3 @@ if test "$KDRIVE" = yes; then if test "x$DRI" = xyes && test "x$GLX" = xyes; then - XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS gl libdrm" + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" fi |