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
43554491
Commit
43554491
authored
Jan 19, 2012
by
Thomas White
Committed by
Thomas White
Feb 22, 2012
Browse files
Use Pango cflags and libraries separately
parent
6c5ecd97
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure
View file @
43554491
...
...
@@ -14201,7 +14201,7 @@ $as_echo "$gl_cv_prog_c_ignore_unused_libraries" >&6; }
MAIN_CFLAGS
=
"
$CFLAGS
$HDF5_CFLAGS
$GSL_CFLAGS
$OPENCL_CFLAGS
-pthread"
MAIN_CFLAGS
=
"
$MAIN_CFLAGS
$GTK_CFLAGS
$LIBTIFF_CFLAGS
-D_GNU_SOURCE "
MAIN_CFLAGS
=
"
$MAIN_CFLAGS
$libPNG_CFLAGS
$Cairo_CFLAGS
$GDK_pixbuf_CFLAGS
"
MAIN_CFLAGS
=
"
$MAIN_CFLAGS
$GDK_pixbuf_2_CFLAGS
$FFTW_CFLAGS
"
MAIN_CFLAGS
=
"
$MAIN_CFLAGS
$GDK_pixbuf_2_CFLAGS
$FFTW_CFLAGS
$Pango_CFLAGS
"
LIBCRYSTFEL_CFLAGS
=
"
$CFLAGS
$HDF5_CFLAGS
$GSL_CFLAGS
$FFTW_CFLAGS
"
...
...
@@ -14209,7 +14209,8 @@ LIBCRYSTFEL_CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $FFTW_CFLAGS"
MAIN_LIBS
=
"
$LIBS
$HDF5_LIBS
-lm -lz
$GSL_LIBS
$GTK_LIBS
$OPENCL_LIBS
-pthread"
MAIN_LIBS
=
"
$MAIN_LIBS
$LIBTIFF_LIBS
$libPNG_LIBS
$Cairo_LIBS
$GDK_pixbuf_LIBS
"
MAIN_LIBS
=
"
$MAIN_LIBS
$GDK_pixbuf_2_LIBS
$TIMER_LIBS
$FFTW_LIBS
$LDFLAGS
"
MAIN_LIBS
=
"
$MAIN_LIBS
$GDK_pixbuf_2_LIBS
$TIMER_LIBS
$FFTW_LIBS
"
MAIN_LIBS
=
"
$MAIN_LIBS
$Pango_LIBS
$LDFLAGS
"
LIBCRYSTFEL_LIBS
=
"
$LIBS
$HDF5_LIBS
$GSL_LIBS
$FFTW_LIBS
$LDFLAGS
"
...
...
configure.ac
View file @
43554491
...
...
@@ -276,7 +276,7 @@ gl_IGNORE_UNUSED_LIBRARIES
MAIN_CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $OPENCL_CFLAGS -pthread"
MAIN_CFLAGS="$MAIN_CFLAGS $GTK_CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE "
MAIN_CFLAGS="$MAIN_CFLAGS $libPNG_CFLAGS $Cairo_CFLAGS $GDK_pixbuf_CFLAGS"
MAIN_CFLAGS="$MAIN_CFLAGS $GDK_pixbuf_2_CFLAGS $FFTW_CFLAGS"
MAIN_CFLAGS="$MAIN_CFLAGS $GDK_pixbuf_2_CFLAGS $FFTW_CFLAGS
$Pango_CFLAGS
"
AC_SUBST([MAIN_CFLAGS])
LIBCRYSTFEL_CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $FFTW_CFLAGS"
...
...
@@ -284,7 +284,8 @@ AC_SUBST([LIBCRYSTFEL_CFLAGS])
MAIN_LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -pthread"
MAIN_LIBS="$MAIN_LIBS $LIBTIFF_LIBS $libPNG_LIBS $Cairo_LIBS $GDK_pixbuf_LIBS"
MAIN_LIBS="$MAIN_LIBS $GDK_pixbuf_2_LIBS $TIMER_LIBS $FFTW_LIBS $LDFLAGS"
MAIN_LIBS="$MAIN_LIBS $GDK_pixbuf_2_LIBS $TIMER_LIBS $FFTW_LIBS"
MAIN_LIBS="$MAIN_LIBS $Pango_LIBS $LDFLAGS"
AC_SUBST([MAIN_LIBS])
LIBCRYSTFEL_LIBS="$LIBS $HDF5_LIBS $GSL_LIBS $FFTW_LIBS $LDFLAGS"
...
...
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