Attachment #403570 for bug #531268

Lines 10-15 SUBDIRS = libdieharder dieharder include Link Here

(-)a/Makefile.am (+2 lines)
10	# THANKS BUGS SUPPORT dieharder.spec.in dieharder.m4 test_dieharder.sh	10	# THANKS BUGS SUPPORT dieharder.spec.in dieharder.m4 test_dieharder.sh
11	EXTRA_DIST = autogen.sh set_ld_library_path Copyright	11	EXTRA_DIST = autogen.sh set_ld_library_path Copyright
12		12
		13	ACLOCAL_AMFLAGS = -I m4
		14
13	#========================================================================	15	#========================================================================
14	# This is the toplevel Makefile for the dieharder project. It has	16	# This is the toplevel Makefile for the dieharder project. It has
15	# some specialized targets:	17	# some specialized targets:




# Check for which system.
#==================================================================
AC_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE

#==================================================================
# Checks for programs.

AC_PROG_MAKE_SET

#==================================================================
# OK, these five macros prevent my personal path from appearing
# in the default Makefile, and actually should make it work to
# rebuilt itself even if somebody completely blows off running
# ./autogen.sh.  And it ALMOST WORKS
#==================================================================
ACLOCAL="${SHELL} ./missing --run aclocal"
ACTAR="${SHELL} ./missing --run tar"
AUTOCONF="${SHELL} ./missing --run autoconf;echo \"Run ./configure\";exit"
AUTOHEADER="${SHELL} ./missing --run autoheader"
AUTOMAKE="${SHELL} ./missing --run automake --add-missing --copy --gnu"

AC_SUBST(ACLOCAL)
AC_SUBST(ACTAR)
AC_SUBST(AUTOCONF)
AC_SUBST(AUTOHEADER)
AC_SUBST(AUTOMAKE)

#==================================================================
# Disable unnecessary libtool tests for c++,fortran,java
#==================================================================
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])
AC_PROG_LIBTOOL

#==================================================================

AC_C_INLINE

DIEHARDER_CFLAGS="-I$includedir"
dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir"
libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir"
DIEHARDER_LIBS="-L$libdir -ldieharder"
CFLAGS="-I${CFLAGS} -include config.h"

AC_SUBST(DIEHARDER_CFLAGS)
AC_SUBST(dieharder_CFLAGS)
AC_SUBST(libdieharder_lo_CFLAGS)
AC_SUBST(DIEHARDER_LIBS)
AC_SUBST(ACLOCAL_AMFLAGS)

#==================================================================
# Checks for libraries, and headers.  Test for dependency libraries





#include "copyright.h"

/* To enable large file support */
#define _FILE_OFFSET_BITS 64

#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <sys/time.h>

/* This turns on uint macro in c99 */
#define __USE_MISC 1
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

/* This turns on M_PI in math.h */
#define __USE_BSD 1
#include <math.h>
#include <limits.h>
#include <gsl/gsl_rng.h>
- 

Return to bug 531268

Lines 52-57 AC_SUBST(RELEASED) Link Here

(-)a/configure.ac (-25 / +3 lines)
52	# Check for which system.	52	# Check for which system.
53	#==================================================================	53	#==================================================================
54	AC_CANONICAL_HOST	54	AC_CANONICAL_HOST
		55	AC_USE_SYSTEM_EXTENSIONS
		56	AC_SYS_LARGEFILE
55		57
56	#==================================================================	58	#==================================================================
57	# Checks for programs.	59	# Checks for programs.
Lines 63-91 AC_PROG_INSTALL Link Here
63	AC_PROG_MAKE_SET	65	AC_PROG_MAKE_SET
64		66
65	#==================================================================	67	#==================================================================
66	# OK, these five macros prevent my personal path from appearing
67	# in the default Makefile, and actually should make it work to
68	# rebuilt itself even if somebody completely blows off running
69	# ./autogen.sh. And it ALMOST WORKS
70	#==================================================================
71	ACLOCAL="${SHELL} ./missing --run aclocal"
72	ACTAR="${SHELL} ./missing --run tar"
73	AUTOCONF="${SHELL} ./missing --run autoconf;echo \"Run ./configure\";exit"
74	AUTOHEADER="${SHELL} ./missing --run autoheader"
75	AUTOMAKE="${SHELL} ./missing --run automake --add-missing --copy --gnu"
76
77	AC_SUBST(ACLOCAL)
78	AC_SUBST(ACTAR)
79	AC_SUBST(AUTOCONF)
80	AC_SUBST(AUTOHEADER)
81	AC_SUBST(AUTOMAKE)
82
83	#==================================================================
84	# Disable unnecessary libtool tests for c++,fortran,java	68	# Disable unnecessary libtool tests for c++,fortran,java
85	#==================================================================	69	#==================================================================
86	define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
87	define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
88	define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])
89	AC_PROG_LIBTOOL	70	AC_PROG_LIBTOOL
90		71
91	#==================================================================	72	#==================================================================
Lines 97-112 AC_C_VOLATILE Link Here
97	AC_C_INLINE	78	AC_C_INLINE
98		79
99	DIEHARDER_CFLAGS="-I$includedir"	80	DIEHARDER_CFLAGS="-I$includedir"
100	dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir"
101	libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir"
102	DIEHARDER_LIBS="-L$libdir -ldieharder"	81	DIEHARDER_LIBS="-L$libdir -ldieharder"
103	ACLOCAL_AMFLAGS="-I m4"	82	CFLAGS="-I${CFLAGS} -include config.h"
104		83
105	AC_SUBST(DIEHARDER_CFLAGS)	84	AC_SUBST(DIEHARDER_CFLAGS)
106	AC_SUBST(dieharder_CFLAGS)	85	AC_SUBST(dieharder_CFLAGS)
107	AC_SUBST(libdieharder_lo_CFLAGS)	86	AC_SUBST(libdieharder_lo_CFLAGS)
108	AC_SUBST(DIEHARDER_LIBS)	87	AC_SUBST(DIEHARDER_LIBS)
109	AC_SUBST(ACLOCAL_AMFLAGS)
110		88
111	#==================================================================	89	#==================================================================
112	# Checks for libraries, and headers. Test for dependency libraries	90	# Checks for libraries, and headers. Test for dependency libraries

Lines 6-28 Link Here

(-)a/include/dieharder/libdieharder.h (-8 lines)
6		6
7	#include "copyright.h"	7	#include "copyright.h"
8		8
9	/* To enable large file support */
10	#define _FILE_OFFSET_BITS 64
11
12	#include <stdio.h>	9	#include <stdio.h>
13	#include <stdlib.h>	10	#include <stdlib.h>
14	#include <stdarg.h>	11	#include <stdarg.h>
15	#include <string.h>	12	#include <string.h>
16	#include <sys/time.h>	13	#include <sys/time.h>
17		14
18	/* This turns on uint macro in c99 */
19	#define __USE_MISC 1
20	#include <sys/types.h>	15	#include <sys/types.h>
21	#include <sys/stat.h>	16	#include <sys/stat.h>
22	#include <unistd.h>	17	#include <unistd.h>
23		18
24	/* This turns on M_PI in math.h */
25	#define __USE_BSD 1
26	#include <math.h>	19	#include <math.h>
27	#include <limits.h>	20	#include <limits.h>
28	#include <gsl/gsl_rng.h>	21	#include <gsl/gsl_rng.h>
29	-