Attachment #165770 for bug #237675




   if test -f "$dir/include/ipp.h"; then
     found_ipp="yes";
     IPPDIR="${ippdir}"
     IPP_CFLAGS="-I$ippdir/include -I$ippdir/tools/staticlib"
     CXXFLAGS="$CXXFLAGS -I$ippdir/include -I$ippdir/tools/staticlib";
     break;
   fi
   if test -f "$dir/include/ipp.h"; then
     found_ipp="yes";
     IPPDIR="${ippdir}"
     IPP_CFLAGS="-I$ippdir/include/"
     CXXFLAGS="$CXXFLAGS -I$ippdir/include/";
     break
   fi
done
AC_SUBST([IPP_CFLAGS])
AC_MSG_RESULT($found_ipp)
if test x_$found_ipp = x_yes ; then
        printf "IPP found in $ippdir\n";




   if test -f "$dir/include/openssl/ssl.h"; then
     found_ssl="yes";
     SSLDIR="${ssldir}"
     SSL_CFLAGS="-I$ssldir/include -I$ssldir/include/openssl"
     CXXFLAGS="$CXXFLAGS -I$ssldir/include -I$ssldir/include/openssl";
     break;
   fi
   if test -f "$dir/include/ssl.h"; then
     found_ssl="yes";
     SSLDIR="${ssldir}"
     SSL_CFLAGS="-I$ssldir/include/"
     CXXFLAGS="$CXXFLAGS -I$ssldir/include/";
     break
   fi
done
AC_SUBST([SSL_CFLAGS])
AC_MSG_RESULT($found_ssl)
if test x_$found_ssl != x_yes; then
   AC_MSG_ERROR([

Lines 185-192 Link Here

(-)configure.ac.orig (-2 / +2 lines)
185		185
186	# Check libraries required or desired for seti_boinc app	186	# Check libraries required or desired for seti_boinc app
187	# Checks for libraries.	187	# Checks for libraries.
188	APP_LDFLAGS="$LDSTATIC -L/usr/local/lib $LDFLAGS"	188	APP_LDFLAGS="$LDSTATIC -L/usr/local/lib"
189	APP_CFLAGS="-I/usr/local/include $CFLAGS"	189	APP_CFLAGS="-I/usr/local/include"
190	AC_CHECK_LIB([m], [sin],[	190	AC_CHECK_LIB([m], [sin],[
191	AC_DEFINE([HAVE_LIBM],[1],[Define to 1 if you have the math library])	191	AC_DEFINE([HAVE_LIBM],[1],[Define to 1 if you have the math library])
192	APP_LIBS="-lm ${APP_LIBS}"	192	APP_LIBS="-lm ${APP_LIBS}"

Lines 42-49 Link Here

(-)Makefile.incl.orig (-1 / +7 lines)
42	VERSION_MAJOR = @MAJOR_VERSION@	42	VERSION_MAJOR = @MAJOR_VERSION@
43	VERSION_MINOR = @MINOR_VERSION@	43	VERSION_MINOR = @MINOR_VERSION@
44		44
45	BOINC_CFLAGS= @BOINC_CFLAGS@	45	OPT_CFLAGS = @OPT_CFLAGS@
		46	OPT_LDFLAGS = @OPT_LDFLAGS@
46		47
		48	IPP_CFLAGS = @IPP_CFLAGS@
		49
		50	SSL_CFLAGS = @SSL_CFLAGS@
		51
		52	BOINC_CFLAGS = @BOINC_CFLAGS@
47	BOINC_PLATFORM = @boinc_platform@	53	BOINC_PLATFORM = @boinc_platform@
48		54
49	LDSTATIC = @LDSTATIC@	55	LDSTATIC = @LDSTATIC@

Lines 1-7 Link Here

(-)assimilator/Makefile.am.orig (-3 / +3 lines)
1	## $Id: Makefile.am,v 1.2.2.6 2007/08/09 23:37:34 jeffc Exp $	1	## $Id: Makefile.am,v 1.2.2.6 2007/08/09 23:37:34 jeffc Exp $
2	include $(top_srcdir)/Makefile.incl	2	include $(top_srcdir)/Makefile.incl
3		3
4	AM_CFLAGS = @CFLAGS@ @DEFS@ -DTEXT_UI -DNDEBUG @PTHREAD_CFLAGS@	4	AM_CFLAGS = @DEFS@ -DTEXT_UI -DNDEBUG @PTHREAD_CFLAGS@
5	AM_CXXFLAGS = $(AM_CFLAGS)	5	AM_CXXFLAGS = $(AM_CFLAGS)
6		6
7	AM_LDFLAGS += -Xlinker -R -Xlinker $(INFORMIXDIR)/lib:$(INFORMIXDIR)/lib/esql:$(LD_LIBRARY_PATH) @LDFLAGS@	7	AM_LDFLAGS += -Xlinker -R -Xlinker $(INFORMIXDIR)/lib:$(INFORMIXDIR)/lib/esql:$(LD_LIBRARY_PATH) @LDFLAGS@
Lines 29-35 Link Here
29	../db/xml_util.cpp \	29	../db/xml_util.cpp \
30	../db/app_config.cpp	30	../db/app_config.cpp
31		31
32	sah_assimilator_CFLAGS = $(AM_CFLAGS) $(BOINC_INC) $(HEALPIX_INC) $(SETILIB_INC) $(MYSQL_CFLAGS) $(INFORMIX_CFLAGS) -I.. -I../db $(PTHREAD_CFLAGS) -I../client -I../validate	32	sah_assimilator_CFLAGS = $(BOINC_INC) $(SETILIB_INC) $(HEALPIX_INC) $(MYSQL_CFLAGS) $(INFORMIX_CFLAGS) -I.. -I../db $(PTHREAD_CFLAGS) -I../client -I../validate
33	sah_assimilator_CXXFLAGS = $(AM_CXXFLAGS) $(BOINC_INC) $(SETILIB_INC) $(HEALPIX_INC) $(MYSQL_CFLAGS) $(INFORMIX_CFLAGS) -I.. -I../db $(PTHREAD_CFLAGS) -I../client -I../validate	33	sah_assimilator_CXXFLAGS = $(BOINC_INC) $(SETILIB_INC) $(HEALPIX_INC) $(MYSQL_CFLAGS) $(INFORMIX_CFLAGS) -I.. -I../db $(PTHREAD_CFLAGS) -I../client -I../validate
34	sah_assimilator_LDADD = $(PTHREAD_CFLAGS) $(BOINC_LIBS) $(SETILIB_LIBS) $(MYSQL_LIBS) $(INFORMIX_LIBS) $(CLIBS) $(HEALPIX_LIBS)	34	sah_assimilator_LDADD = $(PTHREAD_CFLAGS) $(BOINC_LIBS) $(SETILIB_LIBS) $(MYSQL_LIBS) $(INFORMIX_LIBS) $(CLIBS) $(HEALPIX_LIBS)
35		35





include $(top_srcdir)/Makefile.incl

AM_CPPFLAGS = @PICFLAGS@ @DEFS@

BOINC_LIBS = -L/usr/lib -L$(BOINCDIR)/api -L$(BOINCDIR)/api/.libs -lboinc_api -L$(BOINCDIR)/lib -L$(BOINCDIR)/lib/.libs -lboinc 

CLIENT_C_FLAGS = $(DEFS) \
                $(DEFS) \
		-DTEXT_UI -DNDEBUG -DCLIENT \
		-I$(top_srcdir)/db  \
		$(BOINC_CFLAGS)  \
		$(PTHREAD_CFLAGS)  \
		$(ASMLIB_CFLAGS) \
		$(IPP_CFLAGS) \
		$(APP_CFLAGS) \
		$(OPT_CFLAGS)
CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(APP_LDFLAGS)
CLIENT_LD_ADD = $(PTHREAD_LIBS) $(BOINC_LIBS) $(APP_LIBS) $(OPT_LDFLAGS)

	


noinst_PROGRAMS = seti_boinc hires_timer_test

hires_timer_test_SOURCES= vector/hires_timer.cpp
hires_timer_test_CXXFLAGS=-DTEST_TIMER $(CLIENT_C_FLAGS)
hires_timer_test_LDFLAGS=$(CLIENT_LD_FLAGS)
hires_timer_test_LDADD=$(CLIENT_LD_ADD)


if LINUX
# too much optimization on main.cpp breaks the client for some reason
seti_boinc-main.o: main.cpp
	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -O2 $(CXXFLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
endif



    graphics_main.cpp \
    sah_version.cpp 

seti_graphics_CFLAGS = $(GUI_C_FLAGS)
seti_graphics_CXXFLAGS = $(GUI_C_FLAGS)
seti_graphics_LDFLAGS = $(GUI_LD_FLAGS)


Lines 1-8 Link Here

(-)jpeglib/Makefile.am.orig (-1 / +3 lines)
1	include $(top_srcdir)/Makefile.incl	1	include $(top_srcdir)/Makefile.incl
2		2
		3	AM_CFLAGS = @PICFLAGS@ @DEFS@
		4
3	lib_LIBRARIES=libjpeg.a	5	lib_LIBRARIES=libjpeg.a
4		6
5	libjpeg_a_CFLAGS = $(CFLAGS) $(DEFS) -DCLIENT $(BOINC_CFLAGS) $(PTHREAD_CFLAGS)	7	libjpeg_a_CFLAGS = $(DEFS) -DCLIENT $(BOINC_CFLAGS) $(PTHREAD_CFLAGS)
6		8
7	libjpeg_a_SOURCES=jcapimin.c \	9	libjpeg_a_SOURCES=jcapimin.c \
8	jcapistd.c \	10	jcapistd.c \

Lines 15-21 Link Here

(-)splitter/Makefile.am.orig (-2 / +1 lines)
15	LINKOPTIONS=-Xlinker -R -Xlinker $(INFORMIXDIR)/lib:$(INFORMIXDIR)/lib/esql:$(LD_LIBRARY_PATH)	15	LINKOPTIONS=-Xlinker -R -Xlinker $(INFORMIXDIR)/lib:$(INFORMIXDIR)/lib/esql:$(LD_LIBRARY_PATH)
16		16
17		17
18	AM_CFLAGS= -g -Wall $(INCLUDE_DIRS) -DUSE_INFORMIX @PTHREAD_CFLAGS@ -ISETILIB_PATH/include	18	AM_CPPFLAGS= -g -Wall $(INCLUDE_DIRS) -DUSE_INFORMIX @PTHREAD_CFLAGS@ -ISETILIB_PATH/include
19		19
20		20
21	SYSLIBS = -lcrypto -ldl	21	SYSLIBS = -lcrypto -ldl
Lines 55-61 Link Here
55	@MYSQL_CFLAGS@ -I$(HEALPIX)/include \	55	@MYSQL_CFLAGS@ -I$(HEALPIX)/include \
56	@INFORMIX_CFLAGS@ @SETILIB_CFLAGS@ \	56	@INFORMIX_CFLAGS@ @SETILIB_CFLAGS@ \
57	@BOINC_CFLAGS@ -I$(BOINCDIR)/tools -I$(BOINCDIR)/sched -I$(BOINCDIR)/db	57	@BOINC_CFLAGS@ -I$(BOINCDIR)/tools -I$(BOINCDIR)/sched -I$(BOINCDIR)/db
58	mb_splitter_CFLAGS=$(mb_splitter_CXXFLAGS)
59	mb_splitter_LDFLAGS=-static $(AM_LDFLAGS) -L$(HEALPIX)/lib $(LINKOPTIONS)	58	mb_splitter_LDFLAGS=-static $(AM_LDFLAGS) -L$(HEALPIX)/lib $(LINKOPTIONS)
60	mb_splitter_LDADD=$(SPLITLIBS)	59	mb_splitter_LDADD=$(SPLITLIBS)
61		60





include $(top_srcdir)/Makefile.incl

AM_CPPFLAGS = @PICFLAGS@ @DEFS@
LDFLAGS=
AM_LDFLAGS=

BOINC_LIBS = -L/usr/lib -L$(BOINCDIR)/api -lboinc_api -L$(BOINCDIR)/lib -lboinc 

CLIENT_C_FLAGS = $(DEFS) \
                $(DEFS) \
		-DTEXT_UI -DNDEBUG -DCLIENT \
		-include $(top_builddir)/sah_config.h \
		-I$(top_srcdir)/db  \

		$(BOINC_CFLAGS)  \
		$(PTHREAD_CFLAGS) 

CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(BOINC_LIBS) 

noinst_PROGRAMS = fakedata 


    ../db/sqlblob.cpp \
    ../db/xml_util.cpp 

fakedata_CFLAGS = $(CLIENT_C_FLAGS)
fakedata_CXXFLAGS = $(CLIENT_C_FLAGS)
fakedata_LDFLAGS = $(CLIENT_LD_FLAGS) 


Return to bug 237675

Lines 15-32 Link Here

(-)m4/sah_check_ipp.m4.orig (-4 / +3 lines)
15	if test -f "$dir/include/ipp.h"; then	15	if test -f "$dir/include/ipp.h"; then
16	found_ipp="yes";	16	found_ipp="yes";
17	IPPDIR="${ippdir}"	17	IPPDIR="${ippdir}"
18	CFLAGS="$CFLAGS -I$ippdir/include -I$ippdir/tools/staticlib";	18	IPP_CFLAGS="-I$ippdir/include -I$ippdir/tools/staticlib"
19	CXXFLAGS="$CXXFLAGS -I$ippdir/include -I$ippdir/tools/staticlib";
20	break;	19	break;
21	fi	20	fi
22	if test -f "$dir/include/ipp.h"; then	21	if test -f "$dir/include/ipp.h"; then
23	found_ipp="yes";	22	found_ipp="yes";
24	IPPDIR="${ippdir}"	23	IPPDIR="${ippdir}"
25	CFLAGS="$CFLAGS -I$ippdir/include/";	24	IPP_CFLAGS="-I$ippdir/include/"
26	CXXFLAGS="$CXXFLAGS -I$ippdir/include/";
27	break	25	break
28	fi	26	fi
29	done	27	done
		28	AC_SUBST([IPP_CFLAGS])
30	AC_MSG_RESULT($found_ipp)	29	AC_MSG_RESULT($found_ipp)
31	if test x_$found_ipp = x_yes ; then	30	if test x_$found_ipp = x_yes ; then
32	printf "IPP found in $ippdir\n";	31	printf "IPP found in $ippdir\n";

Lines 12-29 Link Here

(-)m4/check_ssl.m4.orig (-4 / +3 lines)
12	if test -f "$dir/include/openssl/ssl.h"; then	12	if test -f "$dir/include/openssl/ssl.h"; then
13	found_ssl="yes";	13	found_ssl="yes";
14	SSLDIR="${ssldir}"	14	SSLDIR="${ssldir}"
15	CFLAGS="$CFLAGS -I$ssldir/include -I$ssldir/include/openssl";	15	SSL_CFLAGS="-I$ssldir/include -I$ssldir/include/openssl"
16	CXXFLAGS="$CXXFLAGS -I$ssldir/include -I$ssldir/include/openssl";
17	break;	16	break;
18	fi	17	fi
19	if test -f "$dir/include/ssl.h"; then	18	if test -f "$dir/include/ssl.h"; then
20	found_ssl="yes";	19	found_ssl="yes";
21	SSLDIR="${ssldir}"	20	SSLDIR="${ssldir}"
22	CFLAGS="$CFLAGS -I$ssldir/include/";	21	SSL_CFLAGS="-I$ssldir/include/"
23	CXXFLAGS="$CXXFLAGS -I$ssldir/include/";
24	break	22	break
25	fi	23	fi
26	done	24	done
		25	AC_SUBST([SSL_CFLAGS])
27	AC_MSG_RESULT($found_ssl)	26	AC_MSG_RESULT($found_ssl)
28	if test x_$found_ssl != x_yes; then	27	if test x_$found_ssl != x_yes; then
29	AC_MSG_ERROR([	28	AC_MSG_ERROR([

Lines 2-19 Link Here

(-)client/Makefile.am.orig (-8 / +10 lines)
2		2
3	include $(top_srcdir)/Makefile.incl	3	include $(top_srcdir)/Makefile.incl
4		4
		5	AM_CPPFLAGS = @PICFLAGS@ @DEFS@
5		6
6	BOINC_LIBS = -L/usr/lib -L$(BOINCDIR)/api -L$(BOINCDIR)/api/.libs -lboinc_api -L$(BOINCDIR)/lib -L$(BOINCDIR)/lib/.libs -lboinc	7	BOINC_LIBS = -L/usr/lib -L$(BOINCDIR)/api -L$(BOINCDIR)/api/.libs -lboinc_api -L$(BOINCDIR)/lib -L$(BOINCDIR)/lib/.libs -lboinc
7		8
8	CLIENT_C_FLAGS = $(APP_CFLAGS) $(CFLAGS) \	9	CLIENT_C_FLAGS = $(DEFS) \
9	$(DEFS) \
10	-DTEXT_UI -DNDEBUG -DCLIENT \	10	-DTEXT_UI -DNDEBUG -DCLIENT \
11	-I$(top_srcdir)/db \	11	-I$(top_srcdir)/db \
12	$(BOINC_CFLAGS) \	12	$(BOINC_CFLAGS) \
13	$(PTHREAD_CFLAGS) \	13	$(PTHREAD_CFLAGS) \
14	$(ASMLIB_CFLAGS)	14	$(ASMLIB_CFLAGS) \
15	CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(LDFLAGS) $(APP_LDFLAGS)	15	$(IPP_CFLAGS) \
16	CLIENT_LD_ADD = $(PTHREAD_LIBS) $(BOINC_LIBS) $(APP_LIBS)	16	$(APP_CFLAGS) \
		17	$(OPT_CFLAGS)
		18	CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(APP_LDFLAGS)
		19	CLIENT_LD_ADD = $(PTHREAD_LIBS) $(BOINC_LIBS) $(APP_LIBS) $(OPT_LDFLAGS)
17		20
18		21
19		22
Lines 53-59 Link Here
53	noinst_PROGRAMS = seti_boinc hires_timer_test	56	noinst_PROGRAMS = seti_boinc hires_timer_test
54		57
55	hires_timer_test_SOURCES= vector/hires_timer.cpp	58	hires_timer_test_SOURCES= vector/hires_timer.cpp
56	hires_timer_test_CXXFLAGS=-DTEST_TIMER $(CXXFLAGS) $(CLIENT_C_FLAGS)	59	hires_timer_test_CXXFLAGS=-DTEST_TIMER $(CLIENT_C_FLAGS)
57	hires_timer_test_LDFLAGS=$(CLIENT_LD_FLAGS)	60	hires_timer_test_LDFLAGS=$(CLIENT_LD_FLAGS)
58	hires_timer_test_LDADD=$(CLIENT_LD_ADD)	61	hires_timer_test_LDADD=$(CLIENT_LD_ADD)
59		62
Lines 176-182 Link Here
176	if LINUX	178	if LINUX
177	# too much optimization on main.cpp breaks the client for some reason	179	# too much optimization on main.cpp breaks the client for some reason
178	seti_boinc-main.o: main.cpp	180	seti_boinc-main.o: main.cpp
179	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$.Tpo" "$(DEPDIR)/$.Po"; else rm -f "$(DEPDIR)/$.Tpo"; exit 1; fi	181	if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -O2 $(CXXFLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$.Tpo" "$(DEPDIR)/$.Po"; else rm -f "$(DEPDIR)/$.Tpo"; exit 1; fi
180	endif	182	endif
181		183
182		184
Lines 190-196 Link Here
190	graphics_main.cpp \	192	graphics_main.cpp \
191	sah_version.cpp	193	sah_version.cpp
192		194
193	seti_graphics_CFLAGS = $(GUI_C_FLAGS)
194	seti_graphics_CXXFLAGS = $(GUI_C_FLAGS)	195	seti_graphics_CXXFLAGS = $(GUI_C_FLAGS)
195	seti_graphics_LDFLAGS = $(GUI_LD_FLAGS)	196	seti_graphics_LDFLAGS = $(GUI_LD_FLAGS)
196		197

Lines 2-14 Link Here

(-)tools/Makefile.am.orig (-4 / +3 lines)
2		2
3	include $(top_srcdir)/Makefile.incl	3	include $(top_srcdir)/Makefile.incl
4		4
		5	AM_CPPFLAGS = @PICFLAGS@ @DEFS@
5	LDFLAGS=	6	LDFLAGS=
6	AM_LDFLAGS=	7	AM_LDFLAGS=
7		8
8	BOINC_LIBS = -L/usr/lib -L$(BOINCDIR)/api -lboinc_api -L$(BOINCDIR)/lib -lboinc	9	BOINC_LIBS = -L/usr/lib -L$(BOINCDIR)/api -lboinc_api -L$(BOINCDIR)/lib -lboinc
9		10
10	CLIENT_C_FLAGS = $(CFLAGS) \	11	CLIENT_C_FLAGS = $(DEFS) \
11	$(DEFS) \
12	-DTEXT_UI -DNDEBUG -DCLIENT \	12	-DTEXT_UI -DNDEBUG -DCLIENT \
13	-include $(top_builddir)/sah_config.h \	13	-include $(top_builddir)/sah_config.h \
14	-I$(top_srcdir)/db \	14	-I$(top_srcdir)/db \
Lines 16-22 Link Here
16	$(BOINC_CFLAGS) \	16	$(BOINC_CFLAGS) \
17	$(PTHREAD_CFLAGS)	17	$(PTHREAD_CFLAGS)
18		18
19	CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(LDFLAGS) $(PTHREAD_LIBS) $(BOINC_LIBS)	19	CLIENT_LD_FLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(BOINC_LIBS)
20		20
21	noinst_PROGRAMS = fakedata	21	noinst_PROGRAMS = fakedata
22		22
Lines 29-35 Link Here
29	../db/sqlblob.cpp \	29	../db/sqlblob.cpp \
30	../db/xml_util.cpp	30	../db/xml_util.cpp
31		31
32	fakedata_CFLAGS = $(CLIENT_C_FLAGS)
33	fakedata_CXXFLAGS = $(CLIENT_C_FLAGS)	32	fakedata_CXXFLAGS = $(CLIENT_C_FLAGS)
34	fakedata_LDFLAGS = $(CLIENT_LD_FLAGS)	33	fakedata_LDFLAGS = $(CLIENT_LD_FLAGS)
35		34