build-aux: search various Glib/GIO utilities in .pc file.
Some distributions are renaming Glib/GIO utilities for multi-arch reasons so pkg-config variables have been added to find the correct name of a tool. GTK+ should use these variables instead of searching in PATH. See glib#1796.
This commit is contained in:
		@ -27,7 +27,10 @@ if 'DESTDIR' not in os.environ:
 | 
				
			|||||||
                shutil.copyfile(installed_lib, installed_lib_dst)
 | 
					                shutil.copyfile(installed_lib, installed_lib_dst)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print('Compiling GSettings schemas...')
 | 
					    print('Compiling GSettings schemas...')
 | 
				
			||||||
    subprocess.call(['glib-compile-schemas',
 | 
					    glib_compile_schemas = subprocess.check_output(['pkg-config',
 | 
				
			||||||
 | 
					                                                   '--variable=glib_compile_schemas',
 | 
				
			||||||
 | 
					                                                   'gio-2.0']).strip()
 | 
				
			||||||
 | 
					    subprocess.call([glib_compile_schemas,
 | 
				
			||||||
                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
 | 
					                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print('Updating icon cache...')
 | 
					    print('Updating icon cache...')
 | 
				
			||||||
@ -43,4 +46,7 @@ if 'DESTDIR' not in os.environ:
 | 
				
			|||||||
    # Untested!
 | 
					    # Untested!
 | 
				
			||||||
    print('Updating module cache for print backends...')
 | 
					    print('Updating module cache for print backends...')
 | 
				
			||||||
    os.makedirs(gtk_printmodule_dir, exist_ok=True)
 | 
					    os.makedirs(gtk_printmodule_dir, exist_ok=True)
 | 
				
			||||||
    subprocess.call(['gio-querymodules', gtk_printmodule_dir])
 | 
					    gio_querymodules = subprocess.check_output(['pkg-config',
 | 
				
			||||||
 | 
					                                                '--variable=gio_querymodules',
 | 
				
			||||||
 | 
					                                                'gio-2.0']).strip()
 | 
				
			||||||
 | 
					    subprocess.call([gio_querymodules, gtk_printmodule_dir])
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user