[xiph-cvs] cvs commit: ogg Makefile.am configure.in libogg.spec ogg.m4 ogg-config.in

Jack Moffitt jack at xiph.org
Sun Oct 29 22:52:03 PST 2000



jack        00/10/29 22:52:03

  Modified:    .        Makefile.am configure.in libogg.spec ogg.m4
  Removed:     .        ogg-config.in
  Log:
  new ogg.m4 stuff.  hopefully i haven't totally screwed this up

Revision  Changes    Path
1.4       +0 -1      ogg/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ogg/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2000/10/22 02:56:12	1.3
+++ Makefile.am	2000/10/30 06:52:02	1.4
@@ -4,7 +4,6 @@
 
 SUBDIRS = src include doc win32
 
-bin_SCRIPTS = ogg-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ogg.m4
 

1.6       +1 -1      ogg/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ogg/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.in	2000/10/22 02:56:12	1.5
+++ configure.in	2000/10/30 06:52:02	1.6
@@ -227,4 +227,4 @@
 AC_SUBST(CC)
 AC_SUBST(RANLIB)
 
-AC_OUTPUT(Makefile ogg-config src/Makefile doc/Makefile include/Makefile include/ogg/Makefile include/ogg/config_types.h win32/Makefile)
+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ogg/Makefile include/ogg/config_types.h win32/Makefile)

1.5       +0 -1      ogg/libogg.spec

Index: libogg.spec
===================================================================
RCS file: /usr/local/cvsroot/ogg/libogg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libogg.spec	2000/10/26 21:18:59	1.4
+++ libogg.spec	2000/10/30 06:52:02	1.5
@@ -61,7 +61,6 @@
 /usr/lib/libogg.a
 /usr/lib/libogg.so
 /usr/share/aclocal/ogg.m4
-/usr/bin/ogg-config
 
 %clean 
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

1.2       +40 -59    ogg/ogg.m4

Index: ogg.m4
===================================================================
RCS file: /usr/local/cvsroot/ogg/ogg.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogg.m4	2000/10/22 02:57:11	1.1
+++ ogg.m4	2000/10/30 06:52:02	1.2
@@ -2,47 +2,35 @@
 # Jack Moffitt <jack at icecast.org> 10-21-2000
 # Shamelessly stolen from Owen Taylor and Manish Singh
 
-dnl AM_PATH_OGG([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
 dnl
 AC_DEFUN(AM_PATH_OGG,
 [dnl 
-dnl Get the cflags and libraries from the ogg-config script
+dnl Get the cflags and libraries
 dnl
 AC_ARG_WITH(ogg-prefix,[  --with-ogg-prefix=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
 AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
 
   if test x$ogg_prefix != x ; then
-     ogg_args="$ogg_args --prefix=$ogg_prefix"
-     if test x${OGG_CONFIG+set} != xset ; then
-        OGG_CONFIG=$ogg_prefix/bin/ogg-config
-     fi
+    ogg_args="$ogg_args --prefix=$ogg_prefix"
+    OGG_CFLAGS="-I$ogg_prefix/include"
+    OGG_LIBS="-L$ogg_prefix/lib"
   fi
+
+  OGG_LIBS="$OGG_LIBS -logg"
 
-  AC_PATH_PROG(OGG_CONFIG, ogg-config, no)
-  min_ogg_version=ifelse([$1], ,1.0.0,$1)
-  AC_MSG_CHECKING(for Ogg - version >= $min_ogg_version)
+  AC_MSG_CHECKING(for Ogg)
   no_ogg=""
-  if test "$OGG_CONFIG" = "no" ; then
-    no_esd=yes
-  else
-    OGG_CFLAGS=`$OGG_CONFIG $oggconf_args --cflags`
-    OGG_LIBS=`$OGG_CONFIG $oggconf_args --libs`
+
 
-    ogg_major_version=`$OGG_CONFIG $ogg_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    ogg_minor_version=`$OGG_CONFIG $ogg_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    ogg_micro_version=`$OGG_CONFIG $ogg_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_oggtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $OGG_CFLAGS"
-      LIBS="$LIBS $OGG_LIBS"
+  if test "x$enable_oggtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $OGG_LIBS"
 dnl
-dnl Now check if the installed Ogg is sufficiently new. (Also sanity
-dnl checks the results of ogg-config to some extent
+dnl Now check if the installed Ogg is sufficiently new.
 dnl
       rm -f conf.oggtest
       AC_TRY_RUN([
@@ -60,49 +48,42 @@
 ],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
-     fi
   fi
+
   if test "x$no_ogg" = x ; then
      AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
+     ifelse([$1], , :, [$1])     
   else
      AC_MSG_RESULT(no)
-     if test "$OGG_CONFIG" = "no" ; then
-       echo "*** The ogg-config script installed by Ogg could not be found"
-       echo "*** If Ogg was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the OGG_CONFIG environment variable to the"
-       echo "*** full path to ogg-config."
+     if test -f conf.oggtest ; then
+       :
      else
-       if test -f conf.oggtest ; then
-        :
-       else
-          echo "*** Could not run Ogg test program, checking why..."
-          CFLAGS="$CFLAGS $OGG_CFLAGS"
-          LIBS="$LIBS $OGG_LIBS"
-          AC_TRY_LINK([
+       echo "*** Could not run Ogg test program, checking why..."
+       CFLAGS="$CFLAGS $OGG_CFLAGS"
+       LIBS="$LIBS $OGG_LIBS"
+       AC_TRY_LINK([
 #include <stdio.h>
 #include <ogg/ogg.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding Ogg or finding the wrong"
-          echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
-          echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
-          echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
+       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
+       echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
+       echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
      fi
      OGG_CFLAGS=""
      OGG_LIBS=""
-     ifelse([$3], , :, [$3])
+     ifelse([$2], , :, [$2])
   fi
   AC_SUBST(OGG_CFLAGS)
   AC_SUBST(OGG_LIBS)

--- >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.



More information about the commits mailing list