Commit f793c083 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Forwardport [17820] and [17823]. Live contrib compile fixes.

parent 94a01b81
diff -ruN live.old/Makefile.tail live/Makefile.tail
--- live.old/Makefile.tail 2006-11-16 03:34:34.000000000 +0100
+++ live/Makefile.tail 2006-11-16 03:35:57.000000000 +0100
@@ -19,7 +19,6 @@
--- live.old/Makefile.tail 2006-11-16 03:09:43.000000000 +0100
+++ live/Makefile.tail 2006-11-16 22:10:06.000000000 +0100
@@ -18,9 +18,7 @@
ALL = $(LIVEMEDIA_LIB) \
$(GROUPSOCK_LIB) \
$(USAGE_ENVIRONMENT_LIB) \
$(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP) \
$(MEDIA_SERVER_APP)
- $(MEDIA_SERVER_APP)
+ $(BASIC_USAGE_ENVIRONMENT_LIB)
all: $(ALL)
diff -ruN live.old/config.macosx live/config.macosx
--- live.old/config.macosx 2006-11-16 03:34:34.000000000 +0100
+++ live/config.macosx 2006-11-16 03:35:23.000000000 +0100
--- live.old/config.macosx 2006-11-16 03:09:43.000000000 +0100
+++ live/config.macosx 2006-11-16 22:09:58.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
+COMPILE_OPTS = $(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment