[gentoo-commits] gentoo-x86 commit in www-client/netrik/files: netrik-1.16.1-configure.patch

[gentoo-commits] gentoo-x86 commit in www-client/netrik/files: netrik-1.16.1-configure.patch

[Sergey Popov (pinkbyte)]

pinkbyte    13/04/12 05:01:00

  Added:                netrik-1.16.1-configure.patch
  Log:
  Respect CFLAGS, wrt bug #459660, thanks to Agostino Sarubbo
  
  (Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.1                  www-client/netrik/files/netrik-1.16.1-configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netrik/files/netrik-1.16.1-configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/netrik/files/netrik-1.16.1-configure.patch?rev=1.1&content-type=text/plain

Index: netrik-1.16.1-configure.patch
===================================================================
--- 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)