The build system now looks for X.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@11 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/configure.in b/configure.in
index a899288..c53d2a7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@ AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 dnl Checks for libraries.
 AC_SUBST(LIBTOOL_DEPS)
 
 dnl Checks for libraries.

+AC_PATH_XTRA

 
 dnl Checks for header files.
 AC_STDC_HEADERS
 
 dnl Checks for header files.
 AC_STDC_HEADERS

diff --git a/freeglut-1.3/Makefile.am b/freeglut-1.3/Makefile.am
index afab6e1..60c9be4 100644 (file)
--- a/freeglut-1.3/Makefile.am
+++ b/freeglut-1.3/Makefile.am
@@ -26,12 +26,12 @@ libfreeglut_1_3_la_SOURCES = freeglut_callbacks.c \
                             freeglut_teapot.c \
                             freeglut_videoresize.c \
                             freeglut_window.c
                             freeglut_teapot.c \
                             freeglut_videoresize.c \
                             freeglut_window.c

-               
+

 
 #
 # Additional linker flags
 #       
 
 #
 # Additional linker flags
 #       

-libfreeglut_1_3_la_LIBADD = $(LIBM) -L/usr/X11R6/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib
+libfreeglut_1_3_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib

 libfreeglut_1_3_la_LDFLAGS = -version-info 0:0:0
 
 #
 libfreeglut_1_3_la_LDFLAGS = -version-info 0:0:0
 
 #

diff --git a/genfonts/Makefile.am b/genfonts/Makefile.am
index e698fc4..25a0b0e 100644 (file)
--- a/genfonts/Makefile.am
+++ b/genfonts/Makefile.am
@@ -3,6 +3,6 @@
 bin_PROGRAMS      = genfonts genstroke
 genfonts_SOURCES  = genfonts.c
 genstroke_SOURCES = genstroke.c
 bin_PROGRAMS      = genfonts genstroke
 genfonts_SOURCES  = genfonts.c
 genstroke_SOURCES = genstroke.c

-genfonts_LDADD    = -L/usr/X11R6/lib -lglib -lX11 -lXext
+genfonts_LDADD    = $(X_LIBS) -lglib -lX11 -lXext

 genstroke_LDADD   = -lglib
 EXTRA_DIST        = genfonts.c genstroke.c
 genstroke_LDADD   = -lglib
 EXTRA_DIST        = genfonts.c genstroke.c