[Opende-svn] SF.net SVN: opende: [954] trunk

[<kw...@us...>]

Revision: 954
Author:   kwizatz
Date:     2006-05-11 15:29:08 -0700 (Thu, 11 May 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=954&view=rev

Log Message:
-----------
Added a better check for x_includes and x_libraries

Modified Paths:
--------------
    trunk/Makefile
    trunk/configure.in
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-05-10 21:22:05 UTC (rev 953)
+++ trunk/Makefile	2006-05-11 22:29:08 UTC (rev 954)
@@ -76,15 +76,15 @@
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/kwizatz/opende/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/rhc0/opende/missing --run aclocal-1.9
 ALLOCA = 
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/kwizatz/opende/missing --run tar
+AMTAR = ${SHELL} /home/rhc0/opende/missing --run tar
 ARCHFLAGS = 
-AUTOCONF = ${SHELL} /home/kwizatz/opende/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/kwizatz/opende/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/kwizatz/opende/missing --run automake-1.9
+AUTOCONF = ${SHELL} /home/rhc0/opende/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/rhc0/opende/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/rhc0/opende/missing --run automake-1.9
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -103,7 +103,7 @@
 ECHO_T = 
 EGREP = grep -E
 EXEEXT = 
-GL_LIBS =  -lGL -lGLU -lXmu -lXi
+GL_LIBS =  -lGL -lGLU
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -112,7 +112,7 @@
 LIBOBJS = 
 LIBS =  -lstdc++ -lm -lpthread
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/kwizatz/opende/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/rhc0/opende/missing --run makeinfo
 OBJEXT = o
 ODE_AGE = 0
 ODE_CURRENT = 0
@@ -120,6 +120,8 @@
 ODE_REVISION = 5
 OPCODE_FALSE = #
 OPCODE_TRUE = 
+OSX_FALSE = 
+OSX_TRUE = #
 PACKAGE = ODE
 PACKAGE_BUGREPORT = od...@q1...
 PACKAGE_NAME = ODE
@@ -132,7 +134,7 @@
 SHARED_LDFLAGS = -shared
 SHELL = /bin/sh
 STRIP = 
-TOPDIR = /home/kwizatz/opende
+TOPDIR = /home/rhc0/opende
 VERSION = 0.6.0-rc1
 WIN32_FALSE = 
 WIN32_TRUE = #
@@ -144,7 +146,7 @@
 X_CFLAGS = 
 X_EXTRA_LIBS = 
 X_LIBS = 
-X_PRE_LIBS =  -lSM -lICE
+X_PRE_LIBS = 
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_RANLIB = ranlib
@@ -174,7 +176,7 @@
 host_vendor = pc
 includedir = ${prefix}/include
 infodir = ${prefix}/info
-install_sh = /home/kwizatz/opende/install-sh
+install_sh = /home/rhc0/opende/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localstatedir = ${prefix}/var

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-05-10 21:22:05 UTC (rev 953)
+++ trunk/configure.in	2006-05-11 22:29:08 UTC (rev 954)
@@ -302,11 +302,13 @@
   GL_LIBS="-framework OpenGL -framework Carbon -framework AGL"
 else
 dnl Add X include and lib paths
-  if test "X$no_x" != "Xyes"; then
-    CXXFLAGS="$CXXFLAGS -I${x_includes}"
-    CFLAGS="$CFLAGS -I${x_includes}"
-    LDFLAGS="$LDFLAGS -L${x_libraries}"
+  if test "X$x_includes" != "XNONE"; then
+    CXXFLAGS="$CXXFLAGS -I$x_includes"
+    CFLAGS="$CFLAGS -I$x_includes"
   fi
+  if test "X$x_libraries" != "XNONE"; then
+    LDFLAGS="$LDFLAGS -L$x_libraries"
+  fi
   AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glext.h,,,
        [[#if HAVE_GL_GL_H
          #include <GL/gl.h>
@@ -481,5 +483,11 @@
 echo "  Is this a Pentium:       $pentium"
 echo "  Is the CPU x86-64:       $cpu64"
 echo "  Is this a release build: $release"
+if test "X$x_includes" != "XNONE"; then
+echo "  X includes located at $x_includes"
+fi
+if test "X$x_libraries" != "XNONE"; then
+echo "  X library path at $x_libraries"
+fi
 echo "  Headers will be installed in $prefix/include/ode"
 echo "  Libraries will be installed in $prefix/lib"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.