Revision
17187
Author
mike
Date
2010-04-02 00:15:18 -0500 (Fri, 02 Apr 2010)

Log Message

fix openbsd sofia build

Modified Paths

Diff

Modified: freeswitch/trunk/libs/sofia-sip/configure.ac (17186 => 17187)


--- freeswitch/trunk/libs/sofia-sip/configure.ac	2010-04-02 05:00:08 UTC (rev 17186)
+++ freeswitch/trunk/libs/sofia-sip/configure.ac	2010-04-02 05:15:18 UTC (rev 17187)
@@ -100,14 +100,17 @@
     fi
 fi
 
+SOFIA_PLAT_CFLAGS=
 # openbsd seems to not define NULL as a void pointer, I blame standards by committee for this.
 # This is a dirty hack, but shuts up all the warnings
 case "$host" in
-     *-openbsd*) SOFIA_CFLAGS="$SOFIA_CFLAGS -DNULL='(void *) 0L'";;
+     *-openbsd*) SOFIA_PLAT_CFLAGS="-DNULL='(void *) 0L'";;
      *) ;;
 esac
 
+AC_SUBST(SOFIA_PLAT_CFLAGS, $SOFIA_PLAT_CFLAGS)
 
+
 ### checks for header files
 ### -----------------------
 AC_HEADER_STDC

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am (17186 => 17187)


--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am	2010-04-02 05:00:08 UTC (rev 17186)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am	2010-04-02 05:15:18 UTC (rev 17187)
@@ -1,7 +1,7 @@
 # common Makefile targets for libsofia-sip-ua modules
 # ---------------------------------------------------
 
-AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) $(SOFIA_PLAT_CFLAGS)
 
 # Use with --enable-ndebug
 if NDEBUG

Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am (17186 => 17187)


--- freeswitch/trunk/libs/sofia-sip/rules/sofia.am	2010-04-02 05:00:08 UTC (rev 17186)
+++ freeswitch/trunk/libs/sofia-sip/rules/sofia.am	2010-04-02 05:15:18 UTC (rev 17187)
@@ -4,7 +4,7 @@
 sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
 sofiabuilddir = ${top_builddir}/libsofia-sip-ua
 
-AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS)
 
 SOFIA_COVERAGE = $(COVERAGE_FLAGS)