← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kde-i18n-tg/maverick

« back to all changes in this revision

Viewing changes to admin/acinclude.m4.in

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2007-05-24 10:18:42 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070524101842-ak01xkfxrpicf1t8
Tags: 4:3.5.7-0ubuntu1
new upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
admin/acinclude.m4.in
983
983
  X_INCLUDES="-I$x_includes"
984
984
fi
985
985
 
986
 
if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
 
986
if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
987
987
  X_LDFLAGS=""
988
988
  x_libraries="/usr/lib"; dnl better than nothing :-
989
989
 else
3198
3198
        case $host in
3199
3199
          *-*-linux-gnu)        
3200
3200
            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
3201
 
            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
 
3201
            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
3202
3202
            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
3203
3203
            KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
3204
3204
          ;;
5215
5215
      for dir in $javadirs; do
5216
5216
          dnl Check for the java executable
5217
5217
          if test -x "$dir/java"; then
 
5218
              sane_path=$(cd $dir; /bin/pwd)
5218
5219
              dnl And also check for a libjvm.so somewhere under there
5219
5220
              dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
5220
 
              if test "$dir" != "/usr/bin"; then
 
5221
              if test "$sane_path" != "/usr/bin"; then
5221
5222
                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
5222
5223
                  if test ! -f $libjvmdir/libjvm.so; then continue; fi
5223
5224
                  jredirs="$jredirs $dir"