← Back to branch summary

~ubuntu-branches/debian/sid/kdevelop/sid

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Jeremy Lainé
  • Date: 2006-10-24 11:59:24 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061024115924-e5gecawlge1xhk75
Tags: 4:3.3.5-1
* New upstream release.
  + Contains up-to-date KDE admin dir in application templates.
* Remove patches included upstream:
  + 05_support_autoconf26.diff
  + 06_xim_crash_caused_by_qt.diff
  + 07_documentation_plugins_path.diff
* Fix not-binnmuable-any-depends-all kdevelop -> kdevelop-data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure
1992
1992
 
1993
1993
# Define the identity of the package.
1994
1994
 PACKAGE=kdevelop
1995
 
 VERSION=3.3.2
 
1995
 VERSION=3.3.5
1996
1996
 
1997
1997
 
1998
1998
cat >>confdefs.h <<_ACEOF
2296
2296
   { (exit 1); exit 1; }; }
2297
2297
  fi
2298
2298
  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
2299
 
  kde_libs_suffix=`$KDECONFIG --libsuffix`
2300
2299
 
2301
2300
  echo "$as_me:$LINENO: checking where to install" >&5
2302
2301
echo $ECHO_N "checking where to install... $ECHO_C" >&6
5593
5592
else
5594
5593
 
5595
5594
  kde_cv_opt_noinline_match=irrelevant
5596
 
    if echo "$CFLAGS" | grep -qe -O2 \
5597
 
     && echo "$CFLAGS" | grep -qe -fno-inline ; then
 
5595
    if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
 
5596
     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
5598
5597
 
5599
5598
    ac_cflags_save="$CFLAGS"
5600
5599
    CFLAGS="$CFLAGS -D_USE_GNU"
7142
7141
 
7143
7142
 
7144
7143
 
7145
 
    kdelibsuff="$kde_libs_suffix"
7146
 
    if test -z "$kdelibsuff"; then
7147
 
       kdelibsuff="auto"
7148
 
    fi
7149
7144
    # Check whether --enable-libsuffix or --disable-libsuffix was given.
7150
7145
if test "${enable_libsuffix+set}" = set; then
7151
7146
  enableval="$enable_libsuffix"
7152
7147
  kdelibsuff=$enableval
 
7148
else
 
7149
  kdelibsuff="auto"
7153
7150
fi;
7154
7151
 
7155
7152
    if test "$kdelibsuff" = "auto"; then
7160
7157
 return 0;
7161
7158
}
7162
7159
EOF
7163
 
        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[^\/]*/" | sed "s/lib//" | sed "s/\/*//g"`
 
7160
        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
 
7161
    s,.*/lib\([^\/]*\)/.*,\1,
 
7162
    p
 
7163
}'`
7164
7164
        rm -rf conftest.*
7165
7165
    fi
7166
7166
 
7167
 
    if test "$kdelibsuff" = "no"; then
 
7167
    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
7168
7168
       kdelibsuff=
7169
7169
    fi
7170
7170
    if test -z "$kdelibsuff"; then
24676
24676
#define HAVE_COREAUDIO 1
24677
24677
_ACEOF
24678
24678
 
24679
 
     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
 
24679
     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
24680
24680
 
24681
24681
fi
24682
24682