diff options
| author | Brian Paul <brianp@vmware.com> | 2013-02-26 08:49:34 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-02-26 08:49:35 -0700 |
| commit | 22c61a33a29bf3f26cc2dacad6eb8ea6ea6ff864 (patch) | |
| tree | 1f6af049ccb07e45e33b708538b6ed89b00055e0 | |
| parent | b1d3efd3ef2d755a1078e1de857c83db022f747d (diff) | |
configure: remove FEATURE_GL/ES1/ES2 and IN_DRI_DRIVER
Not used anymore.
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 3efef04aea..94304e1528 100644 --- a/configure.ac +++ b/configure.ac @@ -686,17 +686,6 @@ if test "x$enable_opengl" = xno -a \ fi API_DEFINES="" -if test "x$enable_opengl" = xno; then - API_DEFINES="$API_DEFINES -DFEATURE_GL=0" -else - API_DEFINES="$API_DEFINES -DFEATURE_GL=1" -fi -if test "x$enable_gles1" = xyes; then - API_DEFINES="$API_DEFINES -DFEATURE_ES1=1" -fi -if test "x$enable_gles2" = xyes; then - API_DEFINES="$API_DEFINES -DFEATURE_ES2=1" -fi AC_SUBST([API_DEFINES]) if test "x$enable_glx" = xno; then @@ -743,9 +732,7 @@ if test "x$enable_dri" = xno; then fi if test "x$enable_shared_glapi" = xyes; then - # libGL will use libglapi for function lookups (IN_DRI_DRIVER means to use - # the remap table) - DEFINES="$DEFINES -DIN_DRI_DRIVER" + # libGL will use libglapi for function lookups CORE_DIRS="mapi/shared-glapi" fi AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) @@ -998,7 +985,7 @@ DRI_DIRS="" case "$with_dri_drivers" in no) ;; yes) - # classic DRI drivers require FEATURE_GL to build + # classic DRI drivers if test "x$enable_opengl" = xyes; then DRI_DIRS="yes" fi @@ -1022,7 +1009,7 @@ if test "x$enable_dri" = xyes; then # Platform specific settings and drivers to build case "$host_os" in linux*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DHAVE_ALIAS" case "$host_cpu" in @@ -1047,21 +1034,21 @@ if test "x$enable_dri" = xyes; then ;; freebsd* | dragonfly* | *netbsd*) DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" - DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" + DEFINES="$DEFINES -DHAVE_ALIAS" if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="i915 i965 nouveau r200 radeon swrast" fi ;; gnu*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DHAVE_ALIAS" ;; solaris*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" ;; cygwin*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="swrast" fi |