From: Wim T. <wim...@ch...> - 2001-05-24 00:37:39
|
Below is a modified version of the configure.in file that should work with the new automake 2.50 version. Can people test this patch, it was mainly created by trial and error, parts of it are converted using autoupdate. It's probably not optimal and it's likely that it doesn't work with older automake version. Anyway this is a problem... if people with automake knowledge could create something that works on both version, that would be great. Else we'll have toadd something to ./autgen.sh to detect the automake version and mv the right configure.in script.. ick Wim Index: configure.in =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/configure.in,v retrieving revision 1.151 diff -u -r1.151 configure.in --- configure.in 2001/05/23 08:48:34 1.151 +++ configure.in 2001/05/24 00:31:43 @@ -1,6 +1,7 @@ -AC_INIT(gst/gstobject.h) +AC_INIT +AC_CONFIG_SRCDIR([gst/gstobject.h]) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET([]) AM_CONFIG_HEADER(config.h) @@ -44,7 +45,7 @@ AC_PROG_CXX AC_PROG_CXXCPP AC_ISC_POSIX -AC_STDC_HEADERS +AC_HEADER_STDC([]) AC_ARG_PROGRAM dnl We disable static building for development, for time savings @@ -479,12 +480,16 @@ AC_CHECK_HEADER(rtp/rtp-audio.h, :, HAVE_LIBRTP=no) dnl Check for arts -AC_LANG_SAVE -AC_LANG_CPLUSPLUS +AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_DIAGNOSE([obsolete],[instead of using `AC_LANG', `AC_LANG_SAVE', +and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.]) +', +and `AC_LANG_POP([])', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.]) + +AC_LANG_PUSH(C++) AC_MSG_CHECKING(arts library) dnl AC_CHECK_LIB(artsflow, convert_stereo_ifloat_2float, HAVE_ARTS=yes, HAVE_ARTS=no, -lmcop -lartsflow_idl) AC_CHECK_HEADER(arts/artsflow.h, HAVE_ARTS=yes, HAVE_ARTS=no) -AC_LANG_RESTORE +AC_LANG_POP(C++) dnl Check for libraw1394 AC_MSG_CHECKING(raw1394 library) @@ -536,12 +541,12 @@ dnl Check for linux/cdrom.h AC_CHECK_HEADER(linux/cdrom.h, - HAVE_LINUX_CDROM=yes, [] + HAVE_LINUX_CDROM=yes, HAVE_LINUX_CDROM=no ) dnl Check for linux/videodev.h AC_CHECK_HEADER(linux/videodev.h, - HAVE_LINUX_VIDEODEV=yes, [] + HAVE_LINUX_VIDEODEV=yes, HAVE_LINUX_VIDEODEV=no ) @@ -930,7 +935,7 @@ dnl # Make the output files # dnl ######################### -AC_OUTPUT([Makefile +AC_CONFIG_FILES(Makefile include/Makefile include/wine/Makefile gst/Makefile @@ -1029,6 +1034,7 @@ plugins/quicktime/Makefile plugins/xmms/Makefile plugins/arts/Makefile +plugins/gsm/Makefile plugins/1394/Makefile plugins/sdlsink/Makefile plugins/dv/Makefile @@ -1073,5 +1079,7 @@ debian/Makefile stamp.h gstreamer-config -gstreamer.spec]) -AC_OUTPUT_COMMANDS([chmod +x gstreamer-config]) +gstreamer.spec, +chmod +x gstreamer-config +) +AC_OUTPUT |