← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.raring-precise.backport

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Nate Muench
  • Date: 2012-01-23 16:09:45 UTC
  • mfrom: (1.4.6) (2.4.26 sid)
  • Revision ID: package-import@ubuntu.com-20120123160945-b6s0r1vkcovucpf3
Tags: 2011.12.20-562307-0ubuntu1
https://launchpad.net/bugs/898289
https://launchpad.net/bugs/905612
https://launchpad.net/bugs/598933
https://launchpad.net/bugs/604998
* Merge latest upstream git tag. Fixes building on Precise
  (LP: #898289, LP: #905612)

* Items merged from Debian unstable:
  - debian/control:
    + open-vm-tools recommends open-vm-dkms. (LP: #598933)
    + open-vm-tools now suggests open-vm-toolbox. (LP: #604998)
  (From 2011.08.21-471295-1 release)
  - Updating maintainer and uploaders fields.
  - Removing vcs fields.
  - Removing references to Daniel's old email address.
  - Updating years in copyright file.
  - Updating to standards version 3.9.2.
  - Updating to debhelper version 8.
  - Switching to source format 3.0 (quilt).
  - Removing manual chrpath setting.
  - Removing exclusion from plugins from debhelper shlibs.
  - Rediffing kvers.patch.
  (From 2011.09.23-491607-1 release)
  - Marking binary architecture-dependend packages as linux and kfreebsd
  only.
  - Removing liburiparser-dev from build-depends as upstream dropped
  unity support.
  - Building with libproc-dev on amd64 again.
  - Dropping disabling of dnet support.
  (From 2011.09.23-491607-2 release)
  - Adding doxygen to build-depends for api documentation.
  - Adding libcunit1-dev to build-depends for test suites.
  - Minimizing rules file.
  - Adding open-vm-tools-dev package, containing only the api
    documentation for now.
  (From 2011.09.23-491607-3 release)
  - Sorting overrides in rules alphabetically.
  - Compacting copyright file.
  - Adding udev rule to set timeout for vmware scsi devices
  (From 2011.12.20-562307-1 release)
  - Adding patch to correct typo in upstreams dkms configuration

* Remaining Changes:
  - Remove Stable part of version numbering.
  - debian folder:
    + Re-added open-vm-dkms.postinst & open-vm-dkms.prerm.
      * Allows dkms modules to compile upon installation.
  - debian/control:
    + Re-add open-vm-source and make into a transitional package
      for open-vm-toolbox.
    + Return dependancies that were moved to open-vm-tools back to
      open-vm-toolbox.
  - debian/rules and debian/open-vm-toolbox.lintian-overrides:
    + Make vmware-user-suid-wrapper suid-root
  - debian/rules:
    + Added CFLAGS field with -Wno-deprecated-declarations
      * Will suppress issues with glib 2.31 or later.
    + Add line to copy vmware-xdg-detect-de into place.
    + Install vmware-user.desktop through toolbox package.
  - debian/open-vm-tools.init:
    + Re-add 'modprobe [-r] vmblock'.
    + Add 'modprobe [-r] vmxnet'.
      * Incase it's not loaded during boot.
    + Remove and re-add pcnet32 module
      * Will be done before (remove) and after (readd) vmxnet module
        is added.
      * If vmxnet doesn't exist (aka modules fail to build), pcnet32 can be
        still used for network connectivity.
      * Workaround until a better fix can be done.
  - Re-add gnome-session to debian/local/xautostart.conf
  - Manpages removed (from debian/manpages):
    + vmmemctl.9
    + vmxnet3.9
    + Remove references to manpages that have been removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
39
39
### Initialization
40
40
###
41
41
 
42
 
TOOLS_VERSION="2011.07.19"
 
42
TOOLS_VERSION="2011.12.20"
43
43
AC_INIT(
44
44
   [open-vm-tools],
45
 
   [2011.07.19],
 
45
   [2011.12.20],
46
46
   [open-vm-tools-devel@lists.sourceforge.net])
47
47
 
48
48
# In order to make this configure script auto-detect situations where
175
175
   [enable_multimon="$enableval"],
176
176
   [enable_multimon="yes"])
177
177
 
178
 
AC_ARG_ENABLE(
179
 
   unity,
180
 
   AS_HELP_STRING(
181
 
      [--disable-unity],
182
 
      [disables Unity, enabled by default]),
183
 
   [enable_unity="$enableval"],
184
 
   [enable_unity="yes"])
185
 
 
186
178
AC_ARG_WITH(
187
179
   gtk2,
188
180
   AS_HELP_STRING(
215
207
   [enable_tests="$enableval"],
216
208
   [enable_tests="auto"])
217
209
 
218
 
# If we're not going to use Gtk 2.0, disable Unity.
219
 
if test "$with_gtk2" != "yes"; then
220
 
   enable_unity="no"
221
 
fi
222
 
 
223
210
AM_INIT_AUTOMAKE
224
211
 
225
212
###
382
369
#
383
370
# Check for PAM.
384
371
#
385
 
if test "$os" = "linux"; then
386
 
   AC_ARG_WITH([pam],
387
 
      [AS_HELP_STRING([--without-pam],
388
 
      [compiles without PAM support.])],
389
 
      [],
390
 
      [with_pam=yes])
 
372
AC_ARG_WITH([pam],
 
373
   [AS_HELP_STRING([--without-pam],
 
374
   [compiles without PAM support.])],
 
375
   [],
 
376
   [with_pam=yes])
391
377
 
392
 
   if test "$with_pam" = "yes"; then
393
 
      AC_VMW_DEFAULT_FLAGS([PAM])
394
 
      AC_VMW_CHECK_LIB([pam],
395
 
                       [PAM],
396
 
                       [],
397
 
                       [],
398
 
                       [],
399
 
                       [security/pam_appl.h],
400
 
                       [pam_start],
401
 
                       [PAM_CPPFLAGS="$PAM_CPPFLAGS -DUSE_PAM"],
402
 
                       [AC_VMW_LIB_ERROR([PAM], [pam])])
403
 
   fi
 
378
if test "$with_pam" = "yes"; then
 
379
   AC_VMW_DEFAULT_FLAGS([PAM])
 
380
   AC_VMW_CHECK_LIB([pam],
 
381
                    [PAM],
 
382
                    [],
 
383
                    [],
 
384
                    [],
 
385
                    [security/pam_appl.h],
 
386
                    [pam_start],
 
387
                    [PAM_CPPFLAGS="$PAM_CPPFLAGS -DUSE_PAM"],
 
388
                    [AC_VMW_LIB_ERROR([PAM], [pam])])
404
389
fi
405
390
 
406
391
#
429
414
# If the user explicitly disables X11, then don't try to detect the X-related libraries
430
415
if test "$have_x" = "disabled"; then
431
416
   enable_multimon="no"
432
 
   enable_unity="no"
433
417
elif test "$have_x" != "yes"; then
434
418
   AC_MSG_ERROR(
435
419
      [The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s).])
461
445
         [AC_MSG_ERROR(
462
446
            [libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s).])],
463
447
         [$COMMON_XLIBS])
