gauche-gl (0.4.4-5) 01_no_path_xtra.patch

Description: no PATH_XTRA
 Don't configure for PATH_XTRA
Author: NIIBE Yutaka <gniibe@fsij.org>
Reviewed-By: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2010-03-19

--- gauche-gl-0.4.4.orig/configure.in
+++ gauche-gl-0.4.4/configure.in
@@ -7,7 +7,7 @@
 AC_INIT(Gauche-gl, 0.4.4, shiro@acm.org)
 AC_CANONICAL_SYSTEM
 
-AC_PATH_XTRA
+dnl AC_PATH_XTRA
 
 case "$target" in
   *-*-cygwin*)
@@ -69,8 +69,8 @@
 AC_CHECK_HEADERS(GL/glx.h, [   # OpenGL/X11
      # NB: FreeBSD seems to need -lX11 -lXext.  We are on X11 system anyway,
      # so I assume this won't do any harm.
-     GL_LIBS='-lGLU -lGL -lX11 -lXext'
-     GLUT_LIB="$GLUT_LIB -lXmu -lXi"
+     GL_LIBS='-lGLU -lGL'
+     GLUT_LIB="$GLUT_LIB"
 ], ,)
 AC_CHECK_HEADERS(GLUT/glut.h, [
       case $target in
--- gauche-gl-0.4.4.orig/cg/Makefile.in
+++ gauche-gl-0.4.4/cg/Makefile.in
@@ -17,13 +17,12 @@
 # These are set by configure
 # NB: cc and various flags must match the ones used to compile Gauche,
 # so the make invocator shouldn't casually override them.
-CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ -I../src
+CFLAGS   = @DEFS@ @CFLAGS@ @GLUT_INCDIR@ -I../src
 LDFLAGS  = -I../src @LDFLAGS@ 
 OBJEXT   = @OBJEXT@
 SOEXT    = @SOEXT@
 OLIBS    = @LIBS@
-LIBS     = @CG_LIBS@ @GL_EXTRALIBS@ @GL_LIBS@ @LIBS@ \
-           @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @X_LIBS@
+LIBS     = @CG_LIBS@ @GL_EXTRALIBS@ @GL_LIBS@ @LIBS@
 GOSH     = @GOSH@
 GAUCHE_CONFIG  = @GAUCHE_CONFIG@
 GAUCHE_INSTALL = @GAUCHE_INSTALL@
@@ -62,7 +61,7 @@
 install : all
 	$(GAUCHE_INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
 	$(GAUCHE_INSTALL) -m 444 -T $(SCM_INSTALL_DIR) $(SCMFILES)
-	$(GAUCHE_INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
+	$(GAUCHE_INSTALL) -m 755 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
 
 uninstall : all
 	$(GAUCHE_INSTALL) -U $(HEADER_INSTALL_DIR) $(HEADERS)
--- gauche-gl-0.4.4.orig/src/Makefile.in
+++ gauche-gl-0.4.4/src/Makefile.in
@@ -17,12 +17,12 @@
 # These are set by configure
 # NB: cc and various flags must match the ones used to compile Gauche,
 # so the make invocator shouldn't casually override them.
-CFLAGS   = @DEFS@ @X_CFLAGS@ @GLUT_INCDIR@
+CFLAGS   = @DEFS@ @GLUT_INCDIR@
 LDFLAGS  = @LDFLAGS@
 OBJEXT   = @OBJEXT@
 SOEXT    = @SOEXT@
 OLIBS    = @LIBS@
-LIBS     = @GL_LIBS@ @LIBS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @X_LIBS@ 
+LIBS     = @GL_LIBS@ @LIBS@
 
 GOSH           = @GOSH@
 GAUCHE_CONFIG  = @GAUCHE_CONFIG@
@@ -101,7 +101,7 @@
 install : all
 	$(GAUCHE_INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
 	$(GAUCHE_INSTALL) -m 444 -T $(SCM_INSTALL_DIR) $(SCMFILES)
-	$(GAUCHE_INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
+	$(GAUCHE_INSTALL) -m 755 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
 
 uninstall : all
 	$(GAUCHE_INSTALL) -U $(HEADER_INSTALL_DIR) $(HEADERS)