From 8e7572192d693d32b563d93fd45175866a19358a Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Tue, 2 Sep 2003 14:06:34 +0000
Subject: [PATCH] *** empty log message ***

---
 src/native/Makefile.am        |  6 ++++-
 src/native/common/Makefile.am | 51 +++++++++++++++++------------------
 src/native/configure.in       | 24 +++++++++++++++--
 src/native/dummy.cpp          |  2 ++
 src/native/linux/Makefile.am  | 18 ++++++-------
 5 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 src/native/dummy.cpp

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 96aca240..f2817ab4 100644
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS = common linux
+#SUBDIRS = common linux
 
 lib_LTLIBRARIES = liblwjgl.la
+liblwjgl_la_SOURCES = dummy.cpp
+#liblwjgl_la_LINK=$(CXXLINK)
+#liblwjgl_la_LINK=g++ -shared -o $@
+#liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la
diff --git a/src/native/common/Makefile.am b/src/native/common/Makefile.am
index 1abfca99..eb3e6400 100644
--- a/src/native/common/Makefile.am
+++ b/src/native/common/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = $(COMMON)
-libcommon_la_CPPFLAGS = -D_DEBUG
 
 COMMON = \
   extal.cpp \
@@ -16,30 +15,30 @@ COMMON = \
   org_lwjgl_input_Mouse.h \
   org_lwjgl_Math.cpp \
   org_lwjgl_Math.h \
-  org_lwjgl_openal_ALC.cpp \
-  org_lwjgl_openal_ALC.h \
-  org_lwjgl_openal_BaseAL.cpp \
-  org_lwjgl_openal_BaseAL.h \
-  org_lwjgl_openal_CoreAL.cpp \
-  org_lwjgl_openal_CoreAL.h \
-  org_lwjgl_openal_eax_BaseEAX.cpp \
-  org_lwjgl_openal_eax_BaseEAX.h \
-  org_lwjgl_openal_eax_CoreEAX.cpp \
-  org_lwjgl_openal_eax_CoreEAX.h \
-  org_lwjgl_openal_eax_EAXBufferProperties.cpp \
-  org_lwjgl_openal_eax_EAXBufferProperties.h \
-  org_lwjgl_openal_eax_EAXListenerProperties.cpp \
-  org_lwjgl_openal_eax_EAXListenerProperties.h \
-  org_lwjgl_opengl_CoreGL11.cpp \
-  org_lwjgl_opengl_CoreGL11.h \
-  org_lwjgl_opengl_CoreGL12.cpp \
-  org_lwjgl_opengl_CoreGL12.h \
-  org_lwjgl_opengl_CoreGL13.cpp \
-  org_lwjgl_opengl_CoreGL13.h \
-  org_lwjgl_opengl_CoreGL14.cpp \
-  org_lwjgl_opengl_CoreGL15.h \
-  org_lwjgl_opengl_GL.cpp \
-  org_lwjgl_opengl_GL.h \
-  org_lwjgl_opengl_GLU.cpp \
+#  org_lwjgl_openal_ALC.cpp \
+#  org_lwjgl_openal_ALC.h \
+#  org_lwjgl_openal_BaseAL.cpp \
+#  org_lwjgl_openal_BaseAL.h \
+#  org_lwjgl_openal_CoreAL.cpp \
+#  org_lwjgl_openal_CoreAL.h \
+#  org_lwjgl_openal_eax_BaseEAX.cpp \
+#  org_lwjgl_openal_eax_BaseEAX.h \
+#  org_lwjgl_openal_eax_CoreEAX.cpp \
+#  org_lwjgl_openal_eax_CoreEAX.h \
+#  org_lwjgl_openal_eax_EAXBufferProperties.cpp \
+#  org_lwjgl_openal_eax_EAXBufferProperties.h \
+#  org_lwjgl_openal_eax_EAXListenerProperties.cpp \
+#  org_lwjgl_openal_eax_EAXListenerProperties.h \
+#  org_lwjgl_opengl_CoreGL11.cpp \
+#  org_lwjgl_opengl_CoreGL11.h \
+#  org_lwjgl_opengl_CoreGL12.cpp \
+#  org_lwjgl_opengl_CoreGL12.h \
+#  org_lwjgl_opengl_CoreGL13.cpp \
+#  org_lwjgl_opengl_CoreGL13.h \
+#  org_lwjgl_opengl_CoreGL14.cpp \
+#  org_lwjgl_opengl_CoreGL15.h \
+#  org_lwjgl_opengl_GL.cpp \
+#  org_lwjgl_opengl_GL.h \
+#  org_lwjgl_opengl_GLU.cpp \
   org_lwjgl_opengl_GLU.h
   
diff --git a/src/native/configure.in b/src/native/configure.in
index 91b03315..2d05f857 100644
--- a/src/native/configure.in
+++ b/src/native/configure.in
@@ -4,7 +4,7 @@
 AC_PREREQ(2.57)
 AC_INIT
 AM_INIT_AUTOMAKE(LWJGL, 0.7)
-AC_CONFIG_SRCDIR([autogen.sh])
+AC_CONFIG_SRCDIR([dummy.cpp])
 AM_CONFIG_HEADER([config.h])
 
 AC_DISABLE_STATIC
@@ -19,11 +19,31 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL 
 
+AC_REQUIRE_CPP
+
+case "$host_os" in
+        darwin*)        _BUILD_FLAG="-D_AGL"
+                        CPPFLAGS="$CPPFLAGS -Wall $_BUILD_FLAGS"
+                        CFLAGS="$CFLAGS -Wall $_BUILD_FLAGS"
+                        ;;
+	bsdi* | linux* | solaris*) AC_PATH_XTRA
+                                   #LIBS='-L/usr/X11R6/lib'
+                                   _BUILD_FLAGS="-pthread -D_X11 $X_CFLAGS"
+                                   CPPFLAGS="$CPPFLAGS -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(Xxf86vm, main,, AC_MSG_ERROR(Xxf86vm is required))
+                                   AC_CHECK_LIB(pthread, pthread_create,, AC_MSG_ERROR(pthread is required))
+
+                                   ;;
+        *)              AC_MSG_ERROR([Unknow system $host_os]);;
+esac
 
 # Checks for libraries.
 
 # Checks for header files.
-AC_PATH_X
 AC_HEADER_STDC
 
 AC_JNI_INCLUDE_DIR
diff --git a/src/native/dummy.cpp b/src/native/dummy.cpp
new file mode 100644
index 00000000..16eedc1d
--- /dev/null
+++ b/src/native/dummy.cpp
@@ -0,0 +1,2 @@
+void _dummy() {
+}
diff --git a/src/native/linux/Makefile.am b/src/native/linux/Makefile.am
index 4e534277..686d148a 100644
--- a/src/native/linux/Makefile.am
+++ b/src/native/linux/Makefile.am
@@ -5,13 +5,13 @@ INCLUDES = -I../common
 
 NATIVE = \
   org_lwjgl_Display.cpp \
-  org_lwjgl_Sys.cpp \
-  org_lwjgl_input_Controller.cpp \
-  org_lwjgl_input_Keyboard.cpp \
-  org_lwjgl_input_Mouse.cpp \
-  org_lwjgl_input_Cursor.cpp \
-  org_lwjgl_opengl_Window.cpp \
-  org_lwjgl_opengl_GLCaps.cpp \
-  org_lwjgl_opengl_Pbuffer.cpp \
-  extxcursor.cpp
+#  org_lwjgl_Sys.cpp \
+#  org_lwjgl_input_Controller.cpp \
+#  org_lwjgl_input_Keyboard.cpp \
+#  org_lwjgl_input_Mouse.cpp \
+#  org_lwjgl_input_Cursor.cpp \
+#  org_lwjgl_opengl_Window.cpp \
+#  org_lwjgl_opengl_GLCaps.cpp \
+#  org_lwjgl_opengl_Pbuffer.cpp \
+#  extxcursor.cpp