37fb32fe13
This is known to fix the build of audio/picard, and maybe other ports as well. Reported by: erwin
60 lines
2 KiB
Text
60 lines
2 KiB
Text
--- configure.orig 2008-07-24 06:53:32.000000000 -0400
|
|
+++ configure 2008-08-11 00:23:15.000000000 -0400
|
|
@@ -1596,8 +1596,8 @@ od -A n -t x1 $TMPO | grep -q '42 *49 *4
|
|
|
|
if check_func dlopen; then
|
|
ldl=
|
|
-elif check_func dlopen -ldl; then
|
|
- ldl=-ldl
|
|
+elif check_func dlopen ; then
|
|
+ ldl=
|
|
fi
|
|
|
|
check_func fork
|
|
@@ -1718,10 +1718,17 @@ fi
|
|
if enabled vhook; then
|
|
check_ldflags -rdynamic
|
|
check_ldflags -export-dynamic
|
|
+ if enabled imlib2; then
|
|
+ check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
|
|
+ fi
|
|
+ if enabled freetype2; then
|
|
+ check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
|
|
+ fi
|
|
+else
|
|
+ disable imlib2
|
|
+ disable freetype2
|
|
fi
|
|
|
|
-check_foo_config imlib2 imlib2 Imlib2.h imlib_load_font
|
|
-check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
|
|
|
|
##########################################
|
|
# SDL check
|
|
@@ -2072,7 +2079,7 @@ get_version(){
|
|
eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
|
|
lcname=$(tolower $name)
|
|
eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
|
|
- eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
|
|
+ eval echo "${lcname}_VERSION_MAJOR=1" >> config.mak
|
|
}
|
|
|
|
get_version LIBSWSCALE libswscale/swscale.h
|
|
@@ -2096,7 +2103,7 @@ if enabled shared; then
|
|
echo "SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}" >> config.mak
|
|
fi
|
|
echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
|
|
-echo "EXTRALIBS=$extralibs" >> config.mak
|
|
+echo "EXTRALIBS=-L/usr/local/lib -L/usr/local/lib -L/usr/local/lib $extralibs" >> config.mak
|
|
|
|
print_config ARCH_ $TMPH config.mak $ARCH_LIST
|
|
print_config HAVE_ $TMPH config.mak $HAVE_LIST
|
|
@@ -2206,7 +2213,7 @@ Requires.private: $(enabled shared && ec
|
|
Conflicts:
|
|
Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
|
|
Libs.private: $(enabled shared && echo $libs)
|
|
-Cflags: -I\${includedir}
|
|
+Cflags: -I\${includedir} -I\${includedir}/ffmpeg
|
|
EOF
|
|
cat <<EOF > $name/$name-uninstalled.pc
|
|
prefix=
|