Unclean but quick bugfix for the CORBA plugin building problem.

configure.ac

@@ -3562,16 +3562,16 @@ AC_ARG_ENABLE(corba,
   [  --enable-corba          corba interface support (default disabled)])
 if test "${enable_corba}" = "yes"; then
       GLIB_VERSION=2.3.2
-      PKG_CHECK_MODULES(LIBMEDIACONTROL, 
+      PKG_CHECK_MODULES(CORBA, 
 	ORBit-2.0 >= 2.8.0 \
 	glib-2.0 >= $GLIB_VERSION \
 	gobject-2.0 >= $GLIB_VERSION \
 	gthread-2.0 >= $GLIB_VERSION,
 	[
- 	  AX_ADD_LDFLAGS([corba],[$LIBMEDIACONTROL_LIBS])
-      	  AX_ADD_CFLAGS([corba],[$LIBMEDIACONTROL_CFLAGS])
+ 	  AX_ADD_LDFLAGS([corba],[$CORBA_LIBS])
+      	  AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS])
           AX_ADD_PLUGINS([corba snapshot]) ],
-        [AC_MSG_WARN(corba library not found)])
+        [ AC_MSG_WARN(corba library not found) ])
 fi
 
 AC_ARG_WITH(,[Misc options:])

modules/control/corba/Modules.am

@@ -25,23 +25,24 @@ BUILT_SOURCES += $(GENERATEDFILES) MediaControl-imodule.c
 ## corba.c: MediaControl.h
 
 ## Needed for both MediaControl.so and libcorba_plugin compilation
-INCLUDES = $(LIBMEDIACONTROL_CFLAGS)
+INCLUDES = $(CORBA_CFLAGS)
 
 ## MediaControl.so rules
 MediaControl.so: MediaControl-imodule.c
-	$(CC) -fPIC -o MediaControl-imodule.o -c $< $(LIBMEDIACONTROL_CFLAGS)
-	$(CC) -shared -o $@ MediaControl-imodule.o $(LIBMEDIACONTROL_LIBS)
+	[ -z "$(CORBA_CFLAGS)" ] || $(CC) -fPIC -o MediaControl-imodule.o -c $< $(CORBA_CFLAGS)
+	[ -z "$(CORBA_CFLAGS)" ] || $(CC) -shared -o $@ MediaControl-imodule.o $(CORBA_LIBS)
 
 $(GENERATEDFILES): $(corbaidl_DATA)
-	$(ORBIT_IDL) $(corbaidl_DATA)
+	[ -z "$(CORBA_CFLAGS)" ] || $(ORBIT_IDL) $(corbaidl_DATA)
 
 ## We invoke 2 times $(ORBIT_IDL), else the --imodule
 ## invocation builds MediaControl-common.c without some
 ## glue code that is needed.
 MediaControl-imodule.c: $(corbaidl_DATA)
-	$(ORBIT_IDL) --imodule $<
-	$(ORBIT_IDL) $<
+	[ -z "$(CORBA_CFLAGS)" ] || $(ORBIT_IDL) --imodule $<
+	[ -z "$(CORBA_CFLAGS)" ] || $(ORBIT_IDL) $<
 
 clean:
 	$(RM) -f $(GENERATEDFILES)
 	$(RM) -f MediaControl-imodule.c
+