Changeset 14711 in vbox for trunk/configure
- Timestamp:
- Nov 27, 2008 3:16:52 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 40024
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure
r14255 r14711 23 23 PATH="/usr/xpg4/bin:/usr/ucb:$PATH:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin" 24 24 ORGPATH=$PATH 25 26 # Wrapper for ancient /usr/bin/which on darwin that always returns 0 27 which_wrapper() 28 { 29 if [ -z "$have_ancient_which" ]; then 30 if which /bin/___cErTaINly_a_nOn_eXisTing_fIle___ 2> /dev/null > /dev/null; then 31 have_ancient_which="yes" 32 else 33 have_ancient_which="no" 34 fi 35 fi 36 if [ "$have_ancient_which" = "yes" ]; then 37 retval=`which $* 2>/dev/null` 38 echo "$retval" 39 test -n "$retval" -a -x "$retval" 40 unset retval 41 else 42 which $* 2> /dev/null 43 fi 44 } 45 25 46 26 47 # … … 42 63 WITH_ALSA=1 43 64 WITH_PULSE=1 65 WITH_LIBHAL=1 44 66 WITH_KMODS=1 45 67 WITH_HARDENING=1 … … 69 91 INCPNG="" 70 92 LIBPNG="-lpng" 93 PKGCONFIG="`which_wrapper pkg-config`" 94 if [ -n $PKGCONFIG ]; then 95 FLAGSHAL="`$PKGCONFIG hal --cflags 2>/dev/null`" 96 LIBDIRHAL="`$PKGCONFIG hal --libs-only-L 2>/dev/null`" 97 LIBHAL="`$PKGCONFIG hal --libs-only-l 2>/dev/null`" 98 fi 71 99 PYTHONDIR="/usr /usr/local" 72 100 QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3" … … 164 192 echo "$1"|$KBUILD_SED 's|^\/|-I/|g; s| \/| -I/|g' 165 193 } 166 167 # Wrapper for ancient /usr/bin/which on darwin that always returns 0168 which_wrapper()169 {170 if [ -z "$have_ancient_which" ]; then171 if which /bin/___cErTaINly_a_nOn_eXisTing_fIle___ 2> /dev/null > /dev/null; then172 have_ancient_which="yes"173 else174 have_ancient_which="no"175 fi176 fi177 if [ "$have_ancient_which" = "yes" ]; then178 retval=`which $* 2>/dev/null`179 echo "$retval"180 test -n "$retval" -a -x "$retval"181 unset retval182 else183 which $* 2> /dev/null184 fi185 }186 187 194 188 195 check_avail() … … 1153 1160 if test_compile "-lpulse" pulse pulse; then 1154 1161 test_execute 1162 fi 1163 } 1164 1165 1166 # 1167 # Check for libhal 1168 # 1169 check_libhal() 1170 { 1171 test_header "libhal" 1172 cat > .tmp_src.cc << EOF 1173 #include <libhal.h> 1174 extern "C" int main(void) 1175 { 1176 return 0; 1177 } 1178 EOF 1179 if [ -n $PKGCONFIG ] && test_compile "$FLAGSHAL $LIBDIRHAL $LIBHAL" libhal libhal; then 1180 log_success "found" 1155 1181 fi 1156 1182 } … … 1760 1786 --disable-alsa disable the ALSA sound backend 1761 1787 --disable-pulse disable the PulseAudio backend 1788 --disable-libhal don't use hal for hardware detection 1762 1789 --disable-kmods don't build Linux kernel modules (host and guest) 1763 1790 --disable-hardening don't be strict about /dev/vboxdrv access … … 1858 1885 --disable-pulse) 1859 1886 WITH_PULSE=0 1887 ;; 1888 --disable-libhal) 1889 WITH_LIBHAL=0 1860 1890 ;; 1861 1891 --disable-kmods) … … 2051 2081 else 2052 2082 cnf_append "VBOX_WITH_PULSE" "" 2083 fi 2084 if [ $WITH_LIBHAL -eq 1 ]; then 2085 check_libhal 2086 else 2087 cnf_append "VBOX_WITH_LIBHAL" "" 2053 2088 fi 2054 2089 check_compiler_h
Note:
See TracChangeset
for help on using the changeset viewer.