282 lines
7.8 KiB
Diff
282 lines
7.8 KiB
Diff
|
diff -up gutenprint-5.2.12-pre3/configure.ac.O6 gutenprint-5.2.12-pre3/configure.ac
|
||
|
|
--- gutenprint-5.2.12-pre3/configure.ac.O6 2016-10-14 10:41:54.290398824 +0200
|
||
|
|
+++ gutenprint-5.2.12-pre3/configure.ac 2016-10-14 10:44:04.921328215 +0200
|
||
|
|
@@ -638,27 +638,6 @@ AH_TEMPLATE(PKGMODULEDIR,, [Package modu
|
||
|
|
PKGMODULEDIR="${PACKAGE_LIB_DIR}/${GUTENPRINT_RELEASE_VERSION}/modules"
|
||
|
|
AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
|
||
|
|
|
||
|
|
-dnl Compiler flags
|
||
|
|
-if test x$ac_compiler_gnu = "xyes"; then
|
||
|
|
- 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])
|
||
|
|
- if test x${USE_MAINTAINER_MODE} = xyes ; then
|
||
|
|
- STP_ADD_COMPILER_ARGS([-D_POSIX_C_SOURCE=200809L -std=c99 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
|
||
|
|
- fi
|
||
|
|
- if test x$ENABLE_DEBUG = xyes ; then
|
||
|
|
- STP_ADD_COMPILER_ARG([-g])
|
||
|
|
- else
|
||
|
|
- STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
|
||
|
|
- fi
|
||
|
|
-else
|
||
|
|
- if test x$ENABLE_DEBUG = xyes ; then
|
||
|
|
- STP_ADD_COMPILER_ARG([-g])
|
||
|
|
- else
|
||
|
|
- STP_ADD_FIRST_COMPILER_ARG([-O])
|
||
|
|
- fi
|
||
|
|
-fi
|
||
|
|
-if test x$ENABLE_PROFILE = xyes ; then
|
||
|
|
- STP_ADD_COMPILER_ARG([-pg])
|
||
|
|
-fi
|
||
|
|
AC_SUBST(GNUCFLAGS)
|
||
|
|
|
||
|
|
AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
|
||
|
|
diff -up gutenprint-5.2.12-pre3/configure.O6 gutenprint-5.2.12-pre3/configure
|
||
|
|
--- gutenprint-5.2.12-pre3/configure.O6 2016-10-14 10:41:54.293398800 +0200
|
||
|
|
+++ gutenprint-5.2.12-pre3/configure 2016-10-14 10:53:25.392709079 +0200
|
||
|
|
@@ -17651,246 +17651,6 @@ cat >>confdefs.h <<_ACEOF
|
||
|
|
#define PKGMODULEDIR "$PKGMODULEDIR"
|
||
|
|
_ACEOF
|
||
|
|
|
||
|
|
-
|
||
|
|
-if test x$ac_compiler_gnu = "xyes"; then
|
||
|
|
-
|
||
|
|
- 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
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- GNUCFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
- done
|
||
|
|
-
|
||
|
|
- if test x${USE_MAINTAINER_MODE} = xyes ; then
|
||
|
|
-
|
||
|
|
- for stp_ac_arg in -D_POSIX_C_SOURCE=200809L -std=c99 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls ; do
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- GNUCFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
- done
|
||
|
|
-
|
||
|
|
- fi
|
||
|
|
- if test x$ENABLE_DEBUG = xyes ; then
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports -g" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports -g... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${CFLAGS} -g"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- CFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
- else
|
||
|
|
-
|
||
|
|
- for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
|
||
|
|
- stp_ac_save_CFLAGS="${CFLAGS}"
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${CFLAGS} ${stp_ac_arg}"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- CFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
- test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
|
||
|
|
- done
|
||
|
|
-
|
||
|
|
- fi
|
||
|
|
-else
|
||
|
|
- if test x$ENABLE_DEBUG = xyes ; then
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports -g" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports -g... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${CFLAGS} -g"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- CFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
- else
|
||
|
|
-
|
||
|
|
- for stp_ac_arg in -O ; do
|
||
|
|
- stp_ac_save_CFLAGS="${CFLAGS}"
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports ${stp_ac_arg}" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${CFLAGS} ${stp_ac_arg}"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- CFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
- test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
|
||
|
|
- done
|
||
|
|
-
|
||
|
|
- fi
|
||
|
|
-fi
|
||
|
|
-if test x$ENABLE_PROFILE = xyes ; then
|
||
|
|
-
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ${CC} supports -pg" >&5
|
||
|
|
-$as_echo_n "checking if ${CC} supports -pg... " >&6; }
|
||
|
|
- stp_acOLDCFLAGS="${CFLAGS}"
|
||
|
|
- CFLAGS="${CFLAGS} -pg"
|
||
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
-/* end confdefs.h. */
|
||
|
|
-
|
||
|
|
-int
|
||
|
|
-main ()
|
||
|
|
-{
|
||
|
|
-
|
||
|
|
- ;
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-_ACEOF
|
||
|
|
-if ac_fn_c_try_compile "$LINENO"; then :
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
|
|
-$as_echo "yes" >&6; };
|
||
|
|
- stp_newCFLAGS="$CFLAGS"
|
||
|
|
-else
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
|
-$as_echo "no" >&6; };
|
||
|
|
- stp_newCFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
-fi
|
||
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
|
- CFLAGS="$stp_acOLDCFLAGS"
|
||
|
|
- CFLAGS="${stp_newCFLAGS}"
|
||
|
|
-
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-
|
||
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports __attribute__ syntax" >&5
|
||
|
|
$as_echo_n "checking if $CC supports __attribute__ syntax... " >&6; }
|
||
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|