diff -r 4644bd396464 -r 847da7267234 gmyth-upnp/configure.ac --- a/gmyth-upnp/configure.ac Wed Jan 10 22:47:28 2007 +0000 +++ b/gmyth-upnp/configure.ac Fri Feb 01 22:17:33 2008 +0000 @@ -3,17 +3,11 @@ AC_PREREQ(2.50) -AC_INIT([gmyth-upnp],[0.1]) +AC_INIT([gmyth-upnp],[0.7]) AC_CONFIG_SRCDIR([src/gmyth_upnp.c]) AC_CONFIG_HEADER(config.h) -dnl when going to/from release please set the nano (fourth number) right ! -dnl releases only do Wall, SVN and prerelease does Werror too -AS_VERSION(gmyth-upnp, GMYTH_UPNP, 0, 1, 0, 3, GMYTH_UPNP_SVN="no", GMYTH_UPNP_SVN="yes") -GMYTH_UPNP_MAJORMINOR=$GMYTH_UPNP_MAJOR_VERSION.$GMYTH_UPNP_MINOR_VERSION -AC_SUBST(GMYTH_UPNP_MAJORMINOR) - dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode AM_MAINTAINER_MODE dnl make aclocal work in maintainer mode @@ -26,17 +20,6 @@ AC_PROG_CC AC_PROG_LIBTOOL -dnl Generate doxygen documentation -DX_HTML_FEATURE(ON) -DX_CHM_FEATURE(OFF) -DX_CHI_FEATURE(OFF) -DX_MAN_FEATURE(OFF) -DX_RTF_FEATURE(OFF) -DX_XML_FEATURE(OFF) -DX_PDF_FEATURE(OFF) -DX_PS_FEATURE(OFF) -DX_INIT_DOXYGEN(gmyth-upnp, doxygen.cfg, docs) - # Checks for libraries. # Check for pkgconfig @@ -120,12 +103,12 @@ AC_SUBST(GOBJECT_CFLAGS) AC_SUBST(GOBJECT_LIBS) -## Check for gmyth-0.1 -PKG_CHECK_MODULES(LIBGMYTH, gmyth-0.1, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no) +## Check for gmyth-0.7 +PKG_CHECK_MODULES(LIBGMYTH, gmyth >= 0.7, HAVE_LIBGMYTH=yes,HAVE_LIBGMYTH=no) -# Give error and exit if we don't have gmyth-0.1 +# Give error and exit if we don't have gmyth-0.7 if test "x$HAVE_LIBGMYTH" = "xno"; then - AC_MSG_ERROR([you need gmyth-0.1 installed]) + AC_MSG_ERROR([you need gmyth installed]) fi # make LIBXML_CFLAGS and LIBXML_LIBS available @@ -133,28 +116,24 @@ AC_SUBST(LIBGMYTH_LIBS) dnl ========== Check for Cyberlink UPnP Libraries -PKG_CHECK_MODULES(CYBERLINK, clinkc, - HAVE_CYBERLINK=yes, HAVE_CYBERLINK=no) +PKG_CHECK_MODULES(LIBUPNP, libupnp, HAVE_LIBUPNP=yes, HAVE_LIBUPNP=no) -if test "x$HAVE_CYBERLINK" = "xno"; then - AC_MSG_ERROR([you need clinkc installed]) +if test "x$HAVE_LIBUPNP" = "xno"; then + AC_MSG_ERROR([you need libupnp installed]) fi -dnl make CYBERLINK_CFLAGS and CYBERLINK_LIBS available -AC_SUBST(CYBERLINK_CFLAGS) -AC_SUBST(CYBERLINK_LIBS) - -#dnl Enable gtk-doc -#GTK_DOC_CHECK(1.4) +AC_SUBST(LIBUPNP_CFLAGS) +AC_SUBST(LIBIPNP_LIBS) AC_OUTPUT([ Makefile src/Makefile +test/Makefile gmyth-upnp.pc]) if test "x$enable_debug" != "xno"; then AC_MSG_NOTICE([Debug: Enabled]) else AC_MSG_NOTICE([Debug: Disabled]) -fi +fi