diff options
author | Matt Turner <mattst88@gmail.com> | 2012-08-14 12:24:31 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2012-08-16 15:04:53 -0700 |
commit | e273ed37eaf9de57883631f223afbe50f1c78291 (patch) | |
tree | 2f10eaae7dd8a11bb2cc9091cbc103667dbabaed | |
parent | f36c404f900dee95ecfe9d5c6a7c6efdf5e25963 (diff) |
build: Require X11 pkg-config files
-rw-r--r-- | configure.ac | 85 |
1 files changed, 16 insertions, 69 deletions
diff --git a/configure.ac b/configure.ac index 0329bad800e..233efa2f980 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -153,8 +153,6 @@ AC_SUBST([EXTRA_LIB_PATH]) | |||
153 | 153 | ||
154 | dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later | 154 | dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later |
155 | _SAVE_CPPFLAGS="$CPPFLAGS" | 155 | _SAVE_CPPFLAGS="$CPPFLAGS" |
156 | AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers]) | ||
157 | AC_SUBST([X11_INCLUDES]) | ||
158 | 156 | ||
159 | dnl Compiler macros | 157 | dnl Compiler macros |
160 | DEFINES="" | 158 | DEFINES="" |
@@ -878,32 +876,8 @@ if test "x$enable_dri" = xyes; then | |||
878 | fi | 876 | fi |
879 | fi | 877 | fi |
880 | 878 | ||
881 | dnl | 879 | dnl Find out if X is available. |
882 | dnl Find out if X is available. The variable have_x is set if libX11 is | 880 | PKG_CHECK_MODULES([X11], [x11]) |
883 | dnl found to mimic AC_PATH_XTRA. | ||
884 | dnl | ||
885 | if test -n "$PKG_CONFIG"; then | ||
886 | AC_MSG_CHECKING([pkg-config files for X11 are available]) | ||
887 | PKG_CHECK_EXISTS([x11],[ | ||
888 | x11_pkgconfig=yes | ||
889 | have_x=yes | ||
890 | ],[ | ||
891 | x11_pkgconfig=no | ||
892 | ]) | ||
893 | AC_MSG_RESULT([$x11_pkgconfig]) | ||
894 | else | ||
895 | x11_pkgconfig=no | ||
896 | fi | ||
897 | dnl Use the autoconf macro if no pkg-config files | ||
898 | if test "$x11_pkgconfig" = yes; then | ||
899 | PKG_CHECK_MODULES([X11], [x11]) | ||
900 | else | ||
901 | AC_PATH_XTRA | ||
902 | test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS" | ||
903 | test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11" | ||
904 | AC_SUBST([X11_CFLAGS]) | ||
905 | AC_SUBST([X11_LIBS]) | ||
906 | fi | ||
907 | 881 | ||
908 | dnl Try to tell the user that the --x-* options are only used when | 882 | dnl Try to tell the user that the --x-* options are only used when |
909 | dnl pkg-config is not available. This must be right after AC_PATH_XTRA. | 883 | dnl pkg-config is not available. This must be right after AC_PATH_XTRA. |
@@ -947,18 +921,10 @@ dnl | |||
947 | case "x$enable_glx$enable_xlib_glx" in | 921 | case "x$enable_glx$enable_xlib_glx" in |
948 | xyesyes) | 922 | xyesyes) |
949 | # Xlib-based GLX | 923 | # Xlib-based GLX |
950 | if test "$x11_pkgconfig" = yes; then | 924 | PKG_CHECK_MODULES([XLIBGL], [x11 xext]) |
951 | PKG_CHECK_MODULES([XLIBGL], [x11 xext]) | 925 | GL_PC_REQ_PRIV="x11 xext" |
952 | GL_PC_REQ_PRIV="x11 xext" | 926 | X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" |
953 | X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" | 927 | GL_LIB_DEPS="$XLIBGL_LIBS" |
954 | GL_LIB_DEPS="$XLIBGL_LIBS" | ||
955 | else | ||
956 | # should check these... | ||
957 | X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" | ||
958 | GL_LIB_DEPS="$X_LIBS -lX11 -lXext" | ||
959 | GL_PC_LIB_PRIV="$GL_LIB_DEPS" | ||
960 | GL_PC_CFLAGS="$X11_INCLUDES" | ||
961 | fi | ||
962 | GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS" | 928 | GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS" |
963 | GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" | 929 | GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" |
964 | ;; | 930 | ;; |
@@ -975,38 +941,19 @@ xyesno) | |||
975 | fi | 941 | fi |
976 | 942 | ||
977 | # find the DRI deps for libGL | 943 | # find the DRI deps for libGL |
978 | if test "$x11_pkgconfig" = yes; then | 944 | dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1" |
979 | PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) | ||
980 | dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx" | ||
981 | |||
982 | # add xf86vidmode if available | ||
983 | PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no) | ||
984 | if test "$HAVE_XF86VIDMODE" = yes ; then | ||
985 | dri_modules="$dri_modules xxf86vm" | ||
986 | fi | ||
987 | 945 | ||
988 | PKG_CHECK_MODULES([DRIGL], [$dri_modules]) | 946 | # add xf86vidmode if available |
989 | GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" | 947 | PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no) |
990 | X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" | 948 | if test "$HAVE_XF86VIDMODE" = yes ; then |
991 | GL_LIB_DEPS="$DRIGL_LIBS" | 949 | dri_modules="$dri_modules xxf86vm" |
992 | else | ||
993 | # should check these... | ||
994 | X11_INCLUDES="$X11_INCLUDES $X_CFLAGS" | ||
995 | if test "x$HAVE_XF86VIDMODE" == xyes; then | ||
996 | GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes" | ||
997 | else | ||
998 | GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXdamage -lXfixes" | ||
999 | fi | ||
1000 | GL_PC_LIB_PRIV="$GL_LIB_DEPS" | ||
1001 | GL_PC_CFLAGS="$X11_INCLUDES" | ||
1002 | |||
1003 | # XCB can only be used from pkg-config | ||
1004 | PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx >= 1.8.1]) | ||
1005 | GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx" | ||
1006 | X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS" | ||
1007 | GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS" | ||
1008 | fi | 950 | fi |
1009 | 951 | ||
952 | PKG_CHECK_MODULES([DRIGL], [$dri_modules]) | ||
953 | GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" | ||
954 | X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS" | ||
955 | GL_LIB_DEPS="$DRIGL_LIBS" | ||
956 | |||
1010 | # need DRM libs, -lpthread, etc. | 957 | # need DRM libs, -lpthread, etc. |
1011 | GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" | 958 | GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" |
1012 | GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" | 959 | GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS" |