[Java-game-lib-cvs] CVS: LWJGL/src/native Makefile.am,1.8,1.9 configure.in,1.31,1.32

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1:/tmp/cvs-serv2392

Modified Files:
	Makefile.am configure.in 
Log Message:


Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	3 Sep 2003 15:42:37 -0000	1.8
+++ Makefile.am	4 Sep 2003 07:23:47 -0000	1.9
@@ -1,6 +1,6 @@
-#SUBDIRS = common linux
+SUBDIRS = common linux
 
 lib_LTLIBRARIES = liblwjgl.la
-liblwjgl_la_SOURCES = dummy.cc
-#liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la
-#liblwjgl_la_DEPENDENCIES = common/libcommon.la linux/liblinux.la
+liblwjgl_la_SOURCES = 
+liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la
+liblwjgl_la_DEPENDENCIES = common/libcommon.la linux/liblinux.la

Index: configure.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.in	3 Sep 2003 15:42:37 -0000	1.31
+++ configure.in	4 Sep 2003 07:23:47 -0000	1.32
@@ -2,22 +2,22 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT
-AM_INIT_AUTOMAKE(LWJGL, 0.7)
+AC_INIT(LWJGL, 0.7)
+AM_INIT_AUTOMAKE()
 AC_CONFIG_SRCDIR([autogen.sh])
 AM_CONFIG_HEADER([config.h])
 
-#AC_DISABLE_STATIC
+AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
-#LD=$CXX
+AC_PROG_CXX
+CC="$CXX"
 AC_PROG_LIBTOOL 
 
 case "$host_os" in
@@ -26,13 +26,12 @@
                         CFLAGS="$CFLAGS -Wall $_BUILD_FLAGS"
                         ;;
 	bsdi* | linux* | solaris*) AC_PATH_XTRA
-                                   #LIBS='-L/usr/X11R6/lib'
                                    _BUILD_FLAGS="-pthread -D_X11 $X_CFLAGS"
                                    CXXFLAGS="$CXXFLAGS -Wall $_BUILD_FLAGS"
                                    CFLAGS="$CFLAGS -Wall $_BUILD_FLAGS"
                                    LIBS="$LIBS $X_LIBS"
                                    AC_CHECK_LIB(X11, XOpenDisplay,, AC_MSG_ERROR(X11 is required))
-#                                   AC_CHECK_LIB(Xext, ,, AC_MSG_ERROR(Xext is required))
+                                   AC_CHECK_LIB(Xext, main,, AC_MSG_ERROR(Xext is required))
                                    AC_CHECK_LIB(Xxf86vm, main,, AC_MSG_ERROR(Xxf86vm is required))
                                    AC_CHECK_LIB(pthread, pthread_create,, AC_MSG_ERROR(pthread is required))