/*.kmk,configure*: s/VBOX_VORBIS/VBoxLibVorbis/ (sdk) bugref:10348

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@98248 cfe28804-0f27-0410-a406-dd0f0b0b656f

4 files changed, 9 insertions, 9 deletions

diff --git a/Config.kmk b/Config.kmk
index 6a31dece620..f440a862d65 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -4975,10 +4975,10 @@ ifdef VBOX_WITH_LIBOGG
 endif
 
 ifdef VBOX_WITH_LIBVORBIS
- SDK_VBOX_VORBIS               := libvorbis for dll linking.
- SDK_VBOX_VORBIS_DEFAULT_INCS  := $(PATH_ROOT)/src/libs/libvorbis-1.3.7/include
- SDK_VBOX_VORBIS_INCS          ?= $(SDK_VBOX_VORBIS_DEFAULT_INCS)
- SDK_VBOX_VORBIS_LIBS          ?= $(PATH_STAGE_LIB)/VBox-libvorbis$(VBOX_SUFF_LIB)
+ SDK_VBoxLibVorbis               := libvorbis for dll linking.
+ SDK_VBoxLibVorbis_DEFAULT_INCS  := $(PATH_ROOT)/src/libs/libvorbis-1.3.7/include
+ SDK_VBoxLibVorbis_INCS          ?= $(SDK_VBoxLibVorbis_DEFAULT_INCS)
+ SDK_VBoxLibVorbis_LIBS          ?= $(PATH_STAGE_LIB)/VBox-libvorbis$(VBOX_SUFF_LIB)
 endif
 
 SDK_VBOX_SOFTFLOAT             := SoftFloat 3 for dll linking.
diff --git a/configure b/configure
index 3305604d021..9be21e3509c 100755
--- a/configure
+++ b/configure
@@ -1838,8 +1838,8 @@ EOF
     [ -n "$INCVRB" ] && I_INCVRB=`prefix_I "$INCVRB"`
     if test_compile "$LIBVRB $I_INCVRB" vorbis vorbis nofatal; then
       if test_execute; then
-        cnf_append "SDK_VBOX_VORBIS_INCS" "$INCVRB"
-        cnf_append "SDK_VBOX_VORBIS_LIBS" "`strip_l "$LIBVRB"`"
+        cnf_append "SDK_VBoxLibVorbis_INCS" "$INCVRB"
+        cnf_append "SDK_VBoxLibVorbis_LIBS" "`strip_l "$LIBVRB"`"
       fi
     else
       echo "not found -- building libvorbis from in-tree code."
diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk
index 3f6a36ed092..58199294bc5 100644
--- a/src/VBox/Main/Makefile.kmk
+++ b/src/VBox/Main/Makefile.kmk
@@ -1041,12 +1041,12 @@ ifdef VBOX_WITH_RECORDING
   endif
   ifdef VBOX_WITH_LIBVORBIS
    VBOX_MAIN_DEFS += VBOX_WITH_LIBVORBIS
-   VBoxC_SDKS     += VBOX_VORBIS
+   VBoxC_SDKS     += VBoxLibVorbis
    ## @todo We also need to specify this for VBoxSVC, as we need to have VBOX_WITH_LIBVORBIS defined
    ##       for SystemProperties::getSupportedRecordingAudioCodecs().
    #        SystemPropertiesImpl_DEFS += VBOX_WITH_LIBVORBIS didn't work for precompiled headers on Windows --
    #        needs to be solved properly so that we can remove the following _SDKS from VBoxSVC again.
-   VBoxSVC_SDKS   += VBOX_VORBIS
+   VBoxSVC_SDKS   += VBoxLibVorbis
   endif
   VBoxC_SOURCES += src-client/DrvAudioRec.cpp
  endif # VBOX_WITH_AUDIO_RECORDING
diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk
index dc7afaa8273..a16b9e53162 100644
--- a/src/libs/Makefile.kmk
+++ b/src/libs/Makefile.kmk
@@ -140,7 +140,7 @@ if defined(VBOX_WITH_MAIN) \
 
   # libvorbis for supporting audio with video recording.
   if   defined(VBOX_WITH_LIBVORBIS) \
-    && ("$(SDK_VBOX_VORBIS_INCS)" == "$(SDK_VBOX_VORBIS_DEFAULT_INCS)")
+    && ("$(SDK_VBoxLibVorbis_INCS)" == "$(SDK_VBoxLibVorbis_DEFAULT_INCS)")
    include $(PATH_SUB_CURRENT)/libvorbis-1.3.7/Makefile.kmk
   endif