Reverted previous change. New systemd-devel does provide libudev.pc after all.
This commit is contained in:
Tim Waugh
parent
c041075b67
commit
9e92f511bb
@ -1,633 +0,0 @@
|
|||||||
diff -up system-config-printer-1.3.9/configure.in.libudev system-config-printer-1.3.9/configure.in
|
|
||||||
--- system-config-printer-1.3.9/configure.in.libudev 2012-03-01 14:16:35.000000000 +0000
|
|
||||||
+++ system-config-printer-1.3.9/configure.in 2012-07-31 14:32:35.221388826 +0100
|
|
||||||
@@ -42,7 +42,7 @@ AC_ARG_WITH(udev-rules,
|
|
||||||
AM_CONDITIONAL([UDEV_RULES], [test x$with_udev_rules != xno])
|
|
||||||
|
|
||||||
if test x$with_udev_rules != xno; then
|
|
||||||
- PKG_CHECK_MODULES(libudev, libudev, has_libudev=yes, has_libudev=no)
|
|
||||||
+ AC_CHECK_HEADER([libudev.h], has_libudev=yes, has_libudev=no)
|
|
||||||
PKG_CHECK_MODULES(libusb, libusb, has_libusb=yes, has_libusb=no)
|
|
||||||
if test x$has_glib == xno -o \
|
|
||||||
x$has_libudev == xno -o \
|
|
||||||
diff -up system-config-printer-1.3.9/configure.libudev system-config-printer-1.3.9/configure
|
|
||||||
--- system-config-printer-1.3.9/configure.libudev 2012-07-31 14:32:53.646272927 +0100
|
|
||||||
+++ system-config-printer-1.3.9/configure 2012-07-31 14:33:00.271234355 +0100
|
|
||||||
@@ -564,6 +564,42 @@ PACKAGE_URL=''
|
|
||||||
|
|
||||||
ac_unique_file="system-config-printer.py"
|
|
||||||
gt_needs=
|
|
||||||
+# Factoring default headers for most tests.
|
|
||||||
+ac_includes_default="\
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#ifdef HAVE_SYS_TYPES_H
|
|
||||||
+# include <sys/types.h>
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_SYS_STAT_H
|
|
||||||
+# include <sys/stat.h>
|
|
||||||
+#endif
|
|
||||||
+#ifdef STDC_HEADERS
|
|
||||||
+# include <stdlib.h>
|
|
||||||
+# include <stddef.h>
|
|
||||||
+#else
|
|
||||||
+# ifdef HAVE_STDLIB_H
|
|
||||||
+# include <stdlib.h>
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_STRING_H
|
|
||||||
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
|
||||||
+# include <memory.h>
|
|
||||||
+# endif
|
|
||||||
+# include <string.h>
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_STRINGS_H
|
|
||||||
+# include <strings.h>
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_INTTYPES_H
|
|
||||||
+# include <inttypes.h>
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_STDINT_H
|
|
||||||
+# include <stdint.h>
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_UNISTD_H
|
|
||||||
+# include <unistd.h>
|
|
||||||
+#endif"
|
|
||||||
+
|
|
||||||
ac_subst_vars='am__EXEEXT_FALSE
|
|
||||||
am__EXEEXT_TRUE
|
|
||||||
LTLIBOBJS
|
|
||||||
@@ -573,8 +609,6 @@ HAVE_SYSTEMD_TRUE
|
|
||||||
systemdsystemunitdir
|
|
||||||
libusb_LIBS
|
|
||||||
libusb_CFLAGS
|
|
||||||
-libudev_LIBS
|
|
||||||
-libudev_CFLAGS
|
|
||||||
UDEV_RULES_FALSE
|
|
||||||
UDEV_RULES_TRUE
|
|
||||||
GLIB_LIBS
|
|
||||||
@@ -622,6 +656,7 @@ DATADIRNAME
|
|
||||||
am__fastdepCC_FALSE
|
|
||||||
am__fastdepCC_TRUE
|
|
||||||
CCDEPMODE
|
|
||||||
+am__nodep
|
|
||||||
AMDEPBACKSLASH
|
|
||||||
AMDEP_FALSE
|
|
||||||
AMDEP_TRUE
|
|
||||||
@@ -660,6 +695,13 @@ INTLTOOL_PROP_RULE
|
|
||||||
INTLTOOL_KEYS_RULE
|
|
||||||
INTLTOOL_DIRECTORY_RULE
|
|
||||||
INTLTOOL_DESKTOP_RULE
|
|
||||||
+intltool__v_merge_options_0
|
|
||||||
+intltool__v_merge_options_
|
|
||||||
+INTLTOOL_V_MERGE_OPTIONS
|
|
||||||
+INTLTOOL__v_MERGE_0
|
|
||||||
+INTLTOOL__v_MERGE_
|
|
||||||
+INTLTOOL_V_MERGE
|
|
||||||
+AM_DEFAULT_VERBOSITY
|
|
||||||
INTLTOOL_EXTRACT
|
|
||||||
INTLTOOL_MERGE
|
|
||||||
INTLTOOL_UPDATE
|
|
||||||
@@ -747,13 +789,12 @@ LDFLAGS
|
|
||||||
LIBS
|
|
||||||
CPPFLAGS
|
|
||||||
CPP
|
|
||||||
+PYTHON
|
|
||||||
PKG_CONFIG
|
|
||||||
PKG_CONFIG_PATH
|
|
||||||
PKG_CONFIG_LIBDIR
|
|
||||||
GLIB_CFLAGS
|
|
||||||
GLIB_LIBS
|
|
||||||
-libudev_CFLAGS
|
|
||||||
-libudev_LIBS
|
|
||||||
libusb_CFLAGS
|
|
||||||
libusb_LIBS'
|
|
||||||
|
|
||||||
@@ -1406,6 +1447,7 @@ Some influential environment variables:
|
|
||||||
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
|
||||||
you have headers in a nonstandard directory <include dir>
|
|
||||||
CPP C preprocessor
|
|
||||||
+ PYTHON the Python interpreter
|
|
||||||
PKG_CONFIG path to pkg-config utility
|
|
||||||
PKG_CONFIG_PATH
|
|
||||||
directories to add to pkg-config's search path
|
|
||||||
@@ -1413,10 +1455,6 @@ Some influential environment variables:
|
|
||||||
path overriding pkg-config's built-in search path
|
|
||||||
GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
|
|
||||||
GLIB_LIBS linker flags for GLIB, overriding pkg-config
|
|
||||||
- libudev_CFLAGS
|
|
||||||
- C compiler flags for libudev, overriding pkg-config
|
|
||||||
- libudev_LIBS
|
|
||||||
- linker flags for libudev, overriding pkg-config
|
|
||||||
libusb_CFLAGS
|
|
||||||
C compiler flags for libusb, overriding pkg-config
|
|
||||||
libusb_LIBS linker flags for libusb, overriding pkg-config
|
|
||||||
@@ -1730,6 +1768,124 @@ fi
|
|
||||||
as_fn_set_status $ac_retval
|
|
||||||
|
|
||||||
} # ac_fn_c_try_run
|
|
||||||
+
|
|
||||||
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
|
||||||
+# -------------------------------------------------------
|
|
||||||
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
|
||||||
+# the include files in INCLUDES and setting the cache variable VAR
|
|
||||||
+# accordingly.
|
|
||||||
+ac_fn_c_check_header_mongrel ()
|
|
||||||
+{
|
|
||||||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
||||||
+ if eval \${$3+:} false; then :
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
||||||
+$as_echo_n "checking for $2... " >&6; }
|
|
||||||
+if eval \${$3+:} false; then :
|
|
||||||
+ $as_echo_n "(cached) " >&6
|
|
||||||
+fi
|
|
||||||
+eval ac_res=\$$3
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
+$as_echo "$ac_res" >&6; }
|
|
||||||
+else
|
|
||||||
+ # Is the header compilable?
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
|
|
||||||
+$as_echo_n "checking $2 usability... " >&6; }
|
|
||||||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+$4
|
|
||||||
+#include <$2>
|
|
||||||
+_ACEOF
|
|
||||||
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
+ ac_header_compiler=yes
|
|
||||||
+else
|
|
||||||
+ ac_header_compiler=no
|
|
||||||
+fi
|
|
||||||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
|
|
||||||
+$as_echo "$ac_header_compiler" >&6; }
|
|
||||||
+
|
|
||||||
+# Is the header present?
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
|
|
||||||
+$as_echo_n "checking $2 presence... " >&6; }
|
|
||||||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+#include <$2>
|
|
||||||
+_ACEOF
|
|
||||||
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
||||||
+ ac_header_preproc=yes
|
|
||||||
+else
|
|
||||||
+ ac_header_preproc=no
|
|
||||||
+fi
|
|
||||||
+rm -f conftest.err conftest.i conftest.$ac_ext
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
|
||||||
+$as_echo "$ac_header_preproc" >&6; }
|
|
||||||
+
|
|
||||||
+# So? What about this header?
|
|
||||||
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
|
|
||||||
+ yes:no: )
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
|
||||||
+ ;;
|
|
||||||
+ no:yes:* )
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
|
||||||
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
|
||||||
+ ;;
|
|
||||||
+esac
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
||||||
+$as_echo_n "checking for $2... " >&6; }
|
|
||||||
+if eval \${$3+:} false; then :
|
|
||||||
+ $as_echo_n "(cached) " >&6
|
|
||||||
+else
|
|
||||||
+ eval "$3=\$ac_header_compiler"
|
|
||||||
+fi
|
|
||||||
+eval ac_res=\$$3
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
+$as_echo "$ac_res" >&6; }
|
|
||||||
+fi
|
|
||||||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
||||||
+
|
|
||||||
+} # ac_fn_c_check_header_mongrel
|
|
||||||
+
|
|
||||||
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
|
||||||
+# -------------------------------------------------------
|
|
||||||
+# Tests whether HEADER exists and can be compiled using the include files in
|
|
||||||
+# INCLUDES, setting the cache variable VAR accordingly.
|
|
||||||
+ac_fn_c_check_header_compile ()
|
|
||||||
+{
|
|
||||||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
||||||
+$as_echo_n "checking for $2... " >&6; }
|
|
||||||
+if eval \${$3+:} false; then :
|
|
||||||
+ $as_echo_n "(cached) " >&6
|
|
||||||
+else
|
|
||||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+$4
|
|
||||||
+#include <$2>
|
|
||||||
+_ACEOF
|
|
||||||
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
+ eval "$3=yes"
|
|
||||||
+else
|
|
||||||
+ eval "$3=no"
|
|
||||||
+fi
|
|
||||||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
+fi
|
|
||||||
+eval ac_res=\$$3
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
+$as_echo "$ac_res" >&6; }
|
|
||||||
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
||||||
+
|
|
||||||
+} # ac_fn_c_check_header_compile
|
|
||||||
cat >config.log <<_ACEOF
|
|
||||||
This file contains any messages produced by compilers while
|
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
|
||||||
@@ -2581,11 +2737,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
|
|
||||||
|
|
||||||
# We need awk for the "check" target. The system "awk" is bad on
|
|
||||||
# some platforms.
|
|
||||||
-# Always define AMTAR for backward compatibility.
|
|
||||||
-
|
|
||||||
-AMTAR=${AMTAR-"${am_missing_run}tar"}
|
|
||||||
+# Always define AMTAR for backward compatibility. Yes, it's still used
|
|
||||||
+# in the wild :-( We should find a proper way to deprecate it ...
|
|
||||||
+AMTAR='$${TAR-tar}'
|
|
||||||
|
|
||||||
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
|
|
||||||
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -2657,6 +2813,7 @@ fi
|
|
||||||
if test "x$enable_dependency_tracking" != xno; then
|
|
||||||
am_depcomp="$ac_aux_dir/depcomp"
|
|
||||||
AMDEPBACKSLASH='\'
|
|
||||||
+ am__nodep='_no'
|
|
||||||
fi
|
|
||||||
if test "x$enable_dependency_tracking" != xno; then
|
|
||||||
AMDEP_TRUE=
|
|
||||||
@@ -3470,6 +3627,7 @@ else
|
|
||||||
# instance it was reported that on HP-UX the gcc test will end up
|
|
||||||
# making a dummy file named `D' -- because `-MD' means `put the output
|
|
||||||
# in D'.
|
|
||||||
+ rm -rf conftest.dir
|
|
||||||
mkdir conftest.dir
|
|
||||||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
|
||||||
# using a relative directory.
|
|
||||||
@@ -3529,7 +3687,7 @@ else
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
- msvisualcpp | msvcmsys)
|
|
||||||
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
|
||||||
# This compiler won't grok `-c -o', but also, the minuso test has
|
|
||||||
# not run yet. These depmodes are late enough in the game, and
|
|
||||||
# so weak that their functioning should not be impacted.
|
|
||||||
@@ -3595,14 +3753,12 @@ case "$am__api_version" in
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
||||||
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
|
|
||||||
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
||||||
if test -n ""; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5
|
|
||||||
$as_echo_n "checking for intltool >= ... " >&6; }
|
|
||||||
-
|
|
||||||
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
||||||
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
|
|
||||||
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
|
|
||||||
-
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
|
|
||||||
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
|
|
||||||
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
|
|
||||||
@@ -3733,25 +3889,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$IN
|
|
||||||
as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
|
|
||||||
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+if test -z "$AM_DEFAULT_VERBOSITY"; then
|
|
||||||
+ AM_DEFAULT_VERBOSITY=1
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
|
|
||||||
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
|
|
||||||
+INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
|
|
||||||
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
|
|
||||||
+intltool__v_merge_options_0='-q'
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
|
|
||||||
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
|
|
||||||
+else
|
|
||||||
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
|
|
||||||
+fi
|
|
||||||
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -4070,7 +4249,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/nu
|
|
||||||
if test $? -ne 0; then
|
|
||||||
as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
|
|
||||||
else
|
|
||||||
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
|
|
||||||
+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
|
|
||||||
$as_echo "$IT_PERL_VERSION" >&6; }
|
|
||||||
fi
|
|
||||||
@@ -6477,9 +6656,11 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>co
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+
|
|
||||||
+
|
|
||||||
# Find any Python interpreter.
|
|
||||||
if test -z "$PYTHON"; then
|
|
||||||
- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
|
|
||||||
+ for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
|
|
||||||
do
|
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
||||||
set dummy $ac_prog; ac_word=$2
|
|
||||||
@@ -6567,7 +6748,7 @@ $as_echo "$am_cv_python_platform" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
|
|
||||||
$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
|
|
||||||
if ${am_cv_python_pythondir+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
@@ -6578,8 +6759,7 @@ else
|
|
||||||
else
|
|
||||||
am_py_prefix=$prefix
|
|
||||||
fi
|
|
||||||
- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
|
|
||||||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
|
|
||||||
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
|
|
||||||
case $am_cv_python_pythondir in
|
|
||||||
$am_py_prefix*)
|
|
||||||
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
|
|
||||||
@@ -6605,7 +6785,7 @@ $as_echo "$am_cv_python_pythondir" >&6;
|
|
||||||
pkgpythondir=\${pythondir}/$PACKAGE
|
|
||||||
|
|
||||||
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
|
|
||||||
$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
|
|
||||||
if ${am_cv_python_pyexecdir+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
@@ -6616,8 +6796,7 @@ else
|
|
||||||
else
|
|
||||||
am_py_exec_prefix=$exec_prefix
|
|
||||||
fi
|
|
||||||
- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
|
|
||||||
- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
|
|
||||||
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
|
|
||||||
case $am_cv_python_pyexecdir in
|
|
||||||
$am_py_exec_prefix*)
|
|
||||||
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
|
|
||||||
@@ -6886,76 +7065,144 @@ fi
|
|
||||||
|
|
||||||
|
|
||||||
if test x$with_udev_rules != xno; then
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
|
||||||
+$as_echo_n "checking for ANSI C header files... " >&6; }
|
|
||||||
+if ${ac_cv_header_stdc+:} false; then :
|
|
||||||
+ $as_echo_n "(cached) " >&6
|
|
||||||
+else
|
|
||||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <stdarg.h>
|
|
||||||
+#include <string.h>
|
|
||||||
+#include <float.h>
|
|
||||||
|
|
||||||
-pkg_failed=no
|
|
||||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libudev" >&5
|
|
||||||
-$as_echo_n "checking for libudev... " >&6; }
|
|
||||||
+int
|
|
||||||
+main ()
|
|
||||||
+{
|
|
||||||
|
|
||||||
-if test -n "$libudev_CFLAGS"; then
|
|
||||||
- pkg_cv_libudev_CFLAGS="$libudev_CFLAGS"
|
|
||||||
- elif test -n "$PKG_CONFIG"; then
|
|
||||||
- if test -n "$PKG_CONFIG" && \
|
|
||||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
|
|
||||||
- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
|
|
||||||
- ac_status=$?
|
|
||||||
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
- test $ac_status = 0; }; then
|
|
||||||
- pkg_cv_libudev_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
|
|
||||||
+ ;
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+_ACEOF
|
|
||||||
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
||||||
+ ac_cv_header_stdc=yes
|
|
||||||
else
|
|
||||||
- pkg_failed=yes
|
|
||||||
+ ac_cv_header_stdc=no
|
|
||||||
fi
|
|
||||||
- else
|
|
||||||
- pkg_failed=untried
|
|
||||||
-fi
|
|
||||||
-if test -n "$libudev_LIBS"; then
|
|
||||||
- pkg_cv_libudev_LIBS="$libudev_LIBS"
|
|
||||||
- elif test -n "$PKG_CONFIG"; then
|
|
||||||
- if test -n "$PKG_CONFIG" && \
|
|
||||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
|
|
||||||
- ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
|
|
||||||
- ac_status=$?
|
|
||||||
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
- test $ac_status = 0; }; then
|
|
||||||
- pkg_cv_libudev_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
|
|
||||||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
+
|
|
||||||
+if test $ac_cv_header_stdc = yes; then
|
|
||||||
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
||||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+#include <string.h>
|
|
||||||
+
|
|
||||||
+_ACEOF
|
|
||||||
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
||||||
+ $EGREP "memchr" >/dev/null 2>&1; then :
|
|
||||||
+
|
|
||||||
else
|
|
||||||
- pkg_failed=yes
|
|
||||||
+ ac_cv_header_stdc=no
|
|
||||||
fi
|
|
||||||
- else
|
|
||||||
- pkg_failed=untried
|
|
||||||
+rm -f conftest*
|
|
||||||
+
|
|
||||||
fi
|
|
||||||
|
|
||||||
+if test $ac_cv_header_stdc = yes; then
|
|
||||||
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
|
||||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+#include <stdlib.h>
|
|
||||||
|
|
||||||
+_ACEOF
|
|
||||||
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
||||||
+ $EGREP "free" >/dev/null 2>&1; then :
|
|
||||||
|
|
||||||
-if test $pkg_failed = yes; then
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
-$as_echo "no" >&6; }
|
|
||||||
+else
|
|
||||||
+ ac_cv_header_stdc=no
|
|
||||||
+fi
|
|
||||||
+rm -f conftest*
|
|
||||||
|
|
||||||
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
- _pkg_short_errors_supported=yes
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+if test $ac_cv_header_stdc = yes; then
|
|
||||||
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
|
|
||||||
+ if test "$cross_compiling" = yes; then :
|
|
||||||
+ :
|
|
||||||
else
|
|
||||||
- _pkg_short_errors_supported=no
|
|
||||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
+/* end confdefs.h. */
|
|
||||||
+#include <ctype.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#if ((' ' & 0x0FF) == 0x020)
|
|
||||||
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
||||||
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
|
||||||
+#else
|
|
||||||
+# define ISLOWER(c) \
|
|
||||||
+ (('a' <= (c) && (c) <= 'i') \
|
|
||||||
+ || ('j' <= (c) && (c) <= 'r') \
|
|
||||||
+ || ('s' <= (c) && (c) <= 'z'))
|
|
||||||
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
|
||||||
+int
|
|
||||||
+main ()
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+ for (i = 0; i < 256; i++)
|
|
||||||
+ if (XOR (islower (i), ISLOWER (i))
|
|
||||||
+ || toupper (i) != TOUPPER (i))
|
|
||||||
+ return 2;
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+_ACEOF
|
|
||||||
+if ac_fn_c_try_run "$LINENO"; then :
|
|
||||||
+
|
|
||||||
+else
|
|
||||||
+ ac_cv_header_stdc=no
|
|
||||||
+fi
|
|
||||||
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
||||||
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
- if test $_pkg_short_errors_supported = yes; then
|
|
||||||
- libudev_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev" 2>&1`
|
|
||||||
- else
|
|
||||||
- libudev_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev" 2>&1`
|
|
||||||
- fi
|
|
||||||
- # Put the nasty error message in config.log where it belongs
|
|
||||||
- echo "$libudev_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
- has_libudev=no
|
|
||||||
-elif test $pkg_failed = untried; then
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
-$as_echo "no" >&6; }
|
|
||||||
- has_libudev=no
|
|
||||||
+fi
|
|
||||||
+fi
|
|
||||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
|
|
||||||
+$as_echo "$ac_cv_header_stdc" >&6; }
|
|
||||||
+if test $ac_cv_header_stdc = yes; then
|
|
||||||
+
|
|
||||||
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
|
||||||
+
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
|
||||||
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
|
||||||
+ inttypes.h stdint.h unistd.h
|
|
||||||
+do :
|
|
||||||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
||||||
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
|
||||||
+"
|
|
||||||
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
|
||||||
+ cat >>confdefs.h <<_ACEOF
|
|
||||||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
||||||
+_ACEOF
|
|
||||||
+
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ac_fn_c_check_header_mongrel "$LINENO" "libudev.h" "ac_cv_header_libudev_h" "$ac_includes_default"
|
|
||||||
+if test "x$ac_cv_header_libudev_h" = xyes; then :
|
|
||||||
+ has_libudev=yes
|
|
||||||
else
|
|
||||||
- libudev_CFLAGS=$pkg_cv_libudev_CFLAGS
|
|
||||||
- libudev_LIBS=$pkg_cv_libudev_LIBS
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
-$as_echo "yes" >&6; }
|
|
||||||
- has_libudev=yes
|
|
||||||
+ has_libudev=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
+
|
|
||||||
+
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb" >&5
|
|
||||||
$as_echo_n "checking for libusb... " >&6; }
|
|
||||||
@ -1,14 +1,13 @@
|
|||||||
Summary: A printer administration tool
|
Summary: A printer administration tool
|
||||||
Name: system-config-printer
|
Name: system-config-printer
|
||||||
Version: 1.3.9
|
Version: 1.3.9
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
|
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
|
||||||
Patch1: system-config-printer-no-applet-in-gnome.patch
|
Patch1: system-config-printer-no-applet-in-gnome.patch
|
||||||
Patch2: system-config-printer-udev-sys-path.patch
|
Patch2: system-config-printer-udev-sys-path.patch
|
||||||
Patch3: system-config-printer-libudev.patch
|
|
||||||
BuildRequires: cups-devel >= 1.2
|
BuildRequires: cups-devel >= 1.2
|
||||||
BuildRequires: desktop-file-utils >= 0.2.92
|
BuildRequires: desktop-file-utils >= 0.2.92
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
@ -66,8 +65,6 @@ printers.
|
|||||||
%patch1 -p1 -b .no-applet-in-gnome
|
%patch1 -p1 -b .no-applet-in-gnome
|
||||||
# replace udev_get_sys_path() with hard-coded "/sys"
|
# replace udev_get_sys_path() with hard-coded "/sys"
|
||||||
%patch2 -p1 -b .sys-path
|
%patch2 -p1 -b .sys-path
|
||||||
# Fixed build against systemd-devel now there is no libudev-devel.
|
|
||||||
%patch3 -p1 -b .libudev
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-udev-rules
|
%configure --with-udev-rules
|
||||||
@ -188,6 +185,10 @@ if [ $1 -ge 1 ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 31 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-5
|
||||||
|
- Reverted previous change. New systemd-devel does provide libudev.pc
|
||||||
|
after all.
|
||||||
|
|
||||||
* Tue Jul 31 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-4
|
* Tue Jul 31 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-4
|
||||||
- Fixed build against systemd-devel now there is no libudev-devel.
|
- Fixed build against systemd-devel now there is no libudev-devel.
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user