Updated logos.

Makefile.in

@@ -38,8 +38,8 @@ bin_PROGRAMS = orp$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure config.guess config.sub depcomp \
-	install-sh ltmain.sh missing
+	$(top_srcdir)/configure $(top_srcdir)/images/Makefile.in \
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -51,7 +51,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = images/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -312,6 +312,8 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+images/Makefile: $(top_builddir)/config.status $(top_srcdir)/images/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

config.h.in

@@ -27,9 +27,6 @@
 /* Define to 1 if you have the `curl' library (-lcurl). */
 #undef HAVE_LIBCURL
 
-/* Define to 1 if you have the `faad' library (-lfaad). */
-#undef HAVE_LIBFAAD
-
 /* Define to 1 if you have the `freetype' library (-lfreetype). */
 #undef HAVE_LIBFREETYPE
 

configure

@@ -15610,54 +15610,8 @@ else
 	as_fn_error $? "libswscale not found but is required." "$LINENO" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for faad_malloc in -lfaad" >&5
-$as_echo_n "checking for faad_malloc in -lfaad... " >&6; }
-if ${ac_cv_lib_faad_faad_malloc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfaad  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char faad_malloc ();
-int
-main ()
-{
-return faad_malloc ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_faad_faad_malloc=yes
-else
-  ac_cv_lib_faad_faad_malloc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_faad_faad_malloc" >&5
-$as_echo "$ac_cv_lib_faad_faad_malloc" >&6; }
-if test "x$ac_cv_lib_faad_faad_malloc" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBFAAD 1
-_ACEOF
-
-  LIBS="-lfaad $LIBS"
-
-else
-
-	as_fn_error $? "libfaad not found but is required." "$LINENO" 5
-fi
-
+#AC_CHECK_LIB([faad], [faad_malloc], [], [
+#	AC_MSG_ERROR([libfaad not found but is required.])])
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
 $as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
 if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
@@ -16049,8 +16003,7 @@ subdirs="$subdirs wxorp"
 fi
 
 
-#AC_CONFIG_FILES([Makefile images/Makefile keys/Makefile open-rp.spec])
-ac_config_files="$ac_config_files Makefile keys/Makefile util/Makefile"
+ac_config_files="$ac_config_files Makefile images/Makefile keys/Makefile util/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17166,6 +17119,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "images/Makefile") CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
     "keys/Makefile") CONFIG_FILES="$CONFIG_FILES keys/Makefile" ;;
     "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
 

configure.ac

@@ -35,8 +35,8 @@ AC_CHECK_LIB([avutil], [av_log_set_callback], [], [
 	AC_MSG_ERROR([libavutil not found but is required.])])
 AC_CHECK_LIB([swscale], [sws_getContext], [], [
 	AC_MSG_ERROR([libswscale not found but is required.])])
-AC_CHECK_LIB([faad], [faad_malloc], [], [
-	AC_MSG_ERROR([libfaad not found but is required.])])
+#AC_CHECK_LIB([faad], [faad_malloc], [], [
+#	AC_MSG_ERROR([libfaad not found but is required.])])
 AC_CHECK_LIB([curl], [curl_easy_init], [], [
 	AC_MSG_ERROR([libcurl not found but is required.])])
 AC_CHECK_LIB([png], [png_malloc], [], [
@@ -71,6 +71,5 @@ if test "x$with_wxorp" = xyes; then
 fi
 AC_SUBST(ORP_SUBDIRS)
 
-#AC_CONFIG_FILES([Makefile images/Makefile keys/Makefile open-rp.spec])
-AC_CONFIG_FILES([Makefile keys/Makefile util/Makefile])
+AC_CONFIG_FILES([Makefile images/Makefile keys/Makefile util/Makefile])
 AC_OUTPUT