$OpenBSD: patch-giscanner_utils_py,v 1.4 2012/09/21 13:19:40 jasper Exp $ Make sure try to compile/link with the right libtool, this overrides the --libtool option to girscanner. --- giscanner/utils.py.orig Fri Jul 20 15:37:12 2012 +++ giscanner/utils.py Thu Sep 20 13:02:31 2012 @@ -110,22 +110,8 @@ def get_libtool_command(options): if not libtool_infection: return None - libtool_path = options.libtool_path - if libtool_path: - # Automake by default sets: - # LIBTOOL = $(SHELL) $(top_builddir)/libtool - # To be strictly correct we would have to parse shell. For now - # we simply split(). - return libtool_path.split(' ') - - try: - subprocess.check_call(['libtool', '--version'], - stdout=open(os.devnull)) - except (subprocess.CalledProcessError, OSError), e: - # If libtool's not installed, assume we don't need it - return None - - return ['libtool'] + libtool_cmd = os.environ.get('LIBTOOL', '/usr/bin/libtool') + return libtool_cmd.split() def files_are_identical(path1, path2):