summaryrefslogtreecommitdiff
blob: fea929d99fe4c9998cfbfb0d52c125fbc1d4614a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
diff -Nru a/configure.in b/configure.in
--- a/configure.in	2009-02-11 09:54:10.000000000 +0000
+++ b/configure.in	2009-02-11 09:59:28.000000000 +0000
@@ -36,13 +36,8 @@
   CPPFLAGS="$CPPFLAGS -DUSE_GTK2"
   AC_MSG_RESULT(Compiling for GTK2)
   ])
-if test "$compile_for" = "gtk2" ; then
-  AM_PATH_GTK_2_0(2.2.0, ,
-            AC_MSG_ERROR(Cannot find GTK2.))
-else
-  AM_PATH_GTK(1.2.0, ,
-            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
-fi
+AM_PATH_GTK_2_0(2.2.0, ,
+		AC_MSG_ERROR(Cannot find GTK2.))
 
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
@@ -59,28 +54,6 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [ ])
 
-dnl Use -Wall if we have gcc.
-if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[[\ \	]-Wall[\ \	]]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-  case " $CFLAGS " in
-  *[[\ \	]-s[\ \	]]*) ;;
-  *) CFLAGS="$CFLAGS -s" ;;
-  esac
-  case `gcc --version` in
-  2.95*|2.96*|2.97*)
-  case " $CFLAGS " in
-  *[[\ \	]-fno-omit-frame-pointer[\ \	]]*) ;;
-  *) CFLAGS="$CFLAGS -fno-omit-frame-pointer" ;;
-  esac
-  AC_MSG_RESULT(Buggy GCC version: compiling with -fno-omit-frame-pointer)
-  ;;
-  *) ;;
-  esac
-fi
-
 AC_ARG_WITH(french-labels,
   [  --with-french-labels    Enables french labels in menus],[
   CPPFLAGS="$CPPFLAGS -DFRENCH"