# HG changeset patch # User Matti Hamalainen # Date 1092274983 0 # Node ID 89844080b44bf61d0f96828018c22856739c9eb1 # Parent 676ec1a1ab93e529422b8c68fbe18eb9ffcb84bd Added more paths to search libsidplay* includes/libs from. diff -r 676ec1a1ab93 -r 89844080b44b acinclude.m4 --- a/acinclude.m4 Wed Aug 11 16:03:01 2004 +0000 +++ b/acinclude.m4 Thu Aug 12 01:43:03 2004 +0000 @@ -164,11 +164,11 @@ AC_DEFUN(MY_FIND_LIBSIDPLAY1, [ # Search common locations where header files might be stored. - xs_sidplay1_incdirs="$xs_sidplay1_includes /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include" + xs_sidplay1_incdirs="$xs_sidplay1_includes /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include" MY_FIND_FILE(sidplay/sidtune.h, $xs_sidplay1_incdirs, xs_sidplay1_includes) # Search common locations where library might be stored. - xs_sidplay1_libdirs="$xs_sidplay1_library /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay" + xs_sidplay1_libdirs="$xs_sidplay1_library /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib" MY_FIND_FILE(libsidplay.a libsidplay.so libsidplay.so.1 libsidplay.so.1.36 libsidplay.so.1.37, $xs_sidplay1_libdirs, xs_sidplay1_library) @@ -276,7 +276,7 @@ xs_sidplay2_cxxflags=`$PKG_CONFIG --cflags libsidplay2` else # Search common locations where header files might be stored. - xs_sidplay2_incdirs="$xs_sidplay2_includes $xs_sidplay2_includes/include" + xs_sidplay2_incdirs="$xs_sidplay2_includes $xs_sidplay2_includes/include /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include" MY_FIND_FILE(sidplay/sidplay2.h,$xs_sidplay2_incdirs,xs_sidplay2_includes) xs_sidplay2_cxxflags="-I$xs_sidplay2_includes" fi @@ -290,7 +290,7 @@ xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2` else # Search common locations where library might be stored. - xs_sidplay2_libdirs="$xs_sidplay2_library $xs_sidplay2_library/lib $xs_sidplay2_library/src" + xs_sidplay2_libdirs="$xs_sidplay2_library $xs_sidplay2_library/lib $xs_sidplay2_library/src /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib" MY_FIND_FILE(libsidplay2.la,$xs_sidplay2_libdirs,xs_sidplay2_library) xs_sidplay2_ldadd="-L$xs_sidplay2_library -lsidplay2" xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"