Skip to content

Commit

Permalink
[build] some configure fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tstack committed Jun 10, 2013
1 parent 988fe18 commit 9420662
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 8 deletions.
14 changes: 11 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3037,14 +3037,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
for defdir in /usr/local /opt/local; do
if test -d "$defdir/include"; then
CPPFLAGS="$CPPFLAGS -I$defdir/include"
CPPFLAGS="$CPPFLAGS -I$defdir/include"
fi
if test -d "$defdir/lib"; then
LDFLAGS="$LDFLAGS -L$defdir/lib"
LDFLAGS="$LDFLAGS -L$defdir/lib"
fi
if test -d "$defdir/lib64"; then
LDFLAGS="$LDFLAGS -L$defdir/lib64"
LDFLAGS="$LDFLAGS -L$defdir/lib64"
fi
done
Expand Down Expand Up @@ -3988,6 +3988,10 @@ fi
if test x"$SQLITE3_CMD" = x""; then
as_fn_error $? "The sqlite3 command is required" "$LINENO" 5
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Expand Down Expand Up @@ -6644,6 +6648,10 @@ $as_echo "#define HAVE_SQLITE3 /**/" >>confdefs.h
if test x"$SQLITE3_LIBS" = x""; then
as_fn_error $? "The sqlite3 developement package must be installed." "$LINENO" 5
fi
case "$host_os" in
*)
# AC_DEFINE([_XOPEN_SOURCE], [500], [Need pread])
Expand Down
14 changes: 11 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ AC_CANONICAL_HOST

for defdir in /usr/local /opt/local; do
if test -d "$defdir/include"; then
CPPFLAGS="$CPPFLAGS -I$defdir/include"
CPPFLAGS="$CPPFLAGS -I$defdir/include"
fi

if test -d "$defdir/lib"; then
LDFLAGS="$LDFLAGS -L$defdir/lib"
LDFLAGS="$LDFLAGS -L$defdir/lib"
fi
if test -d "$defdir/lib64"; then
LDFLAGS="$LDFLAGS -L$defdir/lib64"
LDFLAGS="$LDFLAGS -L$defdir/lib64"
fi
done

Expand Down Expand Up @@ -90,6 +90,10 @@ AC_PROG_MAKE_SET

AC_PATH_PROG(SQLITE3_CMD, [sqlite3])

if test x"$SQLITE3_CMD" = x""; then
AC_MSG_ERROR([The sqlite3 command is required])
fi

AC_CHECK_SIZEOF(off_t)
AC_CHECK_SIZEOF(size_t)

Expand All @@ -110,6 +114,10 @@ AX_PATH_LIB_READLINE([], [AC_MSG_ERROR([readline required to build])])

AX_LIB_SQLITE3("3.0.0")

if test x"$SQLITE3_LIBS" = x""; then
AC_MSG_ERROR([The sqlite3 developement package must be installed.])
fi

case "$host_os" in
*)
# AC_DEFINE([_XOPEN_SOURCE], [500], [Need pread])
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ uninstall-am: uninstall-binPROGRAMS


help.c: help.txt bin2c
./bin2c -z -c $< $@
./bin2c -z -c $(srcdir)/help.txt $@

uncrusty:
(cd $(srcdir) && uncrustify -c ../lnav.cfg --replace $(SOURCES) \
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1572,7 +1572,7 @@ uninstall-am:

simple-db.db: simple-db.sql
rm -f $@
$(SQLITE3_CMD) $@ < $<
$(SQLITE3_CMD) $@ < $(srcdir)/simple-db.sql

# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Expand Down

0 comments on commit 9420662

Please sign in to comment.