Merge pull request #9 from fstd/master
Some build system and portability fixes
This commit is contained in:
commit
f9bf041b50
|
@ -9,6 +9,7 @@ mandir = @mandir@
|
|||
|
||||
CC = @CC@
|
||||
LIBS = @LIBS@
|
||||
LEXLIBS = @LEXLIBS@
|
||||
CFLAGS = @CFLAGS@
|
||||
INSTALL = @INSTALL@
|
||||
LEX = @LEX@
|
||||
|
@ -30,7 +31,7 @@ OBJS = $(SRCS:.c=.o)
|
|||
all: .depend $(NAME) $(EDITORS)
|
||||
|
||||
$(NAME): $(OBJS)
|
||||
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
|
||||
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LEXLIBS)
|
||||
|
||||
ee: ee.c
|
||||
$(CC) $(CFLAGS) -o $@ $< $(LIBS)
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
echo "Generating configuration files..."
|
||||
echo
|
||||
|
||||
autoconf
|
||||
autoheader
|
||||
autoreconf
|
||||
# evil
|
||||
rm -rf autom4te.cache
|
||||
./configure "$@"
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -15,9 +15,9 @@ if test -z "$LEX"; then
|
|||
AC_MSG_ERROR([lex or flex not found.])
|
||||
fi
|
||||
|
||||
LIBS="$LIBS $LEXLIB"
|
||||
LEXLIBS="$LEXLIB"
|
||||
|
||||
AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_CFLAGS+=-lpthread])
|
||||
AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR([need pthreads])])
|
||||
|
||||
AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc)
|
||||
if test -z "$YACC"; then
|
||||
|
@ -26,7 +26,7 @@ fi
|
|||
|
||||
case "$(uname -s)" in
|
||||
Linux | *BSD)
|
||||
LIBS="$LIBS -lutil -lcrypt"
|
||||
MY_LIBS="$MY_LIBS -lutil -lcrypt"
|
||||
AC_DEFINE(NOSTREAMS, 1, [Don't use SVR4 streams support in ttyrec.])
|
||||
;;
|
||||
esac
|
||||
|
@ -48,7 +48,7 @@ AC_PATH_PROG(MAKEDEPEND, makedepend)
|
|||
AC_MSG_CHECKING([how to generate dependency info])
|
||||
|
||||
if test "$ac_cv_c_compiler_gnu" = yes; then
|
||||
CFLAGS="$CFLAGS -Wall -Wno-unused $PTHREAD_CFLAGS"
|
||||
CFLAGS="$CFLAGS -Wall -Wno-unused"
|
||||
MKDEP="$CC -MM"
|
||||
MKDEP_DIRECT="> .depend"
|
||||
AC_MSG_RESULT(gcc)
|
||||
|
@ -108,7 +108,7 @@ AC_ARG_WITH(sqlite-db,
|
|||
if test "$enable_sqlite" = yes; then
|
||||
AC_MSG_RESULT([Using SQLite for the database, located at $dgl_sqlite_db])
|
||||
AC_DEFINE(USE_SQLITE3,1,[Use SQLite for the database instead of flat text file.])
|
||||
LIBS="$LIBS -lsqlite3"
|
||||
MY_LIBS="$MY_LIBS -lsqlite3"
|
||||
AC_DEFINE_UNQUOTED(USE_SQLITE_DB, "$dgl_sqlite_db", [Path and filename of the SQLite database.])
|
||||
fi
|
||||
|
||||
|
@ -158,7 +158,7 @@ if test "$enable_shmem" = yes; then
|
|||
AC_CHECK_HEADERS([sys/shm.h], [], [AC_MSG_ERROR([sys/shm.h not found.])], [])
|
||||
AC_MSG_RESULT([Enabled showing number of watchers.])
|
||||
AC_DEFINE(USE_SHMEM,1,[Use shared memory block])
|
||||
LIBS="$LIBS -lrt"
|
||||
MY_LIBS="$MY_LIBS -lrt"
|
||||
# or -pthread?
|
||||
fi
|
||||
|
||||
|
@ -184,8 +184,10 @@ else
|
|||
fi
|
||||
|
||||
|
||||
LIBS="$LIBS $MY_LIBS"
|
||||
|
||||
AC_SUBST(SETPROCTITLE_C)
|
||||
AC_SUBST(LEXLIBS)
|
||||
|
||||
AC_CONFIG_FILES(Makefile)
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -66,14 +66,14 @@
|
|||
# include <sqlite3.h>
|
||||
#endif
|
||||
|
||||
#ifndef __FreeBSD__
|
||||
# ifdef __APPLE__
|
||||
# include <unistd.h>
|
||||
# else
|
||||
# include <crypt.h>
|
||||
# endif
|
||||
#else
|
||||
#if defined(__FreeBSD__)
|
||||
# include <libutil.h>
|
||||
#elif defined(__NetBSD__)
|
||||
# include <util.h>
|
||||
#elif defined(__APPLE__)
|
||||
# include <unistd.h>
|
||||
#else
|
||||
# include <crypt.h>
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
|
|
Loading…
Reference in New Issue