Re-Added the getopt.c and getopt1.c to the build process
httperf now compiles on Linux, OpenBSD, FreeBSD, Solaris (with cc and gcc) and HP-UX 11i (with cc and gcc)
This commit is contained in:
parent
5fd630229b
commit
0b1310494b
@ -1,3 +1,9 @@
|
|||||||
|
2007-01-26 Ted Bullock <tbullock@canada.com>
|
||||||
|
|
||||||
|
* Re-Added the getopt.c and getopt1.c to the build process
|
||||||
|
httperf now compiles on Linux, OpenBSD, FreeBSD, Solaris
|
||||||
|
(with cc and gcc) and HP-UX 11i (with cc and gcc)
|
||||||
|
|
||||||
2007-01-26 Ted Bullock <tbullock@canada.com>
|
2007-01-26 Ted Bullock <tbullock@canada.com>
|
||||||
|
|
||||||
* Revised Makefile.am for src directories to explicitly include the
|
* Revised Makefile.am for src directories to explicitly include the
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_PREREQ(2.60)
|
AC_PREREQ(2.60)
|
||||||
AC_INIT(httperf, 0.9, httperf@linux.hpl.hp.com)
|
AC_INIT(httperf, 0.9.0, httperf@linux.hpl.hp.com)
|
||||||
AC_CONFIG_SRCDIR([src/httperf.c])
|
AC_CONFIG_SRCDIR([src/httperf.c])
|
||||||
AC_CONFIG_HEADER([config.h])
|
AC_CONFIG_HEADER([config.h])
|
||||||
|
|
||||||
@ -19,13 +19,14 @@ if test "$enable_debug" = yes; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Checks for programs.
|
# Checks for programs.
|
||||||
AC_PROG_CC
|
|
||||||
AC_GNU_SOURCE
|
AC_GNU_SOURCE
|
||||||
|
AC_PROG_CC([cc gcc])
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
AC_PROG_GCC_TRADITIONAL
|
AC_PROG_GCC_TRADITIONAL
|
||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
|
AC_CHECK_LIB(m, sqrt)
|
||||||
AC_CHECK_LIB(crypto, main)
|
AC_CHECK_LIB(crypto, main)
|
||||||
AC_CHECK_LIB(ssl, SSL_version)
|
AC_CHECK_LIB(ssl, SSL_version)
|
||||||
# The following checks are for solaris and its ilk
|
# The following checks are for solaris and its ilk
|
||||||
@ -71,6 +72,6 @@ AC_FUNC_SELECT_ARGTYPES
|
|||||||
AC_TYPE_SIGNAL
|
AC_TYPE_SIGNAL
|
||||||
AC_FUNC_STRTOD
|
AC_FUNC_STRTOD
|
||||||
AC_FUNC_VPRINTF
|
AC_FUNC_VPRINTF
|
||||||
AC_CHECK_FUNCS([gethostbyname gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol strtoul inet_aton])
|
AC_CHECK_FUNCS([gethostbyname gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol strtoul inet_aton getopt_long])
|
||||||
|
|
||||||
AC_OUTPUT(Makefile man/Makefile src/stat/Makefile src/lib/Makefile src/gen/Makefile src/Makefile)
|
AC_OUTPUT(Makefile man/Makefile src/stat/Makefile src/lib/Makefile src/gen/Makefile src/Makefile)
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
SUBDIRS = gen lib stat
|
SUBDIRS = gen lib stat
|
||||||
|
|
||||||
# what flags you want to pass to the C compiler & linker
|
# what flags you want to pass to the C compiler & linker
|
||||||
AM_CFLAGS = -Wall -I$(srcdir)/{gen,lib,stat}/ -I.
|
AM_CFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat
|
||||||
AM_LDFLAGS = -lm
|
|
||||||
|
|
||||||
bin_PROGRAMS = httperf idleconn
|
bin_PROGRAMS = httperf idleconn
|
||||||
httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \
|
httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# what flags you want to pass to the C compiler & linker
|
# what flags you want to pass to the C compiler & linker
|
||||||
AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../../ -I.. -I$(srcdir)
|
AM_CFLAGS = -I$(srcdir)/..
|
||||||
AM_LDFLAGS =
|
AM_LDFLAGS =
|
||||||
|
|
||||||
noinst_LIBRARIES = libgen.a
|
noinst_LIBRARIES = libgen.a
|
||||||
|
@ -61,9 +61,7 @@
|
|||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#ifdef HAVE_GETOPT_H
|
#include <getopt.h>
|
||||||
#include <getopt.h>
|
|
||||||
#endif
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
# what flags you want to pass to the C compiler & linker
|
# what flags you want to pass to the C compiler & linker
|
||||||
AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../../
|
|
||||||
AM_LDFLAGS =
|
AM_LDFLAGS =
|
||||||
|
|
||||||
noinst_LIBRARIES = libutil.a
|
noinst_LIBRARIES = libutil.a
|
||||||
libutil_a_SOURCES = ssl_writev.c
|
libutil_a_SOURCES = getopt.c getopt.h getopt1.c ssl_writev.c
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
# what flags you want to pass to the C compiler & linker
|
# what flags you want to pass to the C compiler & linker
|
||||||
AM_CFLAGS = -Wall -O2 -I$(srcdir)/../ -I$(srcdir)/../gen/ -I$(srcdir)/../../
|
AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gen
|
||||||
AM_LDFLAGS =
|
|
||||||
|
|
||||||
noinst_LIBRARIES = libstat.a
|
noinst_LIBRARIES = libstat.a
|
||||||
libstat_a_SOURCES = basic.c sess_stat.c print_reply.c stats.h
|
libstat_a_SOURCES = basic.c sess_stat.c print_reply.c stats.h
|
||||||
|
Loading…
Reference in New Issue
Block a user