diff --git a/freeglut/freeglut/configure.in b/freeglut/freeglut/configure.in
index a899288..c53d2a7 100644
--- a/freeglut/freeglut/configure.in
+++ b/freeglut/freeglut/configure.in
@@ -14,6 +14,7 @@ AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
 dnl Checks for libraries.
+AC_PATH_XTRA
 
 dnl Checks for header files.
 AC_STDC_HEADERS
diff --git a/freeglut/freeglut/freeglut-1.3/Makefile.am b/freeglut/freeglut/freeglut-1.3/Makefile.am
index afab6e1..60c9be4 100644
--- a/freeglut/freeglut/freeglut-1.3/Makefile.am
+++ b/freeglut/freeglut/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
-		
+
 
 #
 # 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
 
 #
diff --git a/freeglut/freeglut/genfonts/Makefile.am b/freeglut/freeglut/genfonts/Makefile.am
index e698fc4..25a0b0e 100644
--- a/freeglut/freeglut/genfonts/Makefile.am
+++ b/freeglut/freeglut/genfonts/Makefile.am
@@ -3,6 +3,6 @@
 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