Start fixing up the build system

This commit is contained in:
Matthew Brush 2013-03-04 01:57:54 -08:00
parent bd619f4226
commit 1a19591a67
7 changed files with 4876 additions and 1520 deletions

17
.gitignore vendored Normal file
View File

@ -0,0 +1,17 @@
# Built files
*.[ao]
*.so
*.lib
*.dll
*.dylib
# Autotools cruft
Makefile
Makefile.in
/INSTALL
/aclocal.m4
/autom4te.cache/
/configure
/depcomp
/install-sh
/missing

View File

@ -1,8 +1,8 @@
SUBDIRS = src examples doc SUBDIRS = src examples doc
if DEBUG if DEBUG
AM_CFLAGS = -Wall -W -Werror -DCFU_VERSION="\"@VERSION@\"" -DCFU_DEBUG=1 AM_CFLAGS = -DCFU_VERSION="\"@VERSION@\"" -DCFU_DEBUG=1
else else
AM_CFLAGS = -Wall -W -Werror -DCFU_VERSION="\"@VERSION@\"" AM_CFLAGS = -DCFU_VERSION="\"@VERSION@\""
endif endif
LIBCFU_TYPE_u_int=@LIBCFU_TYPE_u_int@ LIBCFU_TYPE_u_int=@LIBCFU_TYPE_u_int@

5
autogen.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
autoreconf -vfi || exit $?
echo "Now run the \`configure' script."

View File

@ -1,26 +1,26 @@
AC_INIT(libcfu, 0.03) AC_INIT(libcfu, 0.03)
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
# AC_CONFIG_HEADERS(config.h) # AC_CONFIG_HEADERS(config.h)
LIBCFU_CHECK_TYPE(u_int, unsigned int) #LIBCFU_CHECK_TYPE(u_int, unsigned int)
AC_SUBST(LIBCFU_TYPE_u_int) #AC_SUBST(LIBCFU_TYPE_u_int)
AC_PROG_CC AC_PROG_CC
AC_PROG_RANLIB AC_PROG_RANLIB
dnl Check for pthread support #dnl Check for pthread support
SAVECFLAGS="$CFLAGS" #SAVECFLAGS="$CFLAGS"
SAVELIBS="$LIBS" #SAVELIBS="$LIBS"
CFLAGS="-pthread $CFLAGS" #CFLAGS="-pthread $CFLAGS"
LIBS="-pthread $LIBS" #LIBS="-pthread $LIBS"
AC_CHECK_FUNC(pthread_mutex_init,, #AC_CHECK_FUNC(pthread_mutex_init,,
CFLAGS="$SAVECFLAGS" #CFLAGS="$SAVECFLAGS"
LIBS="$SAVELIBS" #LIBS="$SAVELIBS"
AC_CHECK_LIB(pthread, pthread_mutex_init,, #AC_CHECK_LIB(pthread, pthread_mutex_init,,
AC_CHECK_LIB(pthreads, pthread_mutex_init,, #AC_CHECK_LIB(pthreads, pthread_mutex_init,,
AC_MSG_ERROR([No pthreads support found.])))) #AC_MSG_ERROR([No pthreads support found.]))))
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC

View File