464
 
   else
465
 
      if test "$enable_unity" != "no"; then
466
 
         AC_MSG_WARN([Disabling Unity due to --disable-multimon.])
467
 
         enable_unity="no"
468
 
      fi
469
448
   fi
470
449
 
471
450
   AC_CHECK_LIB(
529
508
      have_xcomposite="yes"
530
509
   fi
531
510
 
532
 
   # If we're building with support for Unity, we'll need a few additional
533
 
   # libraries.
534
 
   if test "$enable_unity" != "no"; then
535
 
           # Unity needs the X11 Screen Saver extension library. It should be
536
 
           # in the same place as the X11 libraries, so no need for any fancy
537
 
           # path checking.
538
 
           AC_VMW_CHECK_X11_LIB(
539
 
              [Xss],
540
 
              [X11/extensions/scrnsaver.h],
541
 
              [XScreenSaverQueryExtension],
542
 
              [AC_MSG_ERROR([libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package.])])
543
 
 
544
 
           # Check for the uriparser library and headers. The upstream uriparser
545
 
           # doesn't appear to ship with either a pkg-config file or a
546
 
           # uriparser-config binary, so we'll look for it the old-fashioned
547
 
           # way.
548
 
           #
549
 
           # Note that we look for uriFreeQueryListA because it's a relatively
550
 
           # new symbol that our code needs (it isn't present in the uriparser
551
 
           # that shipped with Ubuntu Hardy).
552
 
           AC_VMW_DEFAULT_FLAGS([URIPARSER], [uriparser])
553
 
           AC_VMW_CHECK_LIB([uriparser],
554
 
                            [URIPARSER],
555
 
                            [],
556
 
                            [],
557
 
                            [],
558
 
                            [Uri.h],
559
 
                            [uriFreeQueryListA],
560
 
                            [],
561
 
                            [AC_MSG_ERROR([uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package.])])
562
 
 
563
 
           # Check for libpng.
564
 
           AC_VMW_CHECK_LIB([png12],
565
 
                            [LIBPNG],
566
 
                            [libpng12],
567
 
                            [libpng-config],
568
 
                            [],
569
 
                            [png.h],
570
 
                            [png_access_version_number],
571
 
                            [],
572
 
                            [AC_MSG_ERROR([libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package])])
573
 
 
574
 
           # Check for the zlib library and headers. Like uriparser, there
575
 
           # isn't a pkg-config or zlib-config file.
576
 
           AC_VMW_DEFAULT_FLAGS([ZLIB])
577
 
           AC_VMW_CHECK_LIB([z],
578
 
                            [ZLIB],
579
 
                            [],
580
 
                            [],
581
 
                            [],
582
 
                            [zlib.h],
583
 
                            [zlibVersion],
584
 
                            [],
585
 
                            [AC_MSG_ERROR([zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package.])])
586
 
 
587
 
           # Check for gio 2.24.
588
 
           AC_VMW_CHECK_LIB([gio-2.0],
589
 
                            [GIO],
590
 
                            [gio-unix-2.0],
591
 
                            [],
592
 
                            [2.24.0],
593
 
                            [gio/gio.h],
594
 
                            [g_desktop_app_info_get_filename],
595
 
                            [],
596
 
                            [AC_MSG_ERROR([GLib/GIO 2.24+ not found.  Please configure without Unity (using --disable-unity) or upgrade the Glib devel package.])])
597
 
   fi # End of library checks for Unity.
598
 
 
599
511
   # Check whether we have gtk+ 2.0.
600
512
   if test "$with_gtk2" != "no"; then
601
513
      # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
609
521
                       [gdk_display_get_default_group],
610
522
                       [GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"],
611
523
                       [AC_MSG_ERROR([Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package.])])
612
 
 
613
 
      # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
614
 
      # provide via "pkg-config --libs gtk+-2.0".
615
 
      if test "$enable_unity" != "no"; then
616
 
         AC_CHECK_LIB(
617
 
            [gdk_pixbuf_xlib-2.0],
618
 
            [gdk_pixbuf_xlib_init],
619
 
            [GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"],
620
 
            [AC_MSG_ERROR([gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity).])],
621
 
            [$GTK_LIBS])
622
 
      fi
623
524
   fi
624
525
 
625
526
   #
843
744
 
844
745
   # Easier to give all modules the ICU defines/includes...
845
746
   CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
 
747
else
 
748
   CPPFLAGS="$CPPFLAGS -DNO_ICU"
846
749
fi
847
750
 
848
751
AC_PATH_PROG(
899
802
       #include <X11/Xmd.h>])
900
803
fi
901
804
 
 
805
bsdPrintfWrappers=no
 
806
if test "$os" = "linux"; then
 
807
   AC_CHECK_LIB([c],
 
808
                [ecvt],
 
809
                [bsdPrintfWrappers=yes],
 
810
                [])
 
811
fi
 
812
 
902
813
###
903
814
### Typdefs, structs, and compiler quarks.
904
815
###
941
852
   CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
942
853
done
943
854
CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
944
 
CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
 
855
CPPFLAGS="$CPPFLAGS"
945
856
 
946
857
# -fvisibility is used by "core service" plugins, but not required.
947
858
ORIGINAL_CFLAGS="$CFLAGS"
954
865
               [AC_MSG_RESULT(no)])
955
866
CFLAGS="$ORIGINAL_CFLAGS"
956
867
 
 
868
# Detect "unused-but-set-variable" gcc warning and disable it.
 
869
ORIGINAL_CFLAGS="$CFLAGS"
 
870
CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
 
871
AC_MSG_CHECKING([for GCC flag -Wno-unused-but-set-variable])
 
872
AC_TRY_COMPILE([],
 
873
               [return 0;],
 
874
               [ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
 
875
                AC_MSG_RESULT(yes)],
 
876
               [AC_MSG_RESULT(no)])
 
877
CFLAGS="$ORIGINAL_CFLAGS"
 
878
 
 
879
 
957
880
BUILDDIR="`pwd`"
958
881
 
959
882
INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
1025
948
fi
1026
949
 
1027
950
if test "$os" = "freebsd"; then
 
951
   LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
1028
952
   MODULES_DIR="/boot/modules"
1029
953
 
1030
954
   if test "$osVersion" -ge 302000; then
1100
1024
AM_CONDITIONAL(WITH_KERNEL_MODULES, test "$with_kernel_modules" = "yes")
1101
1025
AM_CONDITIONAL(HAVE_XSM, test "$have_xsm" = "yes")
1102
1026
AM_CONDITIONAL(HAVE_XCOMPOSITE, test "$have_xcomposite" = "yes")
1103
 
AM_CONDITIONAL(ENABLE_UNITY, test "$enable_unity" = "yes")
1104
1027
AM_CONDITIONAL(ENABLE_TESTS, test "$have_cunit" = "yes")
1105
1028
AM_CONDITIONAL(WITH_ROOT_PRIVILEGES, test "$with_root_privileges" = "yes")
1106
1029
AM_CONDITIONAL(HAVE_DNET, test "$have_dnet" = "yes")
1110
1033
AM_CONDITIONAL(HAVE_GTKMM, test "$have_x" = "yes" -a "$with_gtkmm" = "yes")
1111
1034
AM_CONDITIONAL(HAVE_PAM, test "$with_pam" = "yes")
1112
1035
AM_CONDITIONAL(USE_SLASH_PROC, test "os" = "linux" -a "$have_glib_2_14" = "yes")
 
1036
AM_CONDITIONAL(USE_PRINTF_WRAPPERS, test "$bsdPrintfWrappers" = "yes")
1113
1037
 
1114
1038
if test "$have_xsm" != "yes"; then
1115
1039
AC_DEFINE([NO_XSM], 1, [])
1226
1150
   lib/err/Makefile                    \
1227
1151
   lib/file/Makefile                   \
1228
1152
   lib/foundryMsg/Makefile             \
 
1153
   lib/glibUtils/Makefile              \
1229
1154
   lib/guestApp/Makefile               \
1230
1155
   lib/guestRpc/Makefile               \
1231
1156
   lib/hgfs/Makefile                   \
1234
1159
   lib/hgfsServer/Makefile             \
1235
1160
   lib/hgfsServerManagerGuest/Makefile \
1236
1161
   lib/hgfsServerPolicyGuest/Makefile  \
1237
 
   lib/image/Makefile                  \
1238
1162
   lib/impersonate/Makefile            \
1239
1163
   lib/lock/Makefile                   \
1240
1164
   lib/message/Makefile                \
1244
1168
   lib/panicDefault/Makefile           \
1245
1169
   lib/printer/Makefile                \
1246
1170
   lib/procMgr/Makefile                \
1247
 
   lib/raster/Makefile                 \
1248
 
   lib/region/Makefile                 \
1249
1171
   lib/rpcChannel/Makefile             \
1250
1172
   lib/rpcIn/Makefile                  \
1251
1173
   lib/rpcOut/Makefile                 \
1272
1194
   services/plugins/powerOps/Makefile  \
1273
1195
   services/plugins/resolutionSet/Makefile \
1274
1196
   services/plugins/timeSync/Makefile  \
1275
 
   services/plugins/unity/Makefile     \
1276
1197
   services/plugins/vix/Makefile       \
1277
1198
   services/plugins/vmbackup/Makefile  \
1278
1199
   vmware-user-suid-wrapper/Makefile   \