automake/autoconf changes for FreeBSD:

- Add the X11 header location to CFLAGS in minihwc.
- Add a DRI_BUILD conditional and define it in the CFLAGS in glide3.
- Use gmake instead of make when it's found.
- Add AC_CANONICAL_TARGET, which appeases libtool.

glide3x/configure.in

@@ -23,6 +23,7 @@ dnl Process this file with autoconf to produce a configure script.
 #
 AC_INIT(h5/glide3/src/glfb.c)
 AM_INIT_AUTOMAKE(glide, 3.0)
+AC_CANONICAL_TARGET
 AM_CONFIG_HEADER(swlibs/include/config.h)
 AC_PREFIX_DEFAULT([/usr])
 includedir='${prefix}/include/glide3'
@@ -151,6 +152,7 @@ AC_ARG_ENABLE([build-architecture],
                    ;;
                esac],[FX_GLIDE_BUILD_ARCHITECTURE=`uname -m`])
 AC_SUBST(FX_GLIDE_BUILD_ARCHITECTURE)
+
 #
 # Various tests needed at points in the build
 # First, we set defaults.
@@ -215,6 +217,8 @@ AM_CONDITIONAL(FX_GLIDE_VERTEX_TABLE,dnl
                test x$FX_GLIDE_VERTEX_TABLE = xtrue)
 AM_CONDITIONAL(FX_HOOPTI_TRI_SETUP_COMPARE,dnl
                test x$FX_HOOPTI_TRI_SETUP_COMPARE = xtrue)
+AM_CONDITIONAL(DRI_BUILD,dnl
+               test x$DRI_BUILD = xtrue)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -226,12 +230,13 @@ AC_CHECK_TOOL(CP, cp, false)
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
 AM_PROG_AS
-MAKE="make -f makefile.autoconf"
+AC_CHECK_PROG([MAKE], [gmake], [gmake -f makefile.autoconf], [make -f makefile.autoconf])
 AC_SUBST(MAKE)
 dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_PATH_X
+AC_SUBST(x_includes)
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/ioctl.h sys/time.h unistd.h)

glide3x/h5/glide3/src/makefile.autoconf.am

@@ -52,6 +52,10 @@ if GL_AMD3D
 GL_AMD3D_VDEFS = -DGL_AMD3D
 endif
 
+if DRI_BUILD
+DRI_BUILD_VDEFS = -DDRI_BUILD
+endif
+
 if HAL_HW 
 if HAL_CSIM
 HAL_HW_CSIM_VDEFS = -DHOOPTI_LAB_LFB_BYPASS=1
@@ -119,6 +123,7 @@ VDEFS = $(FX_CHRIS_DENIS_ANTHONY_HACK_VDEFS) \
         $(FX_GLIDE_DIRECT_WRITE_VDEFS) \
         $(FX_GLIDE_H5_VDEFS) \
         $(GL_AMD3D_VDEFS) \
+        $(DRI_BUILD_VDEFS) \
         $(HAL_HW_CSIM_VDEFS) \
         $(FX_GLIDE_SW_SETUP_VDEFS) \
         $(FX_GLIDE_NO_FIFO_VDEFS) \

glide3x/h5/minihwc/makefile.autoconf.am

@@ -23,6 +23,8 @@
 #
 # First, the variable defs.
 #
+LCFLAGS			= -I@x_includes@
+
 if GLIDE_DEBUG
 GLIDE_DEBUG_VDEFS=-DGDBG_INFO_ON
 endif