Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Oleksii Turkot
CrystFEL
Commits
fa8c7270
Commit
fa8c7270
authored
Mar 09, 2011
by
Thomas White
Browse files
First round of build system improvements
parent
28cebf7c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
fa8c7270
...
...
@@ -11,11 +11,11 @@ noinst_PROGRAMS = tests/list_check
TESTS
=
tests/list_check
if
HAVE_GTK
if
BUILD_HDFSEE
bin_PROGRAMS
+=
src/hdfsee
endif
if
HAVE_CAIRO
if
BUILD_CUBEIT
bin_PROGRAMS
+=
src/cubeit
endif
...
...
@@ -58,7 +58,7 @@ src_indexamajig_SOURCES += src/diffraction-gpu.c src/cl-utils.c
endif
if
HAVE_GTK
if
BUILD_HDFSEE
src_hdfsee_SOURCES
=
src/hdfsee.c src/dw-hdfsee.c src/render.c
\
src/hdf5-file.c src/utils.c src/image.c src/filters.c
\
src/thread-pool.c src/detector.c
...
...
@@ -100,7 +100,7 @@ src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
src/symmetry.c src/post-refinement.c
\
src/hrs-scaling.c src/reflist.c
if
HAVE_CAIRO
if
BUILD_CUBEIT
src_cubeit_SOURCES
=
src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c
\
src/detector.c src/render.c src/filters.c src/image.c
\
src/symmetry.c src/stream.c src/thread-pool.c
...
...
Makefile.in
View file @
fa8c7270
...
...
@@ -44,8 +44,8 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \
src/sum_stack
$(EXEEXT)
$(am__EXEEXT_1)
$(am__EXEEXT_2)
noinst_PROGRAMS
=
tests/list_check
$(EXEEXT)
$(am__EXEEXT_3)
TESTS
=
tests/list_check
$(EXEEXT)
$(am__EXEEXT_3)
@
HAVE_GTK
_TRUE@
am__append_1
=
src/hdfsee
@
HAVE_CAIRO
_TRUE@
am__append_2
=
src/cubeit
@
BUILD_HDFSEE
_TRUE@
am__append_1
=
src/hdfsee
@
BUILD_CUBEIT
_TRUE@
am__append_2
=
src/cubeit
@HAVE_OPENCL_TRUE@
am__append_3
=
src/diffraction-gpu.c src/cl-utils.c
@HAVE_OPENCL_TRUE@
am__append_4
=
tests/gpu_sim_check
@HAVE_OPENCL_TRUE@
am__append_5
=
tests/gpu_sim_check
...
...
@@ -76,8 +76,8 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER
=
config.h
CONFIG_CLEAN_FILES
=
CONFIG_CLEAN_VPATH_FILES
=
@
HAVE_GTK
_TRUE@
am__EXEEXT_1
=
src/hdfsee
$(EXEEXT)
@
HAVE_CAIRO
_TRUE@
am__EXEEXT_2
=
src/cubeit
$(EXEEXT)
@
BUILD_HDFSEE
_TRUE@
am__EXEEXT_1
=
src/hdfsee
$(EXEEXT)
@
BUILD_CUBEIT
_TRUE@
am__EXEEXT_2
=
src/cubeit
$(EXEEXT)
am__installdirs
=
"
$(DESTDIR)$(bindir)
"
"
$(DESTDIR)$(crystfeldir)
"
\
"
$(DESTDIR)$(crystfeldocdir)
"
"
$(DESTDIR)$(scriptdir)
"
@HAVE_OPENCL_TRUE@
am__EXEEXT_3
=
tests/gpu_sim_check
$(EXEEXT)
...
...
@@ -107,13 +107,13 @@ src_compare_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am__src_cubeit_SOURCES_DIST
=
src/cubeit.c src/cell.c src/hdf5-file.c
\
src/utils.c src/detector.c src/render.c src/filters.c
\
src/image.c src/symmetry.c src/stream.c src/thread-pool.c
@
HAVE_CAIRO
_TRUE@
am_src_cubeit_OBJECTS
=
src/cubeit.
$(OBJEXT)
\
@
HAVE_CAIRO
_TRUE@ src/cell.
$(OBJEXT)
src/hdf5-file.
$(OBJEXT)
\
@
HAVE_CAIRO
_TRUE@ src/utils.
$(OBJEXT)
src/detector.
$(OBJEXT)
\
@
HAVE_CAIRO
_TRUE@ src/render.
$(OBJEXT)
src/filters.
$(OBJEXT)
\
@
HAVE_CAIRO
_TRUE@ src/image.
$(OBJEXT)
src/symmetry.
$(OBJEXT)
\
@
HAVE_CAIRO
_TRUE@ src/stream.
$(OBJEXT)
\
@
HAVE_CAIRO
_TRUE@ src/thread-pool.
$(OBJEXT)
@
BUILD_CUBEIT
_TRUE@
am_src_cubeit_OBJECTS
=
src/cubeit.
$(OBJEXT)
\
@
BUILD_CUBEIT
_TRUE@ src/cell.
$(OBJEXT)
src/hdf5-file.
$(OBJEXT)
\
@
BUILD_CUBEIT
_TRUE@ src/utils.
$(OBJEXT)
src/detector.
$(OBJEXT)
\
@
BUILD_CUBEIT
_TRUE@ src/render.
$(OBJEXT)
src/filters.
$(OBJEXT)
\
@
BUILD_CUBEIT
_TRUE@ src/image.
$(OBJEXT)
src/symmetry.
$(OBJEXT)
\
@
BUILD_CUBEIT
_TRUE@ src/stream.
$(OBJEXT)
\
@
BUILD_CUBEIT
_TRUE@ src/thread-pool.
$(OBJEXT)
src_cubeit_OBJECTS
=
$(am_src_cubeit_OBJECTS)
src_cubeit_LDADD
=
$(LDADD)
src_cubeit_DEPENDENCIES
=
$(top_builddir)
/lib/libgnu.a
...
...
@@ -135,12 +135,13 @@ src_get_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
am__src_hdfsee_SOURCES_DIST
=
src/hdfsee.c src/dw-hdfsee.c
\
src/render.c src/hdf5-file.c src/utils.c src/image.c
\
src/filters.c src/thread-pool.c src/detector.c
@HAVE_GTK_TRUE@
am_src_hdfsee_OBJECTS
=
src/hdfsee.
$(OBJEXT)
\
@HAVE_GTK_TRUE@ src/dw-hdfsee.
$(OBJEXT)
src/render.
$(OBJEXT)
\
@HAVE_GTK_TRUE@ src/hdf5-file.
$(OBJEXT)
src/utils.
$(OBJEXT)
\
@HAVE_GTK_TRUE@ src/image.
$(OBJEXT)
src/filters.
$(OBJEXT)
\
@HAVE_GTK_TRUE@ src/thread-pool.
$(OBJEXT)
\
@HAVE_GTK_TRUE@ src/detector.
$(OBJEXT)
@BUILD_HDFSEE_TRUE@
am_src_hdfsee_OBJECTS
=
src/hdfsee.
$(OBJEXT)
\
@BUILD_HDFSEE_TRUE@ src/dw-hdfsee.
$(OBJEXT)
\
@BUILD_HDFSEE_TRUE@ src/render.
$(OBJEXT)
\
@BUILD_HDFSEE_TRUE@ src/hdf5-file.
$(OBJEXT)
src/utils.
$(OBJEXT)
\
@BUILD_HDFSEE_TRUE@ src/image.
$(OBJEXT)
src/filters.
$(OBJEXT)
\
@BUILD_HDFSEE_TRUE@ src/thread-pool.
$(OBJEXT)
\
@BUILD_HDFSEE_TRUE@ src/detector.
$(OBJEXT)
src_hdfsee_OBJECTS
=
$(am_src_hdfsee_OBJECTS)
src_hdfsee_LDADD
=
$(LDADD)
src_hdfsee_DEPENDENCIES
=
$(top_builddir)
/lib/libgnu.a
...
...
@@ -625,9 +626,9 @@ src_indexamajig_SOURCES = src/indexamajig.c src/hdf5-file.c \
src/dirax.c src/mosflm.c src/reflections.c src/symmetry.c
\
src/geometry.c src/thread-pool.c src/beam-parameters.c
\
src/reflist.c
$(am__append_6)
@
HAVE_GTK
_TRUE@
src_hdfsee_SOURCES
=
src/hdfsee.c src/dw-hdfsee.c src/render.c
\
@
HAVE_GTK
_TRUE@ src/hdf5-file.c src/utils.c src/image.c src/filters.c
\
@
HAVE_GTK
_TRUE@ src/thread-pool.c src/detector.c
@
BUILD_HDFSEE
_TRUE@
src_hdfsee_SOURCES
=
src/hdfsee.c src/dw-hdfsee.c src/render.c
\
@
BUILD_HDFSEE
_TRUE@ src/hdf5-file.c src/utils.c src/image.c src/filters.c
\
@
BUILD_HDFSEE
_TRUE@ src/thread-pool.c src/detector.c
src_get_hkl_SOURCES
=
src/get_hkl.c src/sfac.c src/cell.c src/utils.c
\
src/reflections.c src/symmetry.c src/beam-parameters.c
\
...
...
@@ -665,9 +666,9 @@ src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
src/symmetry.c src/post-refinement.c
\
src/hrs-scaling.c src/reflist.c
@
HAVE_CAIRO
_TRUE@
src_cubeit_SOURCES
=
src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c
\
@
HAVE_CAIRO
_TRUE@ src/detector.c src/render.c src/filters.c src/image.c
\
@
HAVE_CAIRO
_TRUE@ src/symmetry.c src/stream.c src/thread-pool.c
@
BUILD_CUBEIT
_TRUE@
src_cubeit_SOURCES
=
src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c
\
@
BUILD_CUBEIT
_TRUE@ src/detector.c src/render.c src/filters.c src/image.c
\
@
BUILD_CUBEIT
_TRUE@ src/symmetry.c src/stream.c src/thread-pool.c
src_reintegrate_SOURCES
=
src/reintegrate.c src/cell.c src/hdf5-file.c
\
src/utils.c src/detector.c src/peaks.c src/image.c
\
...
...
config.h.in
View file @
fa8c7270
...
...
@@ -41,6 +41,9 @@
/* Define to 1 if a Linux-style forkpty is available */
#undef HAVE_FORKPTY_LINUX
/* Define to 1 if gdk-pixbuf is available */
#undef HAVE_GDK_PIXBUF
/* Define to 1 if GTK and GDK are available */
#undef HAVE_GTK
...
...
configure
View file @
fa8c7270
...
...
@@ -602,22 +602,22 @@ gl_LIBOBJS
am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
BUILD_CUBEIT_FALSE
BUILD_CUBEIT_TRUE
BUILD_HDFSEE_FALSE
BUILD_HDFSEE_TRUE
HAVE_OPENCL_FALSE
HAVE_OPENCL_TRUE
GDK_pixbuf_2_LIBS
GDK_pixbuf_2_CFLAGS
GDK_pixbuf_LIBS
GDK_pixbuf_CFLAGS
HAVE_CAIRO_FALSE
HAVE_CAIRO_TRUE
Cairo_LIBS
Cairo_CFLAGS
libPNG_LIBS
libPNG_CFLAGS
HAVE_GTK_FALSE
HAVE_GTK_TRUE
GTK_LIBS
GTK_CFLAGS
HAVE_OPENCL_FALSE
HAVE_OPENCL_TRUE
GSL_LIBS
GSL_CFLAGS
PKG_CONFIG_LIBDIR
...
...
@@ -6503,14 +6503,6 @@ else
$as_echo
"no"
>
&6
;
}
fi
if
test
x
$have_opencl
=
xtrue
;
then
HAVE_OPENCL_TRUE
=
HAVE_OPENCL_FALSE
=
'#'
else
HAVE_OPENCL_TRUE
=
'#'
HAVE_OPENCL_FALSE
=
fi
if
test
"x
$cl_cl_h
"
==
"xtrue"
;
then
:
...
...
@@ -6524,7 +6516,7 @@ if test "${enable_gtk+set}" = set; then :
enableval
=
$enable_gtk
;
fi
havegtk
=
false
have
_
gtk
=
false
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking whether to use GTK"
>
&5
$as_echo_n
"checking whether to use GTK... "
>
&6
;
}
if
test
"x
$enable_gtk
"
!=
"xno"
;
then
:
...
...
@@ -6733,7 +6725,7 @@ fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: yes (version
$gtk_config_major_version
.
$gtk_config_minor_version
.
$gtk_config_micro_version
)"
>
&5
$as_echo
"yes (version
$gtk_config_major_version
.
$gtk_config_minor_version
.
$gtk_config_micro_version
)"
>
&6
;
}
havegtk
=
true
have
_
gtk
=
true
$as_echo
"#define HAVE_GTK 1"
>>
confdefs.h
...
...
@@ -6805,14 +6797,6 @@ else
$as_echo
"no"
>
&6
;
}
fi
if
test
"x
$havegtk
"
=
"xtrue"
;
then
HAVE_GTK_TRUE
=
HAVE_GTK_FALSE
=
'#'
else
HAVE_GTK_TRUE
=
'#'
HAVE_GTK_FALSE
=
fi
for
ac_func
in
forkpty
...
...
@@ -6981,6 +6965,7 @@ $as_echo "yes" >&6; }
$as_echo
"#define HAVE_LIBPNG 1"
>>
confdefs.h
have_libpng
=
true
fi
...
...
@@ -7004,10 +6989,14 @@ if test "x$enable_tiff" != "xno"; then :
# Check whether --with-libtiff was given.
if
test
"
${
with_libtiff
+set
}
"
=
set
;
then
:
withval
=
$with_libtiff
;
LIBTIFF_CFLAGS
=
"-I
$withval
/include"
LIBTIFF_LIBS
=
"-L
$withval
/lib -ltiff"
withval
=
$with_libtiff
;
LIBTIFF_CFLAGS
=
"-I
$withval
/include"
LIBTIFF_LIBS
=
"-L
$withval
/lib -ltiff"
else
LIBTIFF_LIBS
=
"-ltiff"
LIBTIFF_LIBS
=
"-ltiff"
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: yes"
>
&5
...
...
@@ -7125,7 +7114,7 @@ else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: yes"
>
&5
$as_echo
"yes"
>
&6
;
}
havecairo
=
true
have
_
cairo
=
true
$as_echo
"#define HAVE_CAIRO 1"
>>
confdefs.h
...
...
@@ -7138,14 +7127,6 @@ else
$as_echo
"no"
>
&6
;
}
fi
if
test
x
$havecairo
=
xtrue
;
then
HAVE_CAIRO_TRUE
=
HAVE_CAIRO_FALSE
=
'#'
else
HAVE_CAIRO_TRUE
=
'#'
HAVE_CAIRO_FALSE
=
fi
...
...
@@ -7263,14 +7244,32 @@ fi
# Put the nasty error message in config.log where it belongs
echo
"
$GDK_pixbuf_2_PKG_ERRORS
"
>
&5
as_fn_error
$?
"Package requirements (gdk-pixbuf-2.0) were not met:
$GDK_pixbuf_2_PKG_ERRORS
as_fn_error
$?
"gdk-pixbuf is required."
"
$LINENO
"
5
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details."
"
$LINENO
"
5
elif
test
$pkg_failed
=
untried
;
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
{
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: error: in
\`
$ac_pwd
':"
>
&5
$as_echo
"
$as_me
: error: in
\`
$ac_pwd
':"
>
&2
;
}
as_fn_error
$?
"The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
as_fn_error
$?
"gdk-pixbuf is required."
"
$LINENO
"
5
Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See
\`
config.log' for more details"
"
$LINENO
"
5
;
}
else
GDK_pixbuf_2_CFLAGS
=
$pkg_cv_GDK_pixbuf_2_CFLAGS
...
...
@@ -7278,6 +7277,11 @@ else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: yes"
>
&5
$as_echo
"yes"
>
&6
;
}
$as_echo
"#define HAVE_GDK_PIXBUF 1"
>>
confdefs.h
have_gdk_pixbuf
=
true
fi
elif
test
$pkg_failed
=
untried
;
then
...
...
@@ -7341,14 +7345,32 @@ fi
# Put the nasty error message in config.log where it belongs
echo
"
$GDK_pixbuf_2_PKG_ERRORS
"
>
&5
as_fn_error
$?
"Package requirements (gdk-pixbuf-2.0) were not met:
as_fn_error
$?
"gdk-pixbuf is required."
"
$LINENO
"
5
$GDK_pixbuf_2_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details."
"
$LINENO
"
5
elif
test
$pkg_failed
=
untried
;
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: no"
>
&5
$as_echo
"no"
>
&6
;
}
{
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: error: in
\`
$ac_pwd
':"
>
&5
$as_echo
"
$as_me
: error: in
\`
$ac_pwd
':"
>
&2
;
}
as_fn_error
$?
"The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
as_fn_error
$?
"gdk-pixbuf is required."
"
$LINENO
"
5
Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See
\`
config.log' for more details"
"
$LINENO
"
5
;
}
else
GDK_pixbuf_2_CFLAGS
=
$pkg_cv_GDK_pixbuf_2_CFLAGS
...
...
@@ -7356,6 +7378,11 @@ else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: yes"
>
&5
$as_echo
"yes"
>
&6
;
}
$as_echo
"#define HAVE_GDK_PIXBUF 1"
>>
confdefs.h
have_gdk_pixbuf
=
true
fi
else
...
...
@@ -7367,6 +7394,37 @@ $as_echo "yes" >&6; }
fi
if
test
x
$have_opencl
=
xtrue
;
then
HAVE_OPENCL_TRUE
=
HAVE_OPENCL_FALSE
=
'#'
else
HAVE_OPENCL_TRUE
=
'#'
HAVE_OPENCL_FALSE
=
fi
if
test
x
$have_gdk_pixbuf
=
xtrue
\
-a
"x
$have_gtk
"
=
"xtrue"
\
-a
"x
$have_cairo
"
=
"xtrue"
;
then
BUILD_HDFSEE_TRUE
=
BUILD_HDFSEE_FALSE
=
'#'
else
BUILD_HDFSEE_TRUE
=
'#'
BUILD_HDFSEE_FALSE
=
fi
if
test
x
$have_cairo
=
xtrue
\
-a
x
$have_libpng
=
xtrue
;
then
BUILD_CUBEIT_TRUE
=
BUILD_CUBEIT_FALSE
=
'#'
else
BUILD_CUBEIT_TRUE
=
'#'
BUILD_CUBEIT_FALSE
=
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for C compiler flag to ignore unused libraries"
>
&5
$as_echo_n
"checking for C compiler flag to ignore unused libraries... "
>
&6
;
}
...
...
@@ -7590,12 +7648,12 @@ if test -z "${HAVE_OPENCL_TRUE}" && test -z "${HAVE_OPENCL_FALSE}"; then
as_fn_error
$?
"conditional
\"
HAVE_OPENCL
\"
was never defined.
Usually this means the macro was only invoked conditionally."
"
$LINENO
"
5
fi
if
test
-z
"
${
HAVE_GTK
_TRUE
}
"
&&
test
-z
"
${
HAVE_GTK
_FALSE
}
"
;
then
as_fn_error
$?
"conditional
\"
HAVE_GTK
\"
was never defined.
if
test
-z
"
${
BUILD_HDFSEE
_TRUE
}
"
&&
test
-z
"
${
BUILD_HDFSEE
_FALSE
}
"
;
then
as_fn_error
$?
"conditional
\"
BUILD_HDFSEE
\"
was never defined.
Usually this means the macro was only invoked conditionally."
"
$LINENO
"
5
fi
if
test
-z
"
${
HAVE_CAIRO
_TRUE
}
"
&&
test
-z
"
${
HAVE_CAIRO
_FALSE
}
"
;
then
as_fn_error
$?
"conditional
\"
HAVE_CAIRO
\"
was never defined.
if
test
-z
"
${
BUILD_CUBEIT
_TRUE
}
"
&&
test
-z
"
${
BUILD_CUBEIT
_FALSE
}
"
;
then
as_fn_error
$?
"conditional
\"
BUILD_CUBEIT
\"
was never defined.
Usually this means the macro was only invoked conditionally."
"
$LINENO
"
5
fi
...
...
configure.ac
View file @
fa8c7270
...
...
@@ -91,21 +91,20 @@ AS_IF([test "x$with_opencl" == "xyes"],
], [
AC_MSG_RESULT([no])
])
AM_CONDITIONAL([HAVE_OPENCL], test x$have_opencl = xtrue)
AS_IF([test "x$cl_cl_h" == "xtrue"],
[
AC_DEFINE([HAVE_CL_CL_H], [1], [Define to 1 if CL/cl.h should be used])
])
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [Disable GTK+/GLib]))
havegtk=false
have
_
gtk=false
AC_MSG_CHECKING([whether to use GTK])
AS_IF([test "x$enable_gtk" != "xno"],
[
AC_MSG_RESULT([yes])
AM_PATH_GTK_2_0(2.0.0,
[
havegtk=true
have
_
gtk=true
AC_DEFINE([HAVE_GTK], [1], [Define to 1 if GTK and GDK are available])
],
[
...
...
@@ -115,7 +114,6 @@ AS_IF([test "x$enable_gtk" != "xno"],
[
AC_MSG_RESULT([no])
])
AM_CONDITIONAL([HAVE_GTK], test "x$havegtk" = "xtrue")
AC_CHECK_FUNCS(forkpty,
...
...
@@ -139,7 +137,8 @@ AS_IF([test "x$enable_png" != "xno"],
PKG_CHECK_MODULES([libPNG], [libpng >= 1.2.0],
[
AC_DEFINE([HAVE_LIBPNG], [1], [Define to 1 if libPNG is available])
])
have_libpng=true
], [])
],[
AC_MSG_RESULT([no])
])
...
...
@@ -152,9 +151,12 @@ AS_IF([test "x$enable_tiff" != "xno"],
[
AC_ARG_WITH(libtiff,
[AS_HELP_STRING([--with-libtiff], [specify location of libTIFF library])],
[LIBTIFF_CFLAGS="-I$withval/include"
LIBTIFF_LIBS="-L$withval/lib -ltiff"],
[LIBTIFF_LIBS="-ltiff"])
[
LIBTIFF_CFLAGS="-I$withval/include"
LIBTIFF_LIBS="-L$withval/lib -ltiff"
], [
LIBTIFF_LIBS="-ltiff"
])
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_TIFF], [1], [Define to 1 if libTIFF is available])
],
...
...
@@ -171,25 +173,37 @@ AS_IF([test "x$enable_cairo" != "xno"],
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES([Cairo], [cairo >= 1.2.0],
[
havecairo=true
AC_DEFINE([HAVE_CAIRO], [1], [Define to 1 if Cairo is available])
])
have
_
cairo=true
AC_DEFINE([HAVE_CAIRO], [1], [Define to 1 if Cairo is available])
], [
])
],
[
AC_MSG_RESULT([no])
])
AM_CONDITIONAL([HAVE_CAIRO], test x$havecairo = xtrue)
PKG_CHECK_MODULES([GDK_pixbuf], [gdk-pixbuf], [],
[
PKG_CHECK_MODULES([GDK_pixbuf_2], [gdk-pixbuf-2.0],
[],
PKG_CHECK_MODULES([GDK_pixbuf_2], [gdk-pixbuf-2.0],
[
AC_ERROR([gdk-pixbuf is required.])
])
AC_DEFINE([HAVE_GDK_PIXBUF], [1],
[Define to 1 if gdk-pixbuf is available])
have_gdk_pixbuf=true
], [])
])
dnl Conditionals...
AM_CONDITIONAL([HAVE_OPENCL], test x$have_opencl = xtrue)
AM_CONDITIONAL([BUILD_HDFSEE], test x$have_gdk_pixbuf = xtrue \
-a "x$have_gtk" = "xtrue" \
-a "x$have_cairo" = "xtrue")
AM_CONDITIONAL([BUILD_CUBEIT], test x$have_cairo = xtrue \
-a x$have_libpng = xtrue)
gl_IGNORE_UNUSED_LIBRARIES
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment