← Back to branch summary

~ubuntu-branches/ubuntu/utopic/open-vm-tools/utopic

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Bernd Zeimetz, 31c30832
  • Date: 2014-01-08 20:28:33 UTC
  • mfrom: (1.4.14) (2.4.42 sid)
  • Revision ID: package-import@ubuntu.com-20140108202833-l0ycdpzq5ayadedn
Tags: 2:9.4.0-1280544-5
[31c30832] Revert "Enable building of vmci again."
This reverts commit 0d55577cd3c262dbbc2bf79593d6f500f84c4170.
Too fast upload, sorry. vmhgfs is indeed (still) broken with
vmci.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
39
39
### Initialization
40
40
###
41
41
 
42
 
TOOLS_VERSION="2013.09.16"
 
42
TOOLS_VERSION="9.4.0"
43
43
AC_INIT(
44
44
   [open-vm-tools],
45
 
   [2013.09.16],
 
45
   [9.4.0],
46
46
   [open-vm-tools-devel@lists.sourceforge.net])
47
47
 
48
48
# In order to make this configure script auto-detect situations where
293
293
fi
294
294
 
295
295
#
296
 
# Check for glib 2.6.14 or greater.
 
296
# Check for glib 2.6.0 or greater.
297
297
#
298
298
AC_VMW_CHECK_LIB([glib-2.0],
299
299
                 [GLIB2],
300
300
                 [glib-2.0],
301
301
                 [],
302
 
                 [2.14.0],
 
302
                 [2.6.0],
303
303
                 [glib.h],
304
304
                 [g_key_file_new],
305
305
                 [],
306
 
                 [AC_MSG_ERROR([glib2 >= 2.14.0 is required.])])
307
 
 
 
306
                 [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
308
307
AC_VMW_CHECK_LIB([gmodule-2.0],
309
308
                 [GMODULE],
310
309
                 [gmodule-2.0],
311
310
                 [],
312
 
                 [2.14.0],
313
 
                 [],
314
 
                 [],
315
 
                 [],
316
 
                 [AC_MSG_ERROR([gmodule >= 2.14.0 is required.])])
 
311
                 [2.6.0],
 
312
                 [],
 
313
                 [],
 
314
                 [],
 
315
                 [AC_MSG_ERROR([gmodule >= 2.6.0 is required.])])
317
316
AC_VMW_CHECK_LIB([gobject-2.0],
318
317
                 [GOBJECT],
319
318
                 [gobject-2.0],
320
319
                 [],
321
 
                 [2.14.0],
 
320
                 [2.6.0],
322
321
                 [glib-object.h],
323
322
                 [],
324
323
                 [],
325
 
                 [AC_MSG_ERROR([gobject >= 2.14.0 is required.])])
 
324
                 [AC_MSG_ERROR([gobject >= 2.6.0 is required.])])
326
325
AC_VMW_CHECK_LIB([gthread-2.0],
327
326
                 [GTHREAD],
328
327
                 [gthread-2.0],
329
328
                 [],
330
 
                 [2.14.0],
331
 
                 [],
332
 
                 [],
333
 
                 [],
334
 
                 [AC_MSG_ERROR([glib >= 2.14.0 is required.])])
 
329
                 [2.6.0],
 
330
                 [],
 
331
                 [],
 
332
                 [],
 
