blob: 45a0368d69d76a207b250713b30a766740b3a63f (
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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
--- configure.ac.orig 2013-04-12 08:56:35.279744148 +0400
+++ configure.ac 2013-04-12 08:57:09.576747084 +0400
@@ -1,6 +1,3 @@
-dnl preserve initial CFLAGS
-CFLAGS_OLD="$CFLAGS"
-
dnl initialize
AC_INIT(main.c)
VER=`head -1 $srcdir/README |sed 's/ *netrik \([[^ ]]*\).*/\1/'`
@@ -56,10 +53,6 @@
[AC_HELP_STRING([--disable-debug],
[do not include debug options and sanity checks])])
-AC_ARG_ENABLE(optimization,
- [AC_HELP_STRING([[--enable-optimization[[[=LEVEL]]]]],
- [use compiler optimization with -OLEVEL (default: -O2 if CFLAGS not set)])])
-
dnl process results
dnl define
if test x"$enable_debug" != "xno"; then
@@ -67,46 +60,5 @@
[Define if debug options and sanity checks are desired.])
fi
-dnl restore CFLAGS
-CFLAGS="$CFLAGS_OLD"
-
-dnl set default CFLAGS
-if test -z "$CFLAGS_OLD" ; then
- CFLAGS="$CFLAGS -g"
-
- dnl set warning options for GCC
- if test x"$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- fi
-fi
-
-dnl adjust optimization options
-case x"$enable_optimization" in
- dnl option given but no argument specified
- xyes)
- CFLAGS="$CFLAGS -O2"
- ;;
-
- dnl chosen not to optimize
- xno)
- dnl use -O0 to make sure no optimization is performed
- CFLAGS="$CFLAGS -O0"
- ;;
-
- dnl option not given
- x)
- dnl optimize if CFLAGS not specified
- if test -z "$CFLAGS_OLD"; then
- CFLAGS="$CFLAGS -O2"
- fi
- ;;
-
- dnl argument given
- *)
- dnl use argument to optimize
- CFLAGS="$CFLAGS -O${enable_optimization}"
- ;;
-esac
-
dnl generate Makefiles
AC_OUTPUT(Makefile doc/Makefile debian/Makefile)
|
GitWeb
