From 0692f76bf8fc57354a303afdf1d447a1734b84cd Mon Sep 17 00:00:00 2001
From: Christopher John Purnell <cjp@lost.org.uk>
Date: Sun, 14 Sep 2003 17:00:28 +0000
Subject: [PATCH] Removed unused AC_PROG_RANLIB from configure.in Added
 passing of $(X_CFLAGS) to compiler.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@193 7f0cb862-5218-0410-a997-914c9d46530a
---
 configure.in                            |    1 -
 progs/demos/Fractals/Makefile.am        |    1 +
 progs/demos/Fractals_random/Makefile.am |    1 +
 progs/demos/Lorenz/Makefile.am          |    1 +
 progs/demos/One/Makefile.am             |    2 +-
 src/Makefile.am                         |    1 +
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index fa8c7a0..3ee8ffd 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,6 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_C_CONST
 AC_EXEEXT
-AC_PROG_RANLIB
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
diff --git a/progs/demos/Fractals/Makefile.am b/progs/demos/Fractals/Makefile.am
index 0954bbc..4ea7b7d 100644
--- a/progs/demos/Fractals/Makefile.am
+++ b/progs/demos/Fractals/Makefile.am
@@ -2,3 +2,4 @@ EXTRA_DIST = Fractals.dsp fractals.c fractals.dat
 bin_PROGRAMS = fractals
 fractals_SOURCES = fractals.c
 fractals_LDFLAGS = -export-dynamic ../../../src/libglut.la
+fractals_CFLAGS = $(X_CFLAGS)
diff --git a/progs/demos/Fractals_random/Makefile.am b/progs/demos/Fractals_random/Makefile.am
index 3e3007a..83586c2 100644
--- a/progs/demos/Fractals_random/Makefile.am
+++ b/progs/demos/Fractals_random/Makefile.am
@@ -3,3 +3,4 @@ EXTRA_DIST = Fractals_random.dsp fractals.dat fractals_random.c
 bin_PROGRAMS = fractals_random
 fractals_random_SOURCES = fractals_random.c
 fractals_random_LDFLAGS = -export-dynamic ../../../src/libglut.la
+fractals_random_CFLAGS = $(X_CFLAGS)
diff --git a/progs/demos/Lorenz/Makefile.am b/progs/demos/Lorenz/Makefile.am
index a49756b..627b811 100644
--- a/progs/demos/Lorenz/Makefile.am
+++ b/progs/demos/Lorenz/Makefile.am
@@ -3,3 +3,4 @@ EXTRA_DIST = lorenz.c lorenz.dsp
 bin_PROGRAMS = lorenz
 lorenz_SOURCES = lorenz.c
 lorenz_LDFLAGS = -export-dynamic ../../../src/libglut.la
+lorenz_CFLAGS = $(X_CFLAGS)
diff --git a/progs/demos/One/Makefile.am b/progs/demos/One/Makefile.am
index 3f171dc..cb606a4 100644
--- a/progs/demos/One/Makefile.am
+++ b/progs/demos/One/Makefile.am
@@ -2,4 +2,4 @@ EXTRA_DIST = one.c one.dsp
 bin_PROGRAMS = one
 one_SOURCES = one.c
 one_LDFLAGS = -export-dynamic ../../../src/libglut.la
-
+one_CFLAGS = $(X_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 473ccac..0f9ffa2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,7 @@ libglut_la_SOURCES = freeglut_callbacks.c \
 #	 
 libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
 libglut_la_LDFLAGS = -version-info 11:0:8
+libglut_la_CFLAGS = $(X_CFLAGS)
 
 #
 # End of file
-- 
1.7.10.4