[Spice-commits] configure.ac src/Makefile.am

[Frediano Ziglio]

 configure.ac    |   15 ---------------
 src/Makefile.am |    1 -
 2 files changed, 16 deletions(-)

New commits:
commit 60e40117f968adba1323d48b29fefea437795c52
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Mon Apr 16 17:44:14 2018 -0300

    build: Remove check for pnp.ids path
    
    This looks like a leftover from the following commit, which removed the
    only reference for this file.
    
    commit 30986505ba6041c293c38cb4b7f4b618a59f4716
    Author: Marc-André Lureau <marcandre.lureau at redhat.com>
    Date:   Fri May 10 17:05:49 2013 +0200
    
        Remove GnomeRR code
    
        Changing client resolution is a bad idea, and never took up.
        Remove some unmaintained experimental code.
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/configure.ac b/configure.ac
index 17799c1..a9a7eb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,21 +164,6 @@ CFLAGS="$old_CFLAGS"
 PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [PKG_CHECK_MODULES(X11, x11)])
 AC_CHECK_HEADERS([X11/XKBlib.h])
 
-AC_ARG_WITH([pnp-ids-path],
-  AC_HELP_STRING([--with-pnp-ids-path],
-                 [Specify the path to pnp.ids @<:@default=(internal)@:>@]),
-  [],
-  [with_pnp_ids_path="\${pnpdatadir}/pnp.ids"])
-
-AM_CONDITIONAL(USE_INTERNAL_PNP_IDS, test "x$with_pnp_ids_path" = "x\${pnpdatadir}/pnp.ids")
-PNP_IDS=$with_pnp_ids_path
-AC_SUBST(PNP_IDS)
-if test "x$with_pnp_ids_path" = "x\${pnpdatadir}/pnp.ids"; then
-        EXTERNAL_PNP_IDS="no (internal)"
-else
-        EXTERNAL_PNP_IDS="$with_pnp_ids_path"
-fi
-
 AC_CHECK_FUNCS(clearenv strtok_r)
 
 # Keep these two definitions in agreement.
diff --git a/src/Makefile.am b/src/Makefile.am
index 1701cc6..f49c766 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,7 +67,6 @@ KEYMAP_CSV = keycodemapdb/data/keymaps.csv
 SPICE_COMMON_CPPFLAGS =						\
 	-DSPICE_COMPILATION					\
 	-DG_LOG_DOMAIN=\"GSpice\"				\
-	-DPNP_IDS=\""$(PNP_IDS)"\"				\
 	-DUSB_IDS=\""$(USB_IDS)"\"				\
 	-I$(top_srcdir)						\
 	$(COMMON_CFLAGS)					\