Attachment #237771 for bug #327179




AC_PROG_RANLIB

# Check if the user has ATLAS installed in ./lib-atlas
dnl fw_save_LIBS=$LIBS
dnl LIBS=-L./lib-atlas/lib ${LDFLAGS}
dnl AC_CHECK_LIB(lapack, clapack_dgesv, 
dnl AC_MSG_RESULT([using atlas in lib-atlas/lib])
dnl AC_DEFINE(HAVE_ATLAS)
dnl have_atlas=yes
dnl LAPACK_LIB_DIR='${top_srcdir}/lib-atlas/lib'
dnl LAPACK_INCLUDE_DIR='${top_srcdir}/lib-atlas/include'
dnl ,
dnl AC_MSG_RESULT([using unoptimized lapack in lib])
dnl have_atlas=no
dnl LAPACK_LIB_DIR='${top_srcdir}/lib'
dnl LAPACK_INCLUDE_DIR='${top_srcdir}/lib'
dnl ,
dnl [-lcblas -latlas])
dnl LIBS=$fw_save_LIBS
dnl AC_SUBST(LAPACK_LIB_DIR)
dnl AC_SUBST(LAPACK_INCLUDE_DIR)
dnl AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)

BUNDLED_LAPACK_LIB_DIR='${top_srcdir}/lib'
AC_SUBST(BUNDLED_LAPACK_LIB_DIR)

have_atlas=no
AC_ARG_WITH(lapack-libs, [  --with-lapack-libs=LIBS ])
if test "x$with_lapack_libs" = "x" ; then
  LAPACK_LIBS='-L${top_srcdir}/lib -llapack'
else
  LAPACK_LIBS="$with_lapack_libs"
  have_atlas=yes
fi
AC_SUBST(LAPACK_LIBS)
AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)

AC_ARG_WITH(lapack-includes, [  --with-lapack-includes=INCLUDES ])
if test "x$with_lapack_includes" = "x" ; then
  LAPACK_INCLUDES='-I ${top_srcdir}/lib'
else
  LAPACK_INCLUDES="$with_lapack_includes"
fi
AC_SUBST(LAPACK_INCLUDES)


AM_PATH_GIMP_2_0(2.0.0)
AM_PATH_GTK_2_0(2.0.0)
AM_PATH_GLIB_2_0(2.0.0)




## Process this file with automake to produce Makefile.in

INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ @LAPACK_INCLUDES@

bin_PROGRAMS = refocus
noinst_PROGRAMS = test-matrix

ldadd_atlas=@LAPACK_LIBS@

noinst_HEADERS=bdclosure.h refocus.h matrix.h tilebuf.h conv.h fwlapack.h gimppreview.h prevman.h util.h
EXTRA_DIST = dummy-plugin.c

refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas}
if HAVE_ATLAS
else
refocus_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
endif

test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
test_matrix_LDADD = -lm ${ldadd_atlas} @GLIB_LIBS@
if HAVE_ATLAS
else
test_matrix_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
endif

install-bin: refocus
	@if test "x@GIMPTOOL@" = "x" ; then \

		@GIMPTOOL@ --install-admin-bin refocus ; \
	fi

@BUNDLED_LAPACK_LIB_DIR@/liblapack.a:
	cd @BUNDLED_LAPACK_LIB_DIR@; make

%.s: %.c
	${CC} ${CFLAGS} -S $< -o $@

Return to bug 327179

Lines 1-22 Link Here

(-)refocus-0.9.0/src/Makefile.am (-6 / +12 lines)
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
3	INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ -I @LAPACK_INCLUDE_DIR@	3	INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ @LAPACK_INCLUDES@
4		4
5	bin_PROGRAMS = refocus	5	bin_PROGRAMS = refocus
6	noinst_PROGRAMS = test-matrix	6	noinst_PROGRAMS = test-matrix
7		7
8	ldadd_atlas=-L@LAPACK_LIB_DIR@ -llapack -lcblas -latlas	8	ldadd_atlas=@LAPACK_LIBS@
9		9
10	noinst_HEADERS=bdclosure.h refocus.h matrix.h tilebuf.h conv.h fwlapack.h gimppreview.h prevman.h util.h	10	noinst_HEADERS=bdclosure.h refocus.h matrix.h tilebuf.h conv.h fwlapack.h gimppreview.h prevman.h util.h
11	EXTRA_DIST = dummy-plugin.c	11	EXTRA_DIST = dummy-plugin.c
12		12
13	refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c	13	refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
14	refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas}	14	refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas}
15	refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a	15	if HAVE_ATLAS
		16	else
		17	refocus_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
		18	endif
16		19
17	test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c	20	test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
18	test_matrix_LDADD = -lm ${ldadd_atlas} @GLIB_LIBS@	21	test_matrix_LDADD = -lm ${ldadd_atlas} @GLIB_LIBS@
19	test_matrix_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a	22	if HAVE_ATLAS
		23	else
		24	test_matrix_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
		25	endif
20		26
21	install-bin: refocus	27	install-bin: refocus
22	@if test "x@GIMPTOOL@" = "x" ; then \	28	@if test "x@GIMPTOOL@" = "x" ; then \
Lines 36-43 Link Here
36	@GIMPTOOL@ --install-admin-bin refocus ; \	42	@GIMPTOOL@ --install-admin-bin refocus ; \
37	fi	43	fi
38		44
39	@LAPACK_LIB_DIR@/liblapack.a:	45	@BUNDLED_LAPACK_LIB_DIR@/liblapack.a:
40	cd @LAPACK_LIB_DIR@; make	46	cd @BUNDLED_LAPACK_LIB_DIR@; make
41		47
42	%.s: %.c	48	%.s: %.c
43	${CC} ${CFLAGS} -S $< -o $@	49	${CC} ${CFLAGS} -S $< -o $@

Lines 16-41 Link Here

(-)refocus-0.9.0/configure.in (-17 / +40 lines)
16	AC_PROG_RANLIB	16	AC_PROG_RANLIB
17		17
18	# Check if the user has ATLAS installed in ./lib-atlas	18	# Check if the user has ATLAS installed in ./lib-atlas
19	fw_save_LIBS=$LIBS	19	dnl fw_save_LIBS=$LIBS
20	LIBS=-L./lib-atlas/lib ${LDFLAGS}	20	dnl LIBS=-L./lib-atlas/lib ${LDFLAGS}
21	AC_CHECK_LIB(lapack, clapack_dgesv,	21	dnl AC_CHECK_LIB(lapack, clapack_dgesv,
22	AC_MSG_RESULT([using atlas in lib-atlas/lib])	22	dnl AC_MSG_RESULT([using atlas in lib-atlas/lib])
23	AC_DEFINE(HAVE_ATLAS)	23	dnl AC_DEFINE(HAVE_ATLAS)
24	have_atlas=yes	24	dnl have_atlas=yes
25	LAPACK_LIB_DIR='${top_srcdir}/lib-atlas/lib'	25	dnl LAPACK_LIB_DIR='${top_srcdir}/lib-atlas/lib'
26	LAPACK_INCLUDE_DIR='${top_srcdir}/lib-atlas/include'	26	dnl LAPACK_INCLUDE_DIR='${top_srcdir}/lib-atlas/include'
27	,	27	dnl ,
28	AC_MSG_RESULT([using unoptimized lapack in lib])	28	dnl AC_MSG_RESULT([using unoptimized lapack in lib])
		29	dnl have_atlas=no
		30	dnl LAPACK_LIB_DIR='${top_srcdir}/lib'
		31	dnl LAPACK_INCLUDE_DIR='${top_srcdir}/lib'
		32	dnl ,
		33	dnl [-lcblas -latlas])
		34	dnl LIBS=$fw_save_LIBS
		35	dnl AC_SUBST(LAPACK_LIB_DIR)
		36	dnl AC_SUBST(LAPACK_INCLUDE_DIR)
		37	dnl AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)
		38
		39	BUNDLED_LAPACK_LIB_DIR='${top_srcdir}/lib'
		40	AC_SUBST(BUNDLED_LAPACK_LIB_DIR)
		41
29	have_atlas=no	42	have_atlas=no
30	LAPACK_LIB_DIR='${top_srcdir}/lib'	43	AC_ARG_WITH(lapack-libs, [ --with-lapack-libs=LIBS ])
31	LAPACK_INCLUDE_DIR='${top_srcdir}/lib'	44	if test "x$with_lapack_libs" = "x" ; then
32	,	45	LAPACK_LIBS='-L${top_srcdir}/lib -llapack'
33	[-lcblas -latlas])	46	else
34	LIBS=$fw_save_LIBS	47	LAPACK_LIBS="$with_lapack_libs"
35	AC_SUBST(LAPACK_LIB_DIR)	48	have_atlas=yes
36	AC_SUBST(LAPACK_INCLUDE_DIR)	49	fi
		50	AC_SUBST(LAPACK_LIBS)
37	AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)	51	AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)
38		52
		53	AC_ARG_WITH(lapack-includes, [ --with-lapack-includes=INCLUDES ])
		54	if test "x$with_lapack_includes" = "x" ; then
		55	LAPACK_INCLUDES='-I ${top_srcdir}/lib'
		56	else
		57	LAPACK_INCLUDES="$with_lapack_includes"
		58	fi
		59	AC_SUBST(LAPACK_INCLUDES)
		60
		61
39	AM_PATH_GIMP_2_0(2.0.0)	62	AM_PATH_GIMP_2_0(2.0.0)
40	AM_PATH_GTK_2_0(2.0.0)	63	AM_PATH_GTK_2_0(2.0.0)
41	AM_PATH_GLIB_2_0(2.0.0)	64	AM_PATH_GLIB_2_0(2.0.0)