← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/RDP/client/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/RDP/client/configure.ac
1
 
AC_INIT(rdesktop, 1.6.0)
 
1
AC_INIT(rdesktop, 1.7.0)
2
2
 
3
3
AC_CONFIG_SRCDIR([rdesktop.c])
4
4
 
38
38
AC_CHECK_HEADER(sys/strtio.h, AC_DEFINE(HAVE_SYS_STRTIO_H))
39
39
AC_CHECK_HEADER(locale.h, AC_DEFINE(HAVE_LOCALE_H))
40
40
AC_CHECK_HEADER(langinfo.h, AC_DEFINE(HAVE_LANGINFO_H))
 
41
AC_CHECK_HEADER(sysexits.h, AC_DEFINE(HAVE_SYSEXITS_H))
41
42
 
42
43
AC_CHECK_TOOL(STRIP, strip, :)
43
44
 
106
107
LIBS="$LIBS -L$ssldir/lib -lcrypto"
107
108
rpath="$rpath:$ssldir/lib"
108
109
             ])
 
110
# xrandr
 
111
if test -n "$PKG_CONFIG"; then
 
112
    PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
 
113
fi
 
114
if test x"$HAVE_XRANDR" = "x1"; then
 
115
    CFLAGS="$CFLAGS $XRANDR_CFLAGS"
 
116
    LIBS="$LIBS $XRANDR_LIBS"
 
117
    AC_DEFINE(HAVE_XRANDR)
 
118
fi
109
119
 
110
120
AC_ARG_ENABLE(smartcard,
111
121
             [  --enable-smartcard        Enables smart-card support.
527
537
[
528
538
   AC_CHECK_TYPE([socklen_t], ,[
529
539
      AC_MSG_CHECKING([for socklen_t equivalent])
530
 
      AC_CACHE_VAL([socklen_t_equiv],
 
540
      AC_CACHE_VAL([socklen_t_cv_equiv],
531
541
      [
532
542
         # Systems have either "struct sockaddr *" or
533
543
         # "void *" as the second argument to getpeername
534
 
         socklen_t_equiv=
 
544
         socklen_t_cv_equiv=
535
545
         for arg2 in "struct sockaddr" void; do
536
546
            for t in int size_t unsigned long "unsigned long"; do
537
547
               AC_TRY_COMPILE([
543
553
                  $t len;
544
554
                  getpeername(0,0,&len);
545
555
               ],[
546
 
                  socklen_t_equiv="$t"
 
556
                  socklen_t_cv_equiv="$t"
547
557
                  break
548
558
               ])
549
559
            done
550
560
         done
551
561
 
552
 
         if test "x$socklen_t_equiv" = x; then
 
562
         if test "x$socklen_t_cv_equiv" = x; then
553
563
            AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
554
564
         fi
555
565
      ])
556
 
      AC_MSG_RESULT($socklen_t_equiv)
557
 
      AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
 
566
      AC_MSG_RESULT($socklen_t_cv_equiv)
 
567
      AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_cv_equiv,
558
568
                        [type to use in place of socklen_t if not defined])],
559
569
      [#include <sys/types.h>
560
570
#include <sys/socket.h>])