333
                 [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
335
334
AC_CHECK_PROG([have_genmarshal],
336
335
              [glib-genmarshal],
337
336
              [yes],
342
341
fi
343
342
 
344
343
#
 
344
# Parts of our Linux code require more recent version of glib
 
345
#
 
346
if test "$os" = "linux"; then
 
347
   AC_VMW_CHECK_LIB([glib-2.0],
 
348
                    [GLIB2],
 
349
                    [glib-2.0],
 
350
                    [],
 
351
                    [2.14.0],
 
352
                    [glib.h],
 
353
                    [g_regex_new],
 
354
                    [have_glib_2_14=yes],
 
355
                    [AC_MSG_WARN([glib is not recent enough, some features will be disabled.])])
 
356
fi
 
357
 
 
358
#
345
359
# Check for fuse.
346
360
#
347
361
AC_VMW_CHECK_LIB([fuse],
585
599
fi
586
600
 
587
601
if test "$with_procps" = "yes"; then
588
 
 
 
602
   if test -z "$CUSTOM_PROCPS_NAME"; then
 
603
      CUSTOM_PROCPS_NAME=proc
 
604
   fi
 
605
 
 
606
   # XXX: no pkg-config and no procps-config means we need to
 
607
   # hard-code a sensible default.
 
608
   if test -z "$CUSTOM_PROCPS_LIBS"; then
 
609
      CUSTOM_PROCPS_LIBS="-L/lib"
 
610
   fi
 
611
 
 
612
   # Some distros provide libproc-${version}.so only, others provide the
 
613
   # libproc.so symlink. Try both to see what sticks (but only try the 3.2.7
 
614
   # and 3.2.8 versions - adding every possible version here would be a mess).
 
615
   #
 
616
   # Users can help by providing CUSTOM_PROCPS_NAME / CUSTOM_PROCPS_LIBS if
 
617
   # necessary.
589
618
   have_procps=no
590
619
 
591
 
   if test -z "$CUSTOM_PROCPS_NAME" && test -z "$CUSTOM_PROCPS_LIBS"; then
592
 
      # See if we have procps-ng (that finally supports pkg-config).
593
 
      AC_VMW_CHECK_LIB([procps-ng],
594
 
                       [PROCPS],
595
 
                       [libprocps],
596
 
                       [],
597
 
                       [],
598
 
                       [],
599
 
                       [],
600
 
                       [
601
 
                        have_procps=yes;
602
 
                       ],
603
 
                       [])
604
 
   fi
605
 
 
606
 
   if test "$have_procps" = "no"; then
607
 
      # Let's see if there is an older procps version, one that does not
608
 
      # support pkg-config.
609
 
      if test -z "$CUSTOM_PROCPS_NAME"; then
610
 
         CUSTOM_PROCPS_NAME=proc
611
 
      fi
612
 
 
613
 
      # XXX: no pkg-config and no procps-config means we need to
614
 
      # hard-code a sensible default.
615
 
      if test -z "$CUSTOM_PROCPS_LIBS"; then
616
 
         CUSTOM_PROCPS_LIBS="-L/lib"
617
 
      fi
618
 
 
619
 
      # Some distros provide libproc-${version}.so only, others provide the
620
 
      # libproc.so symlink. Try both to see what sticks (but only try the 3.2.7
621
 
      # and 3.2.8 versions - adding every possible version here would be a mess).
622
 
      #
623
 
      # Users can help by providing CUSTOM_PROCPS_NAME / CUSTOM_PROCPS_LIBS if
624
 
      # necessary.
625
 
      AC_VMW_CHECK_LIB([$CUSTOM_PROCPS_NAME],
626
 
                       [PROCPS],
627
 
                       [],
628
 
                       [],
629
 
                       [],
630
 
                       [],
631
 
                       [getstat],
632
 
                       [
633
 
                        have_procps=yes;
634
 
                       ],
635
 
                       [])
636
 
   fi
 
620
   AC_VMW_CHECK_LIB([$CUSTOM_PROCPS_NAME],
 
621
                    [PROCPS],
 
622
                    [],
 
623
                    [],
 
624
                    [],
 
625
                    [],
 
626
                    [getstat],
 
627
                    [
 
628
                     have_procps=yes;
 
629
                    ],
 
630
                    [])
637
631
 
638
632
   if test "$have_procps" = "no"; then
639
633
      AC_VMW_CHECK_LIB([proc-3.2.8],
843
837
CFLAGS="$CFLAGS -Wall"
844
838
CFLAGS="$CFLAGS -Werror"
845
839
 
846
 
# -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident'
847
 
# in Xlib.h on OpenSolaris.
848
 
# Glib2 keep changing mutex APIs so we also need to disable 'deprecated'
849
 
# warnings for now (-Wno-deprecated-declarations).
 
840
# -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident' in Xlib.h on OpenSolaris.
850
841
for TEST_CFLAG in -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing \
851
 
    -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations; do
 
842
    -Wno-unknown-pragmas -Wno-uninitialized; do
852
843
    AC_MSG_CHECKING([for GCC flag $TEST_CFLAG])
853
844
    ORIGINAL_CFLAGS="$CFLAGS"
854
845
    CFLAGS="$CFLAGS $TEST_CFLAG"
939
930
MODULES_DIR=""
940
931
buildHgfsmounter=no
941
932
 
 
933
if test "$have_glib_2_14" = "yes"; then
 
934
   CPPFLAGS="$CPPFLAGS -DHAVE_GLIB_REGEX"
 
935
fi
 
936
 
942
937
if test "$os" = "linux"; then
943
938
   MODULES_DIR="$LINUXDIR/kernel/"
944
939
 
950
945
 
951
946
   LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lrt"
952
947
 
 
948
   MODULES="$MODULES vmsync vmci vsock"
 
949
   MODULES="$MODULES vmxnet vmblock vmhgfs"
953
950
   MODULES="$MODULES vmxnet vmhgfs"
954
 
   # See if we need vmci and vsock modules. Starting with 3.9 they made
955
 
   # their way into mainline kernel.
956
 
   if test "$osVersion" -lt 309000; then
957
 
      MODULES="$MODULES vmci vsock"
958
 
   fi
959
951
   if test "$osVersion" -lt 300000; then
960
 
      MODULES="$MODULES vmblock vmsync"
 
952
       MODULES="$MODULES vmblock vmsync"
961
953
   fi
 
954
 
962
955
   buildHgfsmounter=yes
963
956
fi
964
957
 
1048
1041
AM_CONDITIONAL(HAVE_GNU_LD, test "$with_gnu_ld" = "yes")
1049
1042
AM_CONDITIONAL(HAVE_GTKMM, test "$have_x" = "yes" -a "$with_gtkmm" = "yes")
1050
1043
AM_CONDITIONAL(HAVE_PAM, test "$with_pam" = "yes")
1051
 
AM_CONDITIONAL(USE_SLASH_PROC, test "os" = "linux")
 
1044
AM_CONDITIONAL(USE_SLASH_PROC, test "os" = "linux" -a "$have_glib_2_14" = "yes")
1052
1045
AM_CONDITIONAL(USE_PRINTF_WRAPPERS, test "$bsdPrintfWrappers" = "yes")
1053
1046
 
1054
1047
if test "$have_xsm" != "yes"; then
1161
1154
   lib/appUtil/Makefile                \
1162
1155
   lib/auth/Makefile                   \
1163
1156
   lib/backdoor/Makefile               \
1164
 
   lib/asyncsocket/Makefile            \
1165
 
   lib/sslStubs/Makefile               \
1166
 
   lib/pollGtk/Makefile                \
1167
 
   lib/poll/Makefile                   \
1168
 
   lib/dataMap/Makefile                \
1169
 
   lib/hashMap/Makefile                \
1170
1157
   lib/dict/Makefile                   \
1171
1158
   lib/dynxdr/Makefile                 \
1172
1159
   lib/err/Makefile                    \