lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-05-07 07:37:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update some autotools macros

Browse Source
This commit is contained in:
whydoubt 2005-03-29 03:40:48 +00:00
parent d1a6f47bfb
commit f1856c82f5
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
Mon Mar 28 21:31:36 CST 2005 Jeff Smith <whydoubt@yahoo.com> Mon Mar 28 21:31:36 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* acinclude.m4: * acinclude.m4:
* src/util/Makefile.am: Only mdb-sql depends on readline * src/util/Makefile.am: Only mdb-sql depends on readline
* autogen.sh:
* configure.in: Update some autotools macros
Sun Mar 27 21:32:00 CST 2005 Jeff Smith <whydoubt@yahoo.com> Sun Mar 27 21:32:00 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/file.c: Fix segfault on file-not-found * src/libmdb/file.c: Fix segfault on file-not-found

6
autogen.sh
View File

@ -18,7 +18,7 @@ DIE=0
DIE=1 DIE=1
} }
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { (grep "^A[CM]_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
(libtool --version) < /dev/null > /dev/null 2>&1 || { (libtool --version) < /dev/null > /dev/null 2>&1 || {
echo echo
echo "**Error**: You must have \`libtool' installed." echo "**Error**: You must have \`libtool' installed."
@ -123,13 +123,13 @@ do
echo "Making $dr/aclocal.m4 writable ..." echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi fi
if grep "^AC_PROG_LIBTOOL" configure.in >/dev/null; then if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
echo "Running libtoolize..." echo "Running libtoolize..."
libtoolize --force --copy libtoolize --force --copy
fi fi
echo "Running aclocal $aclocalinclude ..." echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude aclocal $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..." echo "Running autoheader..."
autoheader autoheader
fi fi

9
configure.in
View File

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/extras/mdb-dump.c) AC_INIT(src/extras/mdb-dump.c)
AM_INIT_AUTOMAKE(mdbtools,0.6pre1) AM_INIT_AUTOMAKE(mdbtools,0.6pre1)
AM_CONFIG_HEADER(include/config.h) AC_CONFIG_HEADERS(include/config.h)
AC_PROG_CC(gcc) AC_PROG_CC(gcc)
dnl Checks for programs. dnl Checks for programs.
@ -161,16 +161,9 @@ fi
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
dnl Checks for library functions. dnl Checks for library functions.
OLDLDFLAGS=$LDFLAGS
VL_LIB_READLINE VL_LIB_READLINE
LDFLAGS=$OLDLDFLAGS
localedir=${datadir}/locale localedir=${datadir}/locale
AC_SUBST(localedir) AC_SUBST(localedir)