Revision: 5207 Author: pebender Date: Tue Jul 21 14:41:42 2009 Log: - Added files missing from previous commit.
http://code.google.com/p/minimyth/source/detail?r=5207 Added: /trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.5-pkg_config.patch /trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.5-version.patch /trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.5.patch.gar ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.5-pkg_config.patch Tue Jul 21 14:41:42 2009 @@ -0,0 +1,116 @@ +diff -Naur Mesa-7.5-old/configs/default Mesa-7.5-new/configs/default +--- Mesa-7.5-old/configs/default 2009-06-26 11:21:59.000000000 -0700 ++++ Mesa-7.5-new/configs/default 2009-07-18 08:55:53.000000000 -0700 +@@ -37,6 +37,7 @@ + MKDEP_OPTIONS = -fdepend + MAKE = make + INSTALL = $(SHELL) $(TOP)/bin/minstall ++PKG_CONFIG = pkg-config + + # Tools for regenerating glapi (generally only needed by the developers) + PYTHON2 = python +diff -Naur Mesa-7.5-old/configs/freebsd-dri Mesa-7.5-new/configs/freebsd-dri +--- Mesa-7.5-old/configs/freebsd-dri 2009-05-07 08:34:49.000000000 -0700 ++++ Mesa-7.5-new/configs/freebsd-dri 2009-07-18 08:55:53.000000000 -0700 +@@ -30,8 +30,8 @@ + MESA_ASM_SOURCES = + + # Library/program dependencies +-LIBDRM_CFLAGS = `pkg-config --cflags libdrm` +-LIBDRM_LIB = `pkg-config --libs libdrm` ++LIBDRM_CFLAGS = `$(PKG_CONFIG) --cflags libdrm` ++LIBDRM_LIB = `$(PKG_CONFIG) --libs libdrm` + DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) + GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -pthread $(LIBDRM_LIB) +diff -Naur Mesa-7.5-old/configs/linux-dri Mesa-7.5-new/configs/linux-dri +--- Mesa-7.5-old/configs/linux-dri 2009-05-07 08:34:49.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-dri 2009-07-18 08:57:14.000000000 -0700 +@@ -43,8 +43,8 @@ + # Library/program dependencies + EXTRA_LIB_PATH=-L/usr/X11R6/lib + +-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) +-LIBDRM_LIB = $(shell pkg-config --libs libdrm) ++LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) ++LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) + DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) + GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl $(LIBDRM_LIB) +diff -Naur Mesa-7.5-old/configs/linux-dri-xcb Mesa-7.5-new/configs/linux-dri-xcb +--- Mesa-7.5-old/configs/linux-dri-xcb 2009-05-07 08:34:49.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-dri-xcb 2009-07-18 08:58:12.000000000 -0700 +@@ -25,7 +25,7 @@ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN + +-X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx) ++X11_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I x11) $(shell $(PKG_CONFIG) --cflags-only-I xcb) $(shell $(PKG_CONFIG) --cflags-only-I x11-xcb) $(shell $(PKG_CONFIG) --cflags-only-I xcb-glx) + + CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ + $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math +@@ -39,13 +39,13 @@ + MESA_ASM_SOURCES = + + # Library/program dependencies +-EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) ++EXTRA_LIB_PATH=$(shell $(PKG_CONFIG) --libs-only-L x11) + +-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) +-LIBDRM_LIB = $(shell pkg-config --libs libdrm) ++LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) ++LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) + DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) + GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ +- $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) ++ $(LIBDRM_LIB) $(shell $(PKG_CONFIG) --libs xcb) $(shell $(PKG_CONFIG) --libs x11-xcb) $(shell $(PKG_CONFIG) --libs xcb-glx) + + + # This is now 0 by default since it seems to confuse the hell out of people +diff -Naur Mesa-7.5-old/configs/linux-solo Mesa-7.5-new/configs/linux-solo +--- Mesa-7.5-old/configs/linux-solo 2009-05-07 08:34:49.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-solo 2009-07-18 08:58:45.000000000 -0700 +@@ -16,10 +16,10 @@ + ARCH_FLAGS ?= + + # DRM and pciaccess +-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) +-LIBDRM_LIB = $(shell pkg-config --libs libdrm) +-PCIACCESS_CFLAGS = $(shell pkg-config --cflags pciaccess) +-PCIACCESS_LIB = $(shell pkg-config --libs pciaccess) ++LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) ++LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) ++PCIACCESS_CFLAGS = $(shell $(PKG_CONFIG) --cflags pciaccess) ++PCIACCESS_LIB = $(shell $(PKG_CONFIG) --libs pciaccess) + + + DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ +diff -Naur Mesa-7.5-old/src/glut/directfb/Makefile Mesa-7.5-new/src/glut/directfb/Makefile +--- Mesa-7.5-old/src/glut/directfb/Makefile 2009-05-07 08:34:49.000000000 -0700 ++++ Mesa-7.5-new/src/glut/directfb/Makefile 2009-07-18 08:55:53.000000000 -0700 +@@ -9,9 +9,9 @@ + GLUT_MINOR = 7 + GLUT_TINY = 1 + +-INCLUDES = -I$(TOP)/include -I$(MARK) $(shell pkg-config --cflags directfb) ++INCLUDES = -I$(TOP)/include -I$(MARK) $(shell $(PKG_CONFIG) --cflags directfb) + +-GLUT_LIB_DEPS += $(shell pkg-config --libs directfb) ++GLUT_LIB_DEPS += $(shell $(PKG_CONFIG) --libs directfb) + + CORE_SOURCES = \ + callback.c \ +diff -Naur Mesa-7.5-old/src/mesa/drivers/directfb/Makefile Mesa-7.5-new/src/mesa/drivers/directfb/Makefile +--- Mesa-7.5-old/src/mesa/drivers/directfb/Makefile 2009-05-07 08:34:49.000000000 -0700 ++++ Mesa-7.5-new/src/mesa/drivers/directfb/Makefile 2009-07-18 08:55:53.000000000 -0700 +@@ -16,8 +16,8 @@ + -I$(TOP)/src/mesa/swrast \ + -I$(TOP)/src/mesa/swrast_setup + +-DFB_CFLAGS = $(shell pkg-config --cflags directfb) +-DFB_MODULEDIR = $(shell pkg-config --variable=moduledir directfb-internal) ++DFB_CFLAGS = $(shell $(PKG_CONFIG) --cflags directfb) ++DFB_MODULEDIR = $(shell $(PKG_CONFIG) --variable=moduledir directfb-internal) + + DIRECTFBGL_MESA_SOURCES = ../common/driverfuncs.c idirectfbgl_mesa.c + ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.5-version.patch Tue Jul 21 14:41:42 2009 @@ -0,0 +1,15 @@ +diff -Naur Mesa-7.5-old/configure.ac Mesa-7.5-new/configure.ac +--- Mesa-7.5-old/configure.ac 2009-07-18 09:02:06.000000000 -0700 ++++ Mesa-7.5-new/configure.ac 2009-07-18 09:12:41.000000000 -0700 +@@ -4,9 +4,9 @@ + + dnl Versioning - scrape the version from configs/default + m4_define([mesa_version], +- [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n'])]) ++ [7.1.0]) + m4_ifval(mesa_version,, +- [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])]) ++ [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version-mk-version`])]) + + dnl Tell the user about autoconf.html in the --help output + m4_divert_once([HELP_END], [ ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.5.patch.gar Tue Jul 21 14:41:42 2009 @@ -0,0 +1,1461 @@ +diff -Naur Mesa-7.5-old/bin/mklib Mesa-7.5-new/bin/mklib +--- Mesa-7.5-old/bin/mklib 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/bin/mklib 2009-07-18 09:02:20.000000000 -0700 +@@ -234,9 +234,9 @@ + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then +- LINK=g++ ++ LINK="${CXX:-'g++'}" + else +- LINK=gcc ++ LINK="${CC:-'gcc'}" + fi + fi + +@@ -271,7 +271,7 @@ + elif [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" # prefix with "lib", suffix with ".a" + echo "mklib: Making" $ARCH "static library: " ${LIBNAME} +- LINK="ar" ++ LINK="${AR:-'ar'}" + OPTS="-ru" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -300,7 +300,7 @@ + + # make lib + ${LINK} ${OPTS} ${LIBNAME} ${NEWOBJECTS} +- ranlib ${LIBNAME} ++ ${RANLIB:-'ranlib'} ${LIBNAME} + + # remove temporary extracted .o files + rm -f ${DELETIA} +@@ -369,7 +369,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making SunOS static library: " ${LIBNAME} + rm -f ${LIBNAME} +- ar -ruv ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} -ruv ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + else + if [ $NOPREFIX = 0 ] ; then +@@ -381,24 +381,24 @@ + # -linker was not specified, choose default linker now + if [ $CPLUSPLUS = 1 ] ; then + # determine linker and options for C++ code +- if [ `which c++` ] ; then +- # use Sun c++ +- LINK="c++" +- elif [ `type g++` ] ; then +- # use g++ +- LINK="g++" ++ if [ `which ${CXX:-'c++'}` ] ; then ++ # use Sun ${CXX:-'c++'} ++ LINK="${CXX:-'c++'}" ++ elif [ `type ${CXX:-'g++'}` ] ; then ++ # use ${CXX:-'g++'} ++ LINK="${CXX:-'g++'}" + else + echo "mklib: warning: can't find C++ compiler, trying CC." +- LINK="CC" ++ LINK="${CC:-'CC'}" + fi + else + # use native Sun linker for C code +- LINK="ld" ++ LINK="${LD:-'ld'}" + fi + fi + + # linker options +- if [ ${LINK} = "ld" -o ${LINK} = "cc" -o ${LINK} = "CC" ] ; then ++ if [ ${LINK} = "${LD:-'ld'}" -o ${LINK} = "${CC:-'cc'}" -o ${LINK} = "${CC:-'CC'}" ] ; then + # SunOS tools, -G to make shared libs + OPTS="-G" + else +@@ -472,9 +472,9 @@ + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then +- LINK=g++ ++ LINK=${CXX:-'g++'} + else +- LINK=gcc ++ LINK=${CC:-'gcc'} + fi + fi + +@@ -492,8 +492,8 @@ + STLIB="lib${LIBNAME}.a" + echo "mklib: Making FreeBSD static library: " ${STLIB} + rm -f ${STLIB} +- ar cq ${STLIB} ${OBJECTS} +- ranlib ${STLIB} ++ ${AR:-'ar'} cq ${STLIB} ${OBJECTS} ++ ${RANLIB:-'ranlib'} ${STLIB} + FINAL_LIBS=${STLIB} + else + SHLIB="lib${LIBNAME}.so.${MAJOR}" +@@ -514,14 +514,14 @@ + LIBNAME="lib${LIBNAME}_pic.a" + echo "mklib: Making NetBSD PIC static library: " ${LIBNAME} + rm -f ${LIBNAME} +- ar cq ${LIBNAME} ${OBJECTS} +- ranlib ${LIBNAME} ++ ${AR:-'ar'} cq ${LIBNAME} ${OBJECTS} ++ ${RANLIB:-'ranlib'} ${LIBNAME} + FINAL_LIBS=${LIBNAME} + else + LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}" + echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME} + rm -f ${LIBNAME} +- ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS} ++ ${LD:-'ld'} -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + fi + ;; +@@ -530,7 +530,7 @@ + if [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" + rm -f ${LIBNAME} +- ar rc ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} rc ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + else + LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so" +@@ -559,9 +559,9 @@ + fi + + if [ $CPLUSPLUS = 1 ] ; then +- LINK="CC" ++ LINK="${CC:-'CC'}" + else +- LINK="ld" ++ LINK="${LD:-'ld'}" + fi + + echo "mklib: Making IRIX " ${ABI} " shared library: " ${LIBNAME} +@@ -574,7 +574,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making linux-cygwin library: " ${LIBNAME} + rm -f ${LIBNAME} +- gnuwin32ar ruv ${LIBNAME} ${OBJECTS} ++ ${AR:-'gnuwin32ar'} ruv ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + ;; + +@@ -583,7 +583,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making HP-UX static library: " ${LIBNAME} + rm -f ${LIBNAME} +- ar -ruv ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} -ruv ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + else + # HP uses a .2 for their current GL/GLU libraries +@@ -593,7 +593,7 @@ + RUNLIB="lib${LIBNAME}.${MAJOR}" + DEVLIB="lib${LIBNAME}.sl" + echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB} +- ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS} ++ ${LD:-'ld'} -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS} + ln -s ${RUNLIB} ${DEVLIB} + FINAL_LIBS="${RUNLIB} ${DEVLIB}" + fi +@@ -614,14 +614,14 @@ + if [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making AIX static library: " ${LIBNAME} +- ar -ruv ${X64} ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} -ruv ${X64} ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + else + EXPFILE="lib${LIBNAME}.exp" + LIBNAME="lib${LIBNAME}.a" # shared objects are still stored in the .a libraries + OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry ${Q64}" + rm -f ${EXPFILE} ${OFILE} +- NM="/bin/nm -eC ${X64}" ++ NM="${NM:-'/bin/nm'} -eC ${X64}" + echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE} + ${NM} ${OBJECTS} | awk '{ + if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \ +@@ -645,10 +645,10 @@ + # On AIX a shared library is linked differently when + # you want to dlopen the file + if [ $DLOPEN = "1" ] ; then +- cc -G ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} ++ ${CC:-'cc'} -G ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} + else +- cc ${OPTS} ${LDFLAGS} -o ${OFILE} ${OBJECTS} ${DEPS} +- ar ${X64} -r ${LIBNAME} ${OFILE} ++ ${CC:-'cc'} ${OPTS} ${LDFLAGS} -o ${OFILE} ${OBJECTS} ${DEPS} ++ ${AR:='ar'} ${X64} -r ${LIBNAME} ${OFILE} + fi + + FINAL_LIBS="${LIBNAME}" +@@ -667,7 +667,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making OSF/1 static library: " ${LIBNAME} + rm -f ${LIBNAME} +- ar -ruv ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} -ruv ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + else + VERSION="${MAJOR}.${MINOR}" +@@ -675,9 +675,9 @@ + echo "mklib: Making OSF/1 shared library: " ${LIBNAME} + if [ "x$LINK" = "x" ] ; then + if [ $CPLUSPLUS = 1 ] ; then +- LINK=cxx ++ LINK=${CXX:-'cxx'} + else +- LINK=cc ++ LINK=${CC:-'cc'} + fi + fi + rm -f ${LIBNAME}.${VERSION} +@@ -691,7 +691,7 @@ + if [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making Darwin static library: " ${LIBNAME} +- LINK="ar" ++ LINK="${AR:-'ar'}" + OPTS="-ruvs" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -750,9 +750,9 @@ + + # determine linker + if [ $CPLUSPLUS = 1 ] ; then +- LINK="g++" ++ LINK="${CXX:-'g++'}" + else +- LINK="cc" ++ LINK="${CC:-'cc'}" + fi + + echo "mklib: Making Darwin shared library: " ${LIBNAME} +@@ -768,7 +768,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making LynxOS static library: " ${LIBNAME} + rm -f ${LIBNAME} +- ar ru ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} ru ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + ;; + +@@ -776,11 +776,11 @@ + if [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making BeOS static library: " ${LIBNAME} +- ar -cru "${LIBNAME}" ${OBJECTS} ++ ${AR:-'ar'} -cru "${LIBNAME}" ${OBJECTS} + else + LIBNAME="lib${LIBNAME}.so" + echo "mklib: Making BeOS shared library: " ${LIBNAME} +- gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}" ++ ${CC:-'gcc'} -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}" + mimeset -f "${LIBNAME}" + # XXX remove the Mesa3D stuff here since mklib isn't mesa-specific. + setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!" +@@ -798,7 +798,7 @@ + 'MorphOS') + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making MorphOS library: " ${LIBNAME} +- ppc-morphos-ar rc ${LIBNAME} ${OBJECTS} ++ ${AR:-'ppc-morphos-ar'} rc ${LIBNAME} ${OBJECTS} + FINAL_LIBS="${LIBNAME}" + ;; + +@@ -810,7 +810,7 @@ + + if [ $STATIC = 1 ] ; then + echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a +- LINK="ar" ++ LINK="${AR:-'ar'}" + OPTS="-ruv" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -832,9 +832,9 @@ + echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION} + + if [ $CPLUSPLUS = 1 ] ; then +- LINK="icpc" ++ LINK="${CC:-'icpc'}" + else +- LINK="icc" ++ LINK="${CC:-'icc'}" + fi + # rm any old libs + rm -f ${LIBNAME}.so.${VERSION} +@@ -856,7 +856,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making AIX GCC static library: " ${LIBNAME} + rm -f ${LIBNAME} +- ar ru ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} ru ${LIBNAME} ${OBJECTS} + FINAL_LIBS=${LIBNAME} + else + LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so" +@@ -864,7 +864,7 @@ + # remove old lib + rm -f ${LIBNAME} + # make the lib +- gcc -shared -Wl,-G ${OBJECTS} ${DEPS} -o ${LIBNAME} ++ ${CC:-'gcc'} -shared -Wl,-G ${OBJECTS} ${DEPS} -o ${LIBNAME} + # NOTE: the application linking with this library must specify + # the -Wl,-brtl flags to gcc + FINAL_LIBS=${LIBNAME} +@@ -879,7 +879,7 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making static library for Ultrix: " ${LIBNAME} + rm -f ${LIBNAME} +- ar ru ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} ru ${LIBNAME} ${OBJECTS} + FINAL_LIBS="${LIBNAME}" + ;; + +@@ -901,14 +901,14 @@ + + if [ $STATIC = 1 ] ; then + echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a +- LINK="ar" ++ LINK="${AR:-'ar'}" + OPTS="-ru" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} + fi + # make lib + ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS} +- ranlib ${LIBNAME}.a ++ ${RANLIB:-'ranlib'} ${LIBNAME}.a + # finish up + FINAL_LIBS=${LIBNAME}.a + else +@@ -919,9 +919,9 @@ + echo "mklib: Making" $ARCH "shared library: " ${CYGNAME}-${MAJOR}.dll + + if [ $CPLUSPLUS = 1 ] ; then +- LINK="g++" ++ LINK="${CXX:-'g++'}" + else +- LINK="gcc" ++ LINK="${GCC:-'gcc'}" + fi + + # rm any old libs +@@ -949,12 +949,12 @@ + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making static library for example arch: " ${LIBNAME} + rm -f ${LIBNAME} +- ar rv ${LIBNAME} ${OBJECTS} ++ ${AR:-'ar'} rv ${LIBNAME} ${OBJECTS} + FINAL_LIBS="${LIBNAME}" + else + LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so" + echo "mklib: Making shared library for example arch: " ${LIBNAME} +- ld -o ${LIBNAME} ${OBJECTS} ${DEPS} ++ ${LD:-'ld'} -o ${LIBNAME} ${OBJECTS} ${DEPS} + FINAL_LIBS="${LIBNAME}" + fi + ;; +diff -Naur Mesa-7.5-old/configs/darwin Mesa-7.5-new/configs/darwin +--- Mesa-7.5-old/configs/darwin 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/darwin 2009-07-18 09:02:20.000000000 -0700 +@@ -4,8 +4,6 @@ + + CONFIG_NAME = darwin + +-INSTALL_DIR = /usr/X11 +- + X11_DIR = $(INSTALL_DIR) + + # Compiler and flags +@@ -23,9 +21,9 @@ + ARCH_FLAGS += $(RC_CFLAGS) + + CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \ +- -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) ++ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing \ +- -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) ++ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + + # Library names (actual file names) + GL_LIB_NAME = libGL.dylib +@@ -41,12 +39,12 @@ + GLW_LIB_GLOB = libGLw.*dylib + OSMESA_LIB_GLOB = libOSMesa.*dylib + +-GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lX11 -lXt ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = glx/x11 mesa glu glut/glx glew +diff -Naur Mesa-7.5-old/configs/darwin-x86ppc Mesa-7.5-new/configs/darwin-x86ppc +--- Mesa-7.5-old/configs/darwin-x86ppc 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/darwin-x86ppc 2009-07-18 09:09:21.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = cc + CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin + CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ +- -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin ++ -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin + + MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" + +@@ -21,12 +21,12 @@ + GLW_LIB_NAME = libGLw.dylib + OSMESA_LIB_NAME = libOSMesa.dylib + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread ++GL_LIB_DEPS = -lX11 -lXext -lm -lpthread + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib +-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -lX11 -lXmu -lXi -lXext ++GLW_LIB_DEPS = -lX11 -lXt $(TOP)/lib/GL.dylib ++APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm + + # omit glw lib for now: + SRC_DIRS = gallium mesa glu glut/glx glew +diff -Naur Mesa-7.5-old/configs/default Mesa-7.5-new/configs/default +--- Mesa-7.5-old/configs/default 2009-07-18 08:55:53.000000000 -0700 ++++ Mesa-7.5-new/configs/default 2009-07-18 09:02:20.000000000 -0700 +@@ -75,7 +75,7 @@ + # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in + # order to build the Motif widget too) + GLW_SOURCES = GLwDrawA.c +-MOTIF_CFLAGS = -I/usr/include/Motif1.2 ++MOTIF_CFLAGS = -...@gar_destdir@GAR_includedir@/Motif1.2 + + + # Directories to build +@@ -115,13 +115,13 @@ + + + # Installation directories (for make install) +-INSTALL_DIR = /usr/local +-INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) +-INSTALL_INC_DIR = $(INSTALL_DIR)/include +-DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri ++INSTALL_DIR = @GAR_DESTDIR@@GAR_prefix@ ++INSTALL_LIB_DIR = @GAR_DESTDIR@@GAR_libdir@ ++INSTALL_INC_DIR = @GAR_DESTDIR@@GAR_includedir@ ++DRI_DRIVER_INSTALL_DIR = @GAR_DESTDIR@@GAR_libdir@/xorg/modules/dri + + # Where libGL will look for DRI hardware drivers +-DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) ++DRI_DRIVER_SEARCH_DIR = @GAR_libdir@/xorg/modules/dri + + # Xorg driver install directory (for xorg state-tracker) + XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers +diff -Naur Mesa-7.5-old/configs/freebsd Mesa-7.5-new/configs/freebsd +--- Mesa-7.5-old/configs/freebsd 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/freebsd 2009-07-18 09:02:20.000000000 -0700 +@@ -15,7 +15,7 @@ + DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \ + -DHZ=100 + +-X11_INCLUDES = -I/usr/local/include ++X11_INCLUDES = + + CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic + +@@ -27,5 +27,5 @@ + CFLAGS += -fno-strict-aliasing + CXXFLAGS += -fno-strict-aliasing + +-EXTRA_LIB_PATH = -L/usr/local/lib ++EXTRA_LIB_PATH = + APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm +diff -Naur Mesa-7.5-old/configs/freebsd-dri Mesa-7.5-new/configs/freebsd-dri +--- Mesa-7.5-old/configs/freebsd-dri 2009-07-18 08:55:53.000000000 -0700 ++++ Mesa-7.5-new/configs/freebsd-dri 2009-07-18 09:02:20.000000000 -0700 +@@ -11,8 +11,8 @@ + WARN_FLAGS = -Wall + OPT_FLAGS = -O -g + +-EXPAT_INCLUDES = -I/usr/local/include +-X11_INCLUDES = -I/usr/local/include ++EXPAT_INCLUDES = ++X11_INCLUDES = + DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS +@@ -32,12 +32,12 @@ + # Library/program dependencies + LIBDRM_CFLAGS = `$(PKG_CONFIG) --cflags libdrm` + LIBDRM_LIB = `$(PKG_CONFIG) --libs libdrm` +-DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) +-GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ ++DRI_LIB_DEPS = -lm -pthread -lexpat $(LIBDRM_LIB) ++GL_LIB_DEPS = -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -pthread $(LIBDRM_LIB) + +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lXt -lX11 + + + # Directories +diff -Naur Mesa-7.5-old/configs/hpux10 Mesa-7.5-new/configs/hpux10 +--- Mesa-7.5-old/configs/hpux10 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux10 2009-07-18 09:02:20.000000000 -0700 +@@ -8,7 +8,7 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM ++CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -DUSE_XSHM + CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE + +-APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm ++APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -lXext -lXmu -lXi -lX11 -lm +diff -Naur Mesa-7.5-old/configs/hpux10-gcc Mesa-7.5-new/configs/hpux10-gcc +--- Mesa-7.5-old/configs/hpux10-gcc 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux10-gcc 2009-07-18 09:02:20.000000000 -0700 +@@ -8,7 +8,7 @@ + CC = gcc + CXX = g++ + +-CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM ++CFLAGS = -ansi -O3 -D_HPUX_SOURCE -DUSE_XSHM + CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE + GLUT_CFLAGS = -fexceptions + +@@ -16,5 +16,5 @@ + CFLAGS += -fno-strict-aliasing + CXXFLAGS += -fno-strict-aliasing + +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lXext -lXmu -lXi -lX11 -lm + +diff -Naur Mesa-7.5-old/configs/hpux10-static Mesa-7.5-new/configs/hpux10-static +--- Mesa-7.5-old/configs/hpux10-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux10-static 2009-07-18 09:02:20.000000000 -0700 +@@ -8,7 +8,7 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM ++CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -DUSE_XSHM + CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE + + MKLIB_OPTIONS = -static +@@ -26,5 +26,5 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++ ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm -lstdc++ +diff -Naur Mesa-7.5-old/configs/hpux11-32 Mesa-7.5-new/configs/hpux11-32 +--- Mesa-7.5-old/configs/hpux11-32 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-32 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS ++CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -DUSE_XSHM -DPTHREADS + +-CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS ++CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -DPTHREADS + + MKLIB_OPTIONS = + +@@ -24,7 +24,7 @@ + + # Library/program dependencies + APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) +-GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread ++GL_LIB_DEPS = -lXext -lXt -lXi -lX11 -lm -lpthread + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) +diff -Naur Mesa-7.5-old/configs/hpux11-32-static Mesa-7.5-new/configs/hpux11-32-static +--- Mesa-7.5-old/configs/hpux11-32-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-32-static 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS ++CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -DUSE_XSHM -DPTHREADS + +-CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS ++CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -DPTHREADS + + MKLIB_OPTIONS = -static + +@@ -23,5 +23,5 @@ + OSMESA_LIB_NAME = libOSMesa.a + + # Library/program dependencies +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl + +diff -Naur Mesa-7.5-old/configs/hpux11-32-static-nothreads Mesa-7.5-new/configs/hpux11-32-static-nothreads +--- Mesa-7.5-old/configs/hpux11-32-static-nothreads 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-32-static-nothreads 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM ++CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -DUSE_XSHM + +-CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include ++CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE + + MKLIB_OPTIONS = -static + +@@ -23,4 +23,4 @@ + OSMESA_LIB_NAME = libOSMesa.a + + # Library/program dependencies +-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm ++APP_LIB_DEPS = -lXext -lXmu -lXi -lX11 -lm +diff -Naur Mesa-7.5-old/configs/hpux11-64 Mesa-7.5-new/configs/hpux11-64 +--- Mesa-7.5-old/configs/hpux11-64 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-64 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS ++CFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -DUSE_XSHM -DPTHREADS + +-CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS ++CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -DPTHREADS + + MKLIB_OPTIONS = + +@@ -25,7 +25,7 @@ + + # Library/program dependencies + APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) +-GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread ++GL_LIB_DEPS = -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) +diff -Naur Mesa-7.5-old/configs/hpux11-64-static Mesa-7.5-new/configs/hpux11-64-static +--- Mesa-7.5-old/configs/hpux11-64-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-64-static 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS ++CFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -DUSE_XSHM -DPTHREADS + +-CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS ++CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -DPTHREADS + + MKLIB_OPTIONS = -static + +@@ -24,4 +24,4 @@ + OSMESA_LIB_NAME = libOSMesa.a + + # Library/program dependencies +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl +diff -Naur Mesa-7.5-old/configs/hpux11-ia64 Mesa-7.5-new/configs/hpux11-ia64 +--- Mesa-7.5-old/configs/hpux11-ia64 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-ia64 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS ++CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -DUSE_XSHM -DPTHREADS + +-CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS ++CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -DPTHREADS + + MKLIB_OPTIONS = + +@@ -24,7 +24,7 @@ + OSMESA_LIB_NAME = libOSMesa.so + + # Library/program dependencies +-GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread ++GL_LIB_DEPS = -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) +diff -Naur Mesa-7.5-old/configs/hpux11-ia64-static Mesa-7.5-new/configs/hpux11-ia64-static +--- Mesa-7.5-old/configs/hpux11-ia64-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux11-ia64-static 2009-07-18 09:02:20.000000000 -0700 +@@ -8,9 +8,9 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS ++CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -DUSE_XSHM -DPTHREADS + +-CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS ++CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -DPTHREADS + + MKLIB_OPTIONS = -static + +@@ -24,4 +24,4 @@ + OSMESA_LIB_NAME = libOSMesa.a + + # Library/program dependencies +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl +diff -Naur Mesa-7.5-old/configs/hpux9 Mesa-7.5-new/configs/hpux9 +--- Mesa-7.5-old/configs/hpux9 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux9 2009-07-18 09:02:20.000000000 -0700 +@@ -9,8 +9,8 @@ + # XXX fix this + CXX = c++ + +-CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM +-CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 ++CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -DUSE_XSHM ++CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE + +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm + +diff -Naur Mesa-7.5-old/configs/hpux9-gcc Mesa-7.5-new/configs/hpux9-gcc +--- Mesa-7.5-old/configs/hpux9-gcc 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/hpux9-gcc 2009-07-18 09:02:20.000000000 -0700 +@@ -8,7 +8,7 @@ + CC = cc + CXX = aCC + +-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM ++CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -DUSE_XSHM + CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE + +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lXext -lXmu -lXi -lX11 -lm +diff -Naur Mesa-7.5-old/configs/linux Mesa-7.5-new/configs/linux +--- Mesa-7.5-old/configs/linux 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux 2009-07-18 09:02:20.000000000 -0700 +@@ -20,7 +20,7 @@ + -D_BSD_SOURCE -D_GNU_SOURCE \ + -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN + +-X11_INCLUDES = -I/usr/X11R6/include ++X11_INCLUDES = + + CFLAGS = -Wall -Wmissing-prototypes -Wdeclaration-after-statement \ + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ +@@ -35,4 +35,4 @@ + + GLUT_CFLAGS = -fexceptions + +-EXTRA_LIB_PATH = -L/usr/X11R6/lib ++EXTRA_LIB_PATH = +diff -Naur Mesa-7.5-old/configs/linux-alpha Mesa-7.5-new/configs/linux-alpha +--- Mesa-7.5-old/configs/linux-alpha 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-alpha 2009-07-18 09:02:20.000000000 -0700 +@@ -15,8 +15,8 @@ + CFLAGS += -fno-strict-aliasing + CXXFLAGS += -fno-strict-aliasing + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 ++GL_LIB_DEPS = -lX11 -lXext -lm -lpthread ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 + APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + +diff -Naur Mesa-7.5-old/configs/linux-alpha-static Mesa-7.5-new/configs/linux-alpha-static +--- Mesa-7.5-old/configs/linux-alpha-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-alpha-static 2009-07-18 09:02:20.000000000 -0700 +@@ -25,7 +25,7 @@ + OSMESA_LIB_NAME = libOSMesa.a + + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm ++GL_LIB_DEPS = -lX11 -lXext -lm -lpthread ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lm +diff -Naur Mesa-7.5-old/configs/linux-dri Mesa-7.5-new/configs/linux-dri +--- Mesa-7.5-old/configs/linux-dri 2009-07-18 08:57:14.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-dri 2009-07-18 09:02:20.000000000 -0700 +@@ -9,7 +9,7 @@ + CC = gcc + CXX = g++ + +-#MKDEP = /usr/X11R6/bin/makedepend ++#MKDEP = makedepend + #MKDEP = gcc -M + #MKDEP_OPTIONS = -MF depend + +@@ -25,7 +25,7 @@ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + +-X11_INCLUDES = -I/usr/X11R6/include ++X11_INCLUDES = + + CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) +@@ -41,7 +41,7 @@ + MESA_ASM_SOURCES = + + # Library/program dependencies +-EXTRA_LIB_PATH=-L/usr/X11R6/lib ++EXTRA_LIB_PATH= + + LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) + LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) +diff -Naur Mesa-7.5-old/configs/linux-dri-x86-64 Mesa-7.5-new/configs/linux-dri-x86-64 +--- Mesa-7.5-old/configs/linux-dri-x86-64 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-dri-x86-64 2009-07-18 09:02:20.000000000 -0700 +@@ -14,7 +14,7 @@ + LIB_DIR = lib64 + + # Library/program dependencies +-EXTRA_LIB_PATH=-L/usr/X11R6/lib64 ++EXTRA_LIB_PATH= + + # ffb, gamma, and sis are missing because they have not be converted to use + # the new interface. i810 are missing because there is no x86-64 +diff -Naur Mesa-7.5-old/configs/linux-dri-xcb Mesa-7.5-new/configs/linux-dri-xcb +--- Mesa-7.5-old/configs/linux-dri-xcb 2009-07-18 08:58:12.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-dri-xcb 2009-07-18 09:02:20.000000000 -0700 +@@ -9,7 +9,7 @@ + CC = gcc + CXX = g++ + +-#MKDEP = /usr/X11R6/bin/makedepend ++#MKDEP = makedepend + #MKDEP = gcc -M + #MKDEP_OPTIONS = -MF depend + +diff -Naur Mesa-7.5-old/configs/linux-egl Mesa-7.5-new/configs/linux-egl +--- Mesa-7.5-old/configs/linux-egl 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-egl 2009-07-18 09:09:07.000000000 -0700 +@@ -25,7 +25,7 @@ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + +-X11_INCLUDES = -I/usr/X11R6/include ++X11_INCLUDES = + + CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) +@@ -36,7 +36,7 @@ + MESA_ASM_SOURCES = + + # Library/program dependencies +-EXTRA_LIB_PATH=-L/usr/X11R6/lib ++EXTRA_LIB_PATH= + + LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) + LIBDRM_LIB = $(shell pkg-config --libs libdrm) +diff -Naur Mesa-7.5-old/configs/linux-glide Mesa-7.5-new/configs/linux-glide +--- Mesa-7.5-old/configs/linux-glide 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-glide 2009-07-18 09:02:20.000000000 -0700 +@@ -8,7 +8,7 @@ + CC = gcc + CXX = g++ + +-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include ++CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DFX + CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE + GLUT_CFLAGS = -fexceptions + +@@ -17,7 +17,7 @@ + CXXFLAGS += -fno-strict-aliasing + + # Library/program dependencies +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm ++GL_LIB_DEPS = -lX11 -lXext -lglide3x -lm -lpthread ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3x -lm +diff -Naur Mesa-7.5-old/configs/linux-ia64-icc Mesa-7.5-new/configs/linux-ia64-icc +--- Mesa-7.5-old/configs/linux-ia64-icc 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-ia64-icc 2009-07-18 09:02:20.000000000 -0700 +@@ -7,14 +7,14 @@ + # Compiler and flags + CC = icc + CXX = icpc +-CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include +-CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include ++CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS ++CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS + GLUT_CFLAGS = -fexceptions + MKLIB_OPTIONS = -arch icc-istatic + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread ++GL_LIB_DEPS = -lX11 -lXext -lpthread + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) + APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) + +diff -Naur Mesa-7.5-old/configs/linux-ia64-icc-static Mesa-7.5-new/configs/linux-ia64-icc-static +--- Mesa-7.5-old/configs/linux-ia64-icc-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-ia64-icc-static 2009-07-18 09:02:20.000000000 -0700 +@@ -7,8 +7,8 @@ + # Compiler and flags + CC = icc + CXX = icpc +-CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include +-CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include ++CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS ++CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS + GLUT_CFLAGS = -fexceptions + MKLIB_OPTIONS = -static -arch icc-istatic + +@@ -23,5 +23,5 @@ + GLU_LIB_DEPS = + GLUT_LIB_DEPS = + GLW_LIB_DEPS = +-APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind ++APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind + +diff -Naur Mesa-7.5-old/configs/linux-icc Mesa-7.5-new/configs/linux-icc +--- Mesa-7.5-old/configs/linux-icc 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-icc 2009-07-18 09:02:20.000000000 -0700 +@@ -7,13 +7,13 @@ + # Compiler and flags + CC = icc + CXX = g++ +-CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include ++CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS + CXXFLAGS = -O3 + GLUT_CFLAGS = -fexceptions + MKLIB_OPTIONS = -arch icc + +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread +-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm ++GL_LIB_DEPS = -lX11 -lXext -lm -lpthread ++GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm + APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + + MESA_ASM_SOURCES = $(X86_SOURCES) +diff -Naur Mesa-7.5-old/configs/linux-icc-static Mesa-7.5-new/configs/linux-icc-static +--- Mesa-7.5-old/configs/linux-icc-static 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-icc-static 2009-07-18 09:02:20.000000000 -0700 +@@ -7,7 +7,7 @@ + # Compiler and flags + CC = icc + CXX = icpc +-CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include ++CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS + CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS + GLUT_CFLAGS = -fexceptions + MKLIB_OPTIONS = -static -arch icc +@@ -21,7 +21,7 @@ + + GL_LIB_DEPS = + GLUT_LIB_DEPS = +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind + + MESA_ASM_SOURCES = $(X86_SOURCES) + GLAPI_ASM_SOURCES = $(X86_API) +diff -Naur Mesa-7.5-old/configs/linux-indirect Mesa-7.5-new/configs/linux-indirect +--- Mesa-7.5-old/configs/linux-indirect 2009-07-18 08:55:32.000000000 -0700 ++++ Mesa-7.5-new/configs/linux-indirect 2009-07-18 09:02:20.000000000 -0700 +@@ -10,7 +10,7 @@ + CC = gcc + CXX = g++ + +-#MKDEP = /usr/X11R6/bin/makedepend ++#MKDEP = makedepend + #MKDEP = gcc -M + #MKDEP_OPTIONS = -MF depend + +@@ -26,7 +26,7 @@ + -DGLX_INDIRECT_RENDERING \ ***The diff for this file has been truncated for email.*** --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
