diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:02:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:02:17 +0000 |
| commit | dc44d8df13e06c681d5a93ed8c6155b446042981 (patch) | |
| tree | fdf52187587643c5258e4798afd3a2536965c1f9 /vcl/util | |
| parent | 72f427f78904d4188addc5bd96f3ce0eff81d951 (diff) | |
INTEGRATION: CWS configure21 (1.89.30); FILE MERGED
2007/07/24 12:38:32 rene 1.89.30.5: #i10000# patch from ause for some variable sillinesses/Sun environment
2007/07/11 08:16:13 rene 1.89.30.4: RESYNC: (1.93-1.94); FILE MERGED
2007/07/05 18:58:53 rene 1.89.30.3: RESYNC: (1.92-1.93); FILE MERGED
2007/06/27 15:17:22 rene 1.89.30.2: RESYNC: (1.89-1.92); FILE MERGED
2007/04/23 21:03:13 rene 1.89.30.1: #i73936# use pkg-config for sndfile detection
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index fab460ae80f7..4ae3157ca092 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.96 $ +# $Revision: 1.97 $ # -# last change: $Author: rt $ $Date: 2007-07-27 10:25:23 $ +# last change: $Author: hr $ $Date: 2007-07-31 13:02:17 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,10 @@ USE_DEFFILE=TRUE LINKFLAGSRUNPATH=-R/usr/sfw/lib -R\''$$ORIGIN'\' .ENDIF +.IF "$(SNDFILE_LIBS)"!="" +SNDFILELIB=$(SNDFILE_LIBS) +.ENDIF + # --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk @@ -294,7 +298,7 @@ SHL2STDLIBS+=`pkg-config --libs xrender` .IF "$(ENABLE_PASF)" != "" -SHL2STDLIBS += -lsndfile -lportaudio +SHL2STDLIBS += $(SNDFILELIB) -lportaudio .IF "$(OS)"=="MACOSX" SHL2STDLIBS += -framework CoreAudio -framework AudioToolbox .ENDIF # "$(OS)"=="MACOSX" |