Attachment #133325 for bug #157746

Lines 838-844 AC_CHECK_HEADERS(cthreads.h pthread.h ke Link Here

(-)vlc-0.9.0-svn/configure.ac (-1 / +1 lines)
838	fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"	838	fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
839		839
840	dnl Find where are the X headers and libraries	840	dnl Find where are the X headers and libraries
841	AC_PATH_XTRA()	841	AC_PATH_X()
842		842
843	dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal.	843	dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal.
844		844

Lines 46-52 EXTRA_LTLIBRARIES = ${extra_ltlibs} Link Here

(-)vlc-0.9.0-svn/modules/genmf (-1 / +1 lines)
46	include Modules.am	46	include Modules.am
47		47
48	if HAVE_PLUGINS	48	if HAVE_PLUGINS
49	LTLIBVLC = -L\$(top_builddir)/src -lvlc	49	LTLIBVLC = \$(top_builddir)/src/libvlc.la
50		50
51	AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\	51	AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
52	-module -no-undefined -shrext \$(LIBEXT)	52	-module -no-undefined -shrext \$(LIBEXT)




  shift
done

is_builtin_gcc_libdir() {
	local _libdir="$1"
	local x

	for x in `${CC:-gcc} -print-search-dirs | \
		${AWK:-awk} '/^libraries:/ {
			sub(/^libraries:[^\/]*/, "", $0);
			split($0, libs, ":");
			for (x in libs)
				printf("%s ", libs[x]);
		}'`
	do
		if cd "${x}" 1>/dev/null 2>&1 ; then
			local _pwd=`pwd`
			test "${_libdir}" = "-L${_pwd}" && return 0
		fi
	done

	return 1
}

libs="-L@libdir@"
# Only add -L$libdir if it is not in te default search path of CC
is_builtin_gcc_libdir "${libs}" && libs=""

#
#  If a module was requested, use its name

    done
    register_flags "vlc"
  fi
  new_libs=""
  # Only add -L<libdir> if it is not in te default search path of CC
  for x in ${libs} ${ldflags} ; do
    is_builtin_gcc_libdir "${x}" || new_libs="${new_libs} ${x}"
  done
  echo "${new_libs}"
fi


Return to bug 157746

Lines 232-238 while test $# -gt 0; do Link Here

(-)vlc-0.9.0-svn/vlc-config.in.in (-1 / +30 lines)
232	shift	232	shift
233	done	233	done
234		234
		235	is_builtin_gcc_libdir() {
		236	local _libdir="$1"
		237	local x
		238
		239	for x in `${CC:-gcc} -print-search-dirs \| \
		240	${AWK:-awk} '/^libraries:/ {
		241	sub(/^libraries:[^\/]*/, "", $0);
		242	split($0, libs, ":");
		243	for (x in libs)
		244	printf("%s ", libs[x]);
		245	}'`
		246	do
		247	if cd "${x}" 1>/dev/null 2>&1 ; then
		248	local _pwd=`pwd`
		249	test "${_libdir}" = "-L${_pwd}" && return 0
		250	fi
		251	done
		252
		253	return 1
		254	}
		255
235	libs="-L@libdir@"	256	libs="-L@libdir@"
		257	# Only add -L$libdir if it is not in te default search path of CC
		258	is_builtin_gcc_libdir "${libs}" && libs=""
236		259
237	#	260	#
238	# If a module was requested, use its name	261	# If a module was requested, use its name
Lines 335-339 if test "${echo_libs}" = yes; then Link Here
335	done	358	done
336	register_flags "vlc"	359	register_flags "vlc"
337	fi	360	fi
338	echo "${libs} ${ldflags}"	361	new_libs=""
		362	# Only add -L<libdir> if it is not in te default search path of CC
		363	for x in ${libs} ${ldflags} ; do
		364	is_builtin_gcc_libdir "${x}" \|\| new_libs="${new_libs} ${x}"
		365	done
		366	echo "${new_libs}"
339	fi	367	fi
		368