From 72f3a1264622e3b8c3417fbb48945a42c5256372 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 2 Sep 2003 15:00:56 +0000 Subject: [PATCH] *** empty log message *** --- src/native/Makefile.am | 4 ++-- src/native/configure.in | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/native/Makefile.am b/src/native/Makefile.am index f2817ab4..6f93f28f 100644 --- a/src/native/Makefile.am +++ b/src/native/Makefile.am @@ -1,7 +1,7 @@ #SUBDIRS = common linux lib_LTLIBRARIES = liblwjgl.la -liblwjgl_la_SOURCES = dummy.cpp -#liblwjgl_la_LINK=$(CXXLINK) +liblwjgl_la_SOURCES = dummy.c +liblwjgl_la_LINK=$(CXXLINK) #liblwjgl_la_LINK=g++ -shared -o $@ #liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la diff --git a/src/native/configure.in b/src/native/configure.in index 2d05f857..86f0b756 100644 --- a/src/native/configure.in +++ b/src/native/configure.in @@ -11,25 +11,25 @@ AC_DISABLE_STATIC AC_LIBTOOL_DLOPEN # Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_CPP +AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL -AC_REQUIRE_CPP +#AC_REQUIRE_CPP case "$host_os" in darwin*) _BUILD_FLAG="-D_AGL" - CPPFLAGS="$CPPFLAGS -Wall $_BUILD_FLAGS" + CXXFLAGS="$CXXFLAGS -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" + 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)) @@ -50,7 +50,7 @@ AC_JNI_INCLUDE_DIR for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS do - CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" + CXXFLAGS="$CXXFLAGS -I$JNI_INCLUDE_DIR" done AC_CHECK_HEADER([stddef.h stdlib.h string.h sys/time.h])