diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2002-09-19 06:01:18 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2002-09-19 06:01:18 +0000 |
| commit | 7fb9dc915cded39e8ad4bed49a14b0d6769ba5bd (patch) | |
| tree | a9fbf5d060b561dd9dccf6b96cc802111441b3ff /m4 | |
| parent | f28b2a11a87ff7e1306087401c370cc720f0afa3 (diff) | |
| download | xine-lib-7fb9dc915cded39e8ad4bed49a14b0d6769ba5bd.tar.gz xine-lib-7fb9dc915cded39e8ad4bed49a14b0d6769ba5bd.tar.bz2 | |
Updated cvscompile.sh to look for configure.ac
Replaced configure.in with configure.ac
Remove acconfig.h (Unnecessary with autoconf 2.52 or above)
Updated configure.ac to remove deprecated macros, upgraded
AC_DEFINE to include comments, merged in acconfig.h.
Combined libxine and libxineutils into one library. libxineutils
is created but not installed. Its statically linked into libxine.
Advanced libxine version from 0.2.0 to 1.0.0
Removed references for skins.
Plugins now installed to <libdir>/xine/plugins/$XINE_MAJOR.$XINE_MORE.
$XINE_SUB
Xine-config updated for new location of plugins
Sorted file lists in Makefile.am to make them more readable.
TODO: remove skins references from xine-config
CVS patchset: 2705
CVS date: 2002/09/19 06:01:18
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.am | 26 | ||||
| -rw-r--r-- | m4/_xine.m4 | 16 |
2 files changed, 30 insertions, 12 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index d322b1856..c091d24f7 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -9,9 +9,28 @@ endif m4data_DATA = xine.m4 -EXTRA_DIST = _xine.m4 arts.m4 esd.m4 iconv.m4 lcmessage.m4 progtest.m4 xine.m4 \ - aa.m4 as.m4 gettext.m4 irixal.m4 libfame.m4 sdl.m4 xvid.m4 \ - alsa.m4 codeset.m4 glibc21.m4 isc-posix.m4 ogg.m4 vorbis.m4 dvdnav.m4 +EXTRA_DIST = \ + aa.m4 \ + alsa.m4 \ + arts.m4 \ + as.m4 \ + codeset.m4 \ + dvdnav.m4 \ + esd.m4 \ + gettext.m4 \ + glibc21.m4 \ + iconv.m4 \ + irixal.m4 \ + isc-posix.m4 \ + lcmessage.m4 \ + libfame.m4 \ + ogg.m4 \ + progtest.m4 \ + sdl.m4 \ + vorbis.m4 \ + xine.m4 \ + _xine.m4 \ + xvid.m4 debug: @@ -20,7 +39,6 @@ install-debug: install mostlyclean-generic: -rm -f *~ \#* .*~ .\#* - maintainer-clean-generic: -@echo "This command is intended for maintainers to use;" -@echo "it deletes files that may require special tools to rebuild." diff --git a/m4/_xine.m4 b/m4/_xine.m4 index de9c65905..a52b95d98 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -256,13 +256,13 @@ AC_DEFUN([AM_CHECK_CDROM_IOCTLS], dnl AC_CHECK_IP_MREQN dnl check for struct ip_mreqn in netinet/in.h AC_DEFUN([AC_CHECK_IP_MREQN], - [AC_CACHE_CHECK([for ip_mreqn],[ac_cv_have_ip_mreqn], - [AC_EGREP_HEADER([ip_mreqn],[netinet/in.h], - ac_cv_have_ip_mreqn=yes,ac_cv_have_ip_mreqn=no) - ]) - have_ip_mreqn=$ac_cv_have_ip_mreqn - if test "x$have_ip_mreqn" = xyes ; then - AC_DEFINE(HAVE_IP_MREQN) - fi + [AC_CACHE_CHECK([for ip_mreqn], [ac_cv_have_ip_mreqn], + [AC_EGREP_HEADER([ip_mreqn], + [netinet/in.h], + [ac_cv_have_ip_mreqn=yes], + [ac_cv_have_ip_mreqn=no])]) + if test $ac_cv_have_ip_mreqn = yes; then + AC_DEFINE([HAVE_IP_MREQN],1,[Define this if you have ip_mreqn in netinet/in.h]) + fi ]) |