Changeset 1505Tweet

Timestamp:

Jun 21, 2012, 12:53:53 AM (11 years ago)

Author:

sam

Message:

build: add more configure checks, mostly for neercs.

Location:

trunk

Files:

• configure.ac (modified) (4 diffs)
• neercs/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -58 +58 @@
   [  --enable-experimental   experimental build (default no)])
 
-AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h getopt.h fastmath.h pthread.h)
+AC_CHECK_HEADERS(stdio.h stdarg.h inttypes.h endian.h stdint.h getopt.h)
+AC_CHECK_HEADERS(fastmath.h pthread.h libutil.h util.h pty.h)
+AC_CHECK_HEADERS(sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h)
+AC_CHECK_HEADERS(sys/wait.h)
+AC_CHECK_HEADERS(linux/kdev_t.h linux/major.h)
+AC_CHECK_HEADERS(security/pam_appl.h security/pam_misc.h)
 
 if test "${enable_debug}" = "yes"; then
@@ -87 +92 @@
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
 AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+AC_CHECK_LIB(util, forkpty, UTIL_LIBS="${UTIL_LIBS} -lutil")
 
 dnl Are we on the PS3?
@@ -355 +361 @@
 
 
+dnl Extra libraries we may need
+AC_SUBST(MATH_LIBS)
+AC_SUBST(PAM_LIBS)
+AC_SUBST(UTIL_LIBS)
+
 dnl How to use the Lol Engine inside this tree
 LOL_CFLAGS="$LOL_CFLAGS -I \$(top_srcdir)/src"
@@ -360 +371 @@
 LOL_LIBS="$LOL_LIBS $SDL_LIBS $GL_LIBS $EGL_LIBS $LIBPNG_LIBS $D3D_LIBS"
 
-AC_SUBST(MATH_LIBS)
 AC_SUBST(LOL_CFLAGS)
 AC_SUBST(LOL_LIBS)
+
 
 AC_CONFIG_FILES(

trunk/neercs/Makefile.am

@@ -14 +14 @@
 neercs_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ @CACA_CFLAGS@
 neercs_LDADD =
-neercs_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@ @CACA_LIBS@
+neercs_LDFLAGS = $(top_builddir)/src/liblol.a \
+                 @LOL_LIBS@ @PIPI_LIBS@ @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
 neercs_DEPENDENCIES = $(top_builddir)/src/liblol.a