@ -1,6 +1,10 @@
#!/bin/sh #!/bin/sh
# Get modification time of a file or directory and pretty-print it. # Get modification time of a file or directory and pretty-print it.
# Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
scriptversion=2010-08-21.06; # UTC
# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010
# Free Software Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -14,14 +18,55 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation, # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
fi
case $1 in
'')
echo "$0: No file. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: mdate-sh [--help] [--version] FILE
Pretty-print the modification day of FILE, in the format:
1 January 1970
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "mdate-sh $scriptversion"
exit $?
;;
esac
error ()
{
echo "$0: $1" >&2
exit 1
}
# Prevent date giving response in another language. # Prevent date giving response in another language.
LANG=C LANG=C
export LANG export LANG
@ -30,7 +75,15 @@ export LC_ALL
LC_TIME=C LC_TIME=C
export LC_TIME export LC_TIME
save_arg1="$1" # GNU ls changes its time format in response to the TIME_STYLE
# variable. Since we cannot assume `unset' works, revert this
# variable to its documented default.
if test "${TIME_STYLE+set}" = set; then
TIME_STYLE=posix-long-iso
export TIME_STYLE
fi
save_arg1=$1
# Find out how to get the extended ls output of a file or directory. # Find out how to get the extended ls output of a file or directory.
if ls -L /dev/null 1>/dev/null 2>&1; then if ls -L /dev/null 1>/dev/null 2>&1; then
@ -38,6 +91,10 @@ if ls -L /dev/null 1>/dev/null 2>&1; then
else else
ls_command='ls -l -d' ls_command='ls -l -d'
fi fi
# Avoid user/group names that might have spaces, when possible.
if ls -n /dev/null 1>/dev/null 2>&1; then
ls_command="$ls_command -n"
fi
# A `ls -l' line looks as follows on OS/2. # A `ls -l' line looks as follows on OS/2.
# drwxrwx--- 0 Aug 11 2001 foo # drwxrwx--- 0 Aug 11 2001 foo
@ -52,13 +109,14 @@ fi
# words should be skipped to get the date. # words should be skipped to get the date.
# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. # On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
set - x`$ls_command /` set x`$ls_command /`
# Find which argument is the month. # Find which argument is the month.
month= month=
command= command=
until test $month until test $month
do do
test $# -gt 0 || error "failed parsing \`$ls_command /' output"
shift shift
# Add another shift to the command. # Add another shift to the command.
command="$command shift;" command="$command shift;"
@ -78,14 +136,35 @@ do
esac esac
done done
test -n "$month" || error "failed parsing \`$ls_command /' output"
# Get the extended ls output of the file or directory. # Get the extended ls output of the file or directory.
set - x`eval "$ls_command \"\$save_arg1\""` set dummy x`eval "$ls_command \"\\\$save_arg1\""`
# Remove all preceding arguments # Remove all preceding arguments
eval $command eval $command
# Get the month. Next argument is day, followed by the year or time. # Because of the dummy argument above, month is in $2.
case $1 in #
# On a POSIX system, we should have
#
# $# = 5
# $1 = file size
# $2 = month
# $3 = day
# $4 = year or time
# $5 = filename
#
# On Darwin 7.7.0 and 7.6.0, we have
#
# $# = 4
# $1 = day
# $2 = month
# $3 = year or time
# $4 = filename
# Get the month.
case $2 in
Jan) month=January; nummonth=1;; Jan) month=January; nummonth=1;;
Feb) month=February; nummonth=2;; Feb) month=February; nummonth=2;;
Mar) month=March; nummonth=3;; Mar) month=March; nummonth=3;;
@ -100,7 +179,10 @@ case $1 in
Dec) month=December; nummonth=12;; Dec) month=December; nummonth=12;;
esac esac
day=$2 case $3 in
???*) day=$1;;
*) day=$3; shift;;
esac
# Here we have to deal with the problem that the ls output gives either # Here we have to deal with the problem that the ls output gives either
# the time of day or the year. # the time of day or the year.
@ -131,3 +213,13 @@ esac
# The result. # The result.
echo $day $month $year echo $day $month $year
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

File diff suppressed because it is too large Load Diff

View File

@ -2,9 +2,9 @@ noinst_PROGRAMS = hash_usage large_hash strings conf_example conf_example2 opt_e
LDADD = -L$(top_srcdir)/src -lcfu LDADD = -L$(top_srcdir)/src -lcfu
if DEBUG if DEBUG
AM_CFLAGS = -Wall -W -Werror -I$(top_srcdir)/include -DCFU_DEBUG=1 AM_CFLAGS = -I$(top_srcdir)/include -DCFU_DEBUG=1
else else
AM_CFLAGS = -Wall -W -Werror -I$(top_srcdir)/include AM_CFLAGS = -I$(top_srcdir)/include
endif endif
AM_LDFLAGS = -Xlinker -rpath -Xlinker $(top_src_dir)/src AM_LDFLAGS = -Xlinker -rpath -Xlinker $(top_src_dir)/src