Permalink
Browse files

various build fixes

  • Loading branch information...
1 parent 099243b commit 571e85c65fef9d8cf0d1ae1881018529483e3ad9 @tony2001 committed Aug 12, 2013
Showing with 13 additions and 6 deletions.
  1. +2 −0 Makefile.am
  2. +9 −5 bootstrap
  3. +2 −1 configure.ac
View
@@ -2,6 +2,8 @@
# GNU Maintainer's Manual.
AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+
# We need to build the following subdirectories in this order. Note that
# we put a Makefile.am in every subdirectory, even if there's nothing to
# compile, so that we can support 'make dist' gracefully.
View
@@ -1,14 +1,18 @@
#! /bin/sh
set -x
-libtoolize --force --copy
-#aclocal-1.9
+which glibtoolize 2>&1 >/dev/null
+if [ $? -eq 0 ]; then
+ LIBTOOLIZE="glibtoolize"
+else
+ LIBTOOLIZE="libtoolize"
+fi
+
+$LIBTOOLIZE --force --copy
aclocal
-#autoheader2.50
autoheader
#add --include-deps if you want to bootstrap with any other compiler than gcc
-#automake --add-missing --copy --include-deps
+#automake --add-missing --force --copy --include-deps
automake --add-missing --force --copy
-#autoconf2.50
autoconf
rm -f config.cache
View
@@ -1,5 +1,6 @@
AC_PREREQ(2.57)
AC_INIT(Judy, 1.0.5, dougbaskins@yahoo.com)
+AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
@@ -241,7 +242,7 @@ WARN_CFLAGS=""
build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
AC_ARG_ENABLE([build-warnings],
[ --enable-build-warnings Enable build-time compiler warnings for gcc])
-if test x"$build_warnings" = xyes; then
+if test x"$enableval" = xyes; then
if test x"$GCC" = xyes; then
WARN_CFLAGS="${build_warnings}"
fi

0 comments on commit 571e85c

Please sign in to comment.