]>
Commit | Line | Data |
---|---|---|
937b6057 | 1 | --- eog-0.6/configure.in~ Thu Feb 15 03:03:34 2001 |
2 | +++ eog-0.6/configure.in Sun Aug 25 18:47:50 2002 | |
3 | @@ -8,7 +8,8 @@ | |
4 | ||
5 | AM_MAINTAINER_MODE | |
6 | ||
7 | -AM_PROG_XML_I18N_TOOLS | |
8 | +AC_PROG_XML_I18N_TOOLS | |
9 | +AC_PROG_INTLTOOL | |
10 | ||
11 | AM_ACLOCAL_INCLUDE(macros) | |
12 | ||
13 | @@ -25,10 +25,6 @@ | |
14 | ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl no pl pt_BR ro ru sl sv tr uk zh_CN.GB2312 zh_TW.Big5" | |
15 | AM_GNU_GETTEXT | |
16 | ||
17 | -AC_SUBST(CFLAGS) | |
18 | -AC_SUBST(CPPFLAGS) | |
19 | -AC_SUBST(LDFLAGS) | |
20 | - | |
21 | AM_PATH_GDK_PIXBUF(0.9.0, ,AC_MSG_ERROR([Need gdk-pixbuf-0.9.0 or later!])) | |
22 | ||
23 | AM_PATH_GCONF(0.12,,,gconf-gtk) | |
24 | @@ -141,9 +137,8 @@ | |
25 | dnl Test for libjpeg | |
26 | if test -z "$LIBJPEG"; then | |
27 | AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, | |
28 | - jpeg_ok=yes, | |
29 | - jpeg_ok=no | |
30 | - AC_MSG_WARN(*** JPEG saving code will not be built (JPEG library not found) ***)) | |
31 | + [jpeg_ok=yes], | |
32 | + AC_MSG_WARN([*** JPEG saving code will not be built (JPEG library not found) ***])) | |
33 | if test "$jpeg_ok" = yes; then | |
34 | AC_MSG_CHECKING([for jpeglib.h]) | |
35 | AC_TRY_CPP( | |
36 | @@ -151,16 +146,15 @@ | |
37 | #undef PACKAGE | |
38 | #undef VERSION | |
39 | #include <jpeglib.h>], | |
40 | - jpeg_ok=yes, | |
41 | - jpeg_ok=no) | |
42 | + [jpeg_ok=yes]) | |
43 | AC_MSG_RESULT($jpeg_ok) | |
44 | if test "$jpeg_ok" = yes; then | |
45 | LIBJPEG='-ljpeg' | |
46 | AC_CHECK_LIB(jpeg, jpeg_simple_progression, | |
47 | - AC_DEFINE(HAVE_PROGRESSIVE_JPEG), | |
48 | - AC_MSG_WARN(JPEG library does not support progressive saving.)) | |
49 | + [AC_DEFINE(HAVE_PROGRESSIVE_JPEG)], | |
50 | + [AC_MSG_WARN([JPEG library does not support progressive saving.])]) | |
51 | else | |
52 | - AC_MSG_WARN(*** JPEG saving code will not be built (JPEG header file not found) ***) | |
53 | + AC_MSG_WARN([*** JPEG saving code will not be built (JPEG header file not found) ***]) | |
54 | fi | |
55 | fi | |
56 | fi | |
57 | @@ -172,24 +166,23 @@ | |
58 | dnl Test for libpng | |
59 | if test -z "$LIBPNG"; then | |
60 | AC_CHECK_LIB(png, png_read_info, | |
61 | - AC_CHECK_HEADER(png.h, | |
62 | - png_ok=yes, | |
63 | - png_ok=no), | |
64 | - AC_MSG_WARN(*** PNG saving code will not be built (PNG library not found) ***), -lz -lm) | |
65 | + [AC_CHECK_HEADER(png.h, | |
66 | + [png_ok=yes], | |
67 | + [png_ok=no])], | |
68 | + AC_MSG_WARN([*** PNG saving code will not be built (PNG library not found) ***])) | |
69 | if test "$png_ok" = yes; then | |
70 | AC_MSG_CHECKING([for png_structp in png.h]) | |
71 | AC_TRY_COMPILE([#include <png.h>], | |
72 | [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], | |
73 | - png_ok=yes, | |
74 | - png_ok=no) | |
75 | + [png_ok=yes]) | |
76 | AC_MSG_RESULT($png_ok) | |
77 | if test "$png_ok" = yes; then | |
78 | PNG='png'; LIBPNG='-lpng -lz' | |
79 | else | |
80 | - AC_MSG_WARN(*** PNG saving code will not be built (PNG library is too old) ***) | |
81 | + AC_MSG_WARN([*** PNG saving code will not be built (PNG library is too old) ***]) | |
82 | fi | |
83 | else | |
84 | - AC_MSG_WARN(*** PNG saving code will not be built (PNG header file not found) ***) | |
85 | + AC_MSG_WARN([*** PNG saving code will not be built (PNG header file not found) ***]) | |
86 | fi | |
87 | fi | |
88 | if test "x$png_ok" = "xyes" ; then | |
89 | @@ -199,44 +192,11 @@ | |
90 | AC_SUBST(LIBJPEG) | |
91 | AC_SUBST(LIBPNG) | |
92 | ||
93 | - | |
94 | dnl ****************************** | |
95 | dnl More compiler warnings | |
96 | dnl ****************************** | |
97 | ||
98 | -AC_ARG_ENABLE(more-warnings, | |
99 | -[ --enable-more-warnings Maximum compiler warnings], | |
100 | -set_more_warnings="$enableval",[set_more_warnings=no]) | |
101 | -warning_flags= | |
102 | -realsave_CFLAGS="$CFLAGS" | |
103 | -AC_MSG_CHECKING(for more warnings, including -Werror) | |
104 | -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then | |
105 | - AC_MSG_RESULT(yes) | |
106 | - warning_flags="-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Werror" | |
107 | - CFLAGS="$warning_flags $CFLAGS" | |
108 | - | |
109 | - for option in -Wsign-promo -Wno-sign-compare; do | |
110 | - SAVE_CFLAGS="$CFLAGS" | |
111 | - CFLAGS="$CFLAGS $option" | |
112 | - AC_MSG_CHECKING([whether gcc understands $option]) | |
113 | - AC_TRY_COMPILE([], [], | |
114 | - has_option=yes, | |
115 | - has_option=no,) | |
116 | - CFLAGS="$SAVE_CFLAGS" | |
117 | - AC_MSG_RESULT($has_option) | |
118 | - if test $has_option = yes; then | |
119 | - warning_flags="$warning_flags $option" | |
120 | - fi | |
121 | - unset has_option | |
122 | - unset SAVE_CFLAGS | |
123 | - done | |
124 | - unset option | |
125 | -else | |
126 | - AC_MSG_RESULT(no) | |
127 | -fi | |
128 | -CFLAGS="$realsave_CFLAGS" | |
129 | -EXTRA_WARNING_CFLAGS="$warning_flags" | |
130 | -AC_SUBST(EXTRA_WARNING_CFLAGS) | |
131 | +GNOME_COMPILE_WARNINGS | |
132 | ||
133 | AC_OUTPUT([ | |
134 | Makefile |