]>
Commit | Line | Data |
---|---|---|
cbd6e183 JB |
1 | --- cinepaint/configure.in.orig 2013-03-22 22:35:07.518234103 +0100 |
2 | +++ cinepaint/configure.in 2013-03-22 22:56:46.378179589 +0100 | |
85f030ab JB |
3 | @@ -124,12 +124,13 @@ fi) |
4 | ||
5 | AC_DEFUN([AC_CINEPAINT_CHECK], | |
6 | [ | |
7 | - AC_LANG(C) | |
8 | + AC_LANG_PUSH(C) | |
9 | AM_PATH_GTK(1.2.8,, | |
10 | [AC_MSG_WARN(Test for GTK failed. See the file 'INSTALL' for help.); | |
11 | ERROR=1]) | |
12 | X_LIBS="$GTK_LIBS $LDFLAGS" | |
13 | X_CFLAGS="$GTK_CFLAGS $CPPFLAGS" | |
14 | + AC_LANG_POP(C) | |
15 | ]) | |
16 | ||
17 | if test -n "$use_gtk2"; then | |
18 | @@ -312,11 +313,12 @@ fi | |
19 | else | |
20 | dnl second Test for OpenEXR | |
21 | AC_MSG_CHECKING(for openexr support) | |
22 | - AC_LANG(C++) | |
23 | + AC_LANG_PUSH(C++) | |
24 | AC_CHECK_HEADER(OpenEXR/half.h,,[AC_MSG_WARN([ | |
25 | *** OpenEXR dev header half.h not found | |
26 | *** install OpenEXR and development packages or | |
27 | *** download from http://www.openexr.org ]);ERROR=1]) | |
28 | + AC_LANG_POP(C++) | |
29 | OPENEXR_INCLUDES="-I/usr/include/OpenEXR -I/opt/local/include/OpenEXR -I${prefix}/include/OpenEXR" | |
30 | fi | |
31 | else | |
cbd6e183 JB |
32 | @@ -514,7 +514,7 @@ |
33 | fi | |
34 | if test "x$FLTK_CONFIG" != "xno"; then | |
35 | FLTK_CONFIG="$FLTK_CONFIG" | |
36 | - FLTK_LDFLAGS="`$FLTK_CONFIG --use-images --ldflags | sed \"$STRIPOPT\"`" | |
37 | + FLTK_LDFLAGS="`$FLTK_CONFIG --use-images --ldflags`" | |
38 | FLTK_LIBS_PURE="`echo $FLTK_LDFLAGS | sed 's/-O.// ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`" | |
39 | FLTK_LIBS="\$(top_builddir)/lib/fl_i18n/libcinepaint_fl_i18n.la $FLTK_LIBS_PURE" | |
40 | FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags | sed 's/-O.// ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'` |