[xiph-cvs] cvs commit: theora/examples Makefile.am

[Monty]

xiphmont    02/09/25 00:33:47

  Modified:    .        configure.in
               examples Makefile.am
  Log:
  zinx SDL link fix

Revision  Changes    Path
1.2       +8 -1      theora/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/theora/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.in	23 Sep 2002 03:02:07 -0000	1.1
+++ configure.in	25 Sep 2002 04:33:47 -0000	1.2
@@ -27,6 +27,9 @@
 AC_PROG_CPP
 CFLAGS="$cflags_save"
 
+dnl no shared linking for us
+AM_DISABLE_SHARED
+AM_ENABLE_STATIC
 AM_PROG_LIBTOOL
 
 dnl --------------------------------------------------
@@ -74,7 +77,11 @@
 dnl Check for library functions
 dnl --------------------------------------------------
 
-dnl none
+AM_PATH_SDL(,[
+	HAVE_SDL=yes
+	SDL_LIBS=`$SDL_CONFIG --static-libs`
+],AC_MSG_WARN([*** Unable to find SDL -- Not compiling player_example ***]))
+AM_CONDITIONAL(HAVE_SDL, test "$HAVE_SDL" = "yes")
 
 dnl --------------------------------------------------
 dnl Do substitutions

<p><p>1.6       +11 -2     theora/examples/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/theora/examples/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	25 Sep 2002 02:38:10 -0000	1.5
+++ Makefile.am	25 Sep 2002 04:33:47 -0000	1.6
@@ -4,13 +4,20 @@
 
 INCLUDES = -I$(top_srcdir)/include 
 
-noinst_PROGRAMS = encoder_example player_example 
+if HAVE_SDL
+player_example = player_example
+else
+player_example = 
+endif
+
+noinst_PROGRAMS = encoder_example $(player_example)
 
 LDFLAGS = -all-static 
 LDADD = ../lib/libtheora.la -logg -lvorbis -lm
 
 player_example_SOURCES = player_example.c
-player_example_LDADD = $(LDADD) -lSDL -lpthread
+player_example_LDADD = $(LDADD) $(SDL_LIBS) -lpthread
+
 encoder_example_SOURCES = encoder_example.c
 encoder_example_LDADD = $(LDADD) -lvorbisenc
 
@@ -19,3 +26,5 @@
 
 profile:
         $(MAKE) all CFLAGS="@PROFILE@"
+
+EXTRA_DIST = $(player_example_SOURCES)

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.