Changeset 3099 for pjproject/trunk/aconfigure.ac

Timestamp:

Feb 12, 2010 2:12:41 PM (14 years ago)

Author:

bennylp

Message:

More ticket #1009: Initial support for IPP on Mac

File:

• pjproject/trunk/aconfigure.ac (modified) (2 diffs)

pjproject/trunk/aconfigure.ac

@@ -731 +731 @@
 
         IPP_CFLAGS="-I$IPPROOT/include"
-        IPP_LDFLAGS="-L$IPPROOT/sharedlib"
-        IPP_LIBS="-lippsc${IPP_SUFFIX} -lipps${IPP_SUFFIX} -lippsr${IPP_SUFFIX} -lippcore${IPP_SUFFIX} -lguide"
+        IPP_LIBS="-lippsc${IPP_SUFFIX} -lipps${IPP_SUFFIX} -lippsr${IPP_SUFFIX} -lippcore${IPP_SUFFIX}"
+
+        # Some differences between Mac OS X and Linux
+        case $target in 
+            *darwin* )
+                IPP_LDFLAGS="-L$IPPROOT/Libraries -L$IPPROOT/lib"
+                ;;
+            *)
+                IPP_LDFLAGS="-L$IPPROOT/sharedlib"
+                IPP_LIBS="$IPP_LIBS -lguide"
+                ;;
+        esac
+
         #IPP_LDFLAGS="-L$IPPROOT/sharedlib"
+        #Static:
         #IPP_LIBS="-lippscmerged -lippsrmerged -lippsmerged -lippcore"
 
@@ -787 +799 @@
         elif test -d $IPPSAMPLES/speech-codecs/_bin; then
             IPPVER=6
-            IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib | head -1`
+            if test -d $IPPSAMPLES/speech-codecs/_bin/*gcc*; then
+                # gcc compiler
+                IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib | head -1`
+            elif test -d $IPPSAMPLES/speech-codecs/_bin/*icc*; then
+                # icc compiler
+                IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*icc*/lib | head -1`
+            else
+                AC_MSG_FAILURE([Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples?])
+            fi
         else
             AC_MSG_FAILURE([unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples?])