e2410a5
diff -up gutenprint-5.2.7/configure.ac.O6 gutenprint-5.2.7/configure.ac
e2410a5
--- gutenprint-5.2.7/configure.ac.O6	2011-05-02 03:20:49.000000000 +0200
e2410a5
+++ gutenprint-5.2.7/configure.ac	2011-05-05 12:40:29.000000000 +0200
a27e7de
@@ -625,27 +625,6 @@ AH_TEMPLATE(PKGMODULEDIR,, [Package modu
a27e7de
 PKGMODULEDIR="${PACKAGE_LIB_DIR}/${GUTENPRINT_RELEASE_VERSION}/modules"
a27e7de
 AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
a27e7de
 
a27e7de
-dnl Compiler flags
a27e7de
-if test x$ac_compiler_gnu = "xyes"; then
a27e7de
-  STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072],, [GNUCFLAGS])
a27e7de
-  if test x${USE_MAINTAINER_MODE} = xyes ; then
a27e7de
-    STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
a27e7de
-  fi
a27e7de
-  if test x$ENABLE_DEBUG = xyes ; then
a27e7de
-    STP_ADD_COMPILER_ARG([-g])
a27e7de
-  else
a27e7de
-    STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
a27e7de
-  fi
a27e7de
-else
a27e7de
-  if test x$ENABLE_DEBUG = xyes ; then
a27e7de
-    STP_ADD_COMPILER_ARG([-g])
a27e7de
-  else
a27e7de
-    STP_ADD_FIRST_COMPILER_ARG([-O])
a27e7de
-  fi
a27e7de
-fi
a27e7de
-if test x$ENABLE_PROFILE = xyes ; then
a27e7de
-  STP_ADD_COMPILER_ARG([-pg])
a27e7de
-fi
a27e7de
 AC_SUBST(GNUCFLAGS)
a27e7de
 
a27e7de
 AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
e2410a5
diff -up gutenprint-5.2.7/configure.O6 gutenprint-5.2.7/configure
e2410a5
--- gutenprint-5.2.7/configure.O6	2011-05-02 03:32:21.000000000 +0200
e2410a5
+++ gutenprint-5.2.7/configure	2011-05-05 12:52:09.000000000 +0200
e2410a5
@@ -16589,246 +16589,6 @@ cat >>confdefs.h <<_ACEOF
e2410a5
 #define PKGMODULEDIR "$PKGMODULEDIR"
ceb4d1a
 _ACEOF
ceb4d1a
 
e2410a5
-
ceb4d1a
-if test x$ac_compiler_gnu = "xyes"; then
ceb4d1a
-
a27e7de
-  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 ; do
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  GNUCFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-  done
ceb4d1a
-
ceb4d1a
-  if test x${USE_MAINTAINER_MODE} = xyes ; then
ceb4d1a
-
ceb4d1a
-  for stp_ac_arg in -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls ; do
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  GNUCFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-  done
ceb4d1a
-
ceb4d1a
-  fi
ceb4d1a
-  if test x$ENABLE_DEBUG = xyes ; then
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports -g" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports -g... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${CFLAGS} -g"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  CFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-  else
ceb4d1a
-
ceb4d1a
-  for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
ceb4d1a
-    stp_ac_save_CFLAGS="${CFLAGS}"
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${CFLAGS} ${stp_ac_arg}"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  CFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-    test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
ceb4d1a
-  done
ceb4d1a
-
ceb4d1a
-  fi
ceb4d1a
-else
ceb4d1a
-  if test x$ENABLE_DEBUG = xyes ; then
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports -g" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports -g... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${CFLAGS} -g"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  CFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-  else
ceb4d1a
-
ceb4d1a
-  for stp_ac_arg in -O ; do
ceb4d1a
-    stp_ac_save_CFLAGS="${CFLAGS}"
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${CFLAGS} ${stp_ac_arg}"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  CFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-    test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
ceb4d1a
-  done
ceb4d1a
-
ceb4d1a
-  fi
ceb4d1a
-fi
ceb4d1a
-if test x$ENABLE_PROFILE = xyes ; then
ceb4d1a
-
e2410a5
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports -pg" >&5
d04f4d5
-$as_echo_n "checking if ${CC} supports -pg... " >&6; }
ceb4d1a
-  stp_acOLDCFLAGS="${CFLAGS}"
ceb4d1a
-  CFLAGS="${CFLAGS} -pg"
e2410a5
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ceb4d1a
-/* end confdefs.h.  */
ceb4d1a
-
ceb4d1a
-int
ceb4d1a
-main ()
ceb4d1a
-{
ceb4d1a
-
ceb4d1a
-  ;
ceb4d1a
-  return 0;
ceb4d1a
-}
ceb4d1a
-_ACEOF
e2410a5
-if ac_fn_c_try_compile "$LINENO"; then :
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
d04f4d5
-$as_echo "yes" >&6; };
ceb4d1a
-        stp_newCFLAGS="$CFLAGS"
ceb4d1a
-else
e2410a5
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
d04f4d5
-$as_echo "no" >&6; };
ceb4d1a
-	stp_newCFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-fi
ceb4d1a
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ceb4d1a
-  CFLAGS="$stp_acOLDCFLAGS"
ceb4d1a
-  CFLAGS="${stp_newCFLAGS}"
ceb4d1a
-
ceb4d1a
-fi
d04f4d5
-
d04f4d5
-
d04f4d5
-
e2410a5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __attribute__ syntax" >&5
d04f4d5
 $as_echo_n "checking if $CC supports __attribute__ syntax... " >&6; }
e2410a5
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext