X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-howto-write-a-block%2Fconfigure.ac;h=52c4639bb544c83b1281faa730845de8f96b431d;hb=refs%2Fheads%2Ftry-3.3.1;hp=6648263756b9c8770454628657beb2294ab117f3;hpb=5c02ea03e1226ed706abeede426f0e1727f1ea25;p=debian%2Fgnuradio

diff --git a/gr-howto-write-a-block/configure.ac b/gr-howto-write-a-block/configure.ac
index 66482637..52c4639b 100644
--- a/gr-howto-write-a-block/configure.ac
+++ b/gr-howto-write-a-block/configure.ac
@@ -1,5 +1,5 @@
 dnl 
-dnl  Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+dnl  Copyright 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
 dnl  
 dnl  This file is part of GNU Radio
 dnl  
@@ -19,83 +19,33 @@ dnl  the Free Software Foundation, Inc., 51 Franklin Street,
 dnl  Boston, MA 02110-1301, USA.
 dnl 
 
+
 AC_INIT
 AC_PREREQ(2.57)
-AC_CONFIG_SRCDIR([src/lib/howto.i])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_AUX_DIR([.])	
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(gr-howto-write-a-block,3.1.svn)
-
-LF_CONFIGURE_CC
-LF_CONFIGURE_CXX
-GR_LIB64		dnl check for lib64 suffix after choosing compilers
-
-
-dnl add ${prefix}/lib${gr_libdir_suffix}/pkgconfig to the head of the PKG_CONFIG_PATH
-if test x${PKG_CONFIG_PATH} = x; then
-    PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig
-else
-    PKG_CONFIG_PATH=${prefix}/lib${gr_libdir_suffix}/pkgconfig:${PKG_CONFIG_PATH}
-fi
-export PKG_CONFIG_PATH
-
-LF_SET_WARNINGS
-GR_SET_GPROF
-GR_SET_PROF
-AM_PROG_AS
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-AC_PATH_PROG([RM_PROG], [rm])
-
-AC_LIBTOOL_WIN32_DLL
-AC_ENABLE_SHARED	dnl do build shared libraries
-AC_DISABLE_STATIC	dnl don't build static libraries
-m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL])
-dnl GR_FORTRAN
-
-GR_NO_UNDEFINED		dnl do we need the -no-undefined linker flag
-GR_SCRIPTING		dnl Locate python, SWIG, etc
-
-AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
-AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
+GR_VERSION
+dnl ustar required to have pathnames > 99 chars
+_AM_SET_OPTION([tar-ustar])
+AM_INIT_AUTOMAKE(gr-howto-write-a-block,$RELEASE)
 
+dnl This is kind of non-standard, but it sure shortens up this file :-)
+m4_include([config/gr_standalone.m4])
+GR_STANDALONE
 
-dnl Checks for libraries.
-
-dnl Set the c++ compiler that we use for the build system when cross compiling
-if test "x$CXX_FOR_BUILD" = x
-then
-  CXX_FOR_BUILD=${CXX}
-fi
-AC_SUBST(CXX_FOR_BUILD)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/ioctl.h sys/time.h unistd.h)
-AC_CHECK_HEADERS(sys/mman.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_C_BIGENDIAN
+dnl Check for any libraries you need
+dnl AC_CHECK_LIBRARY
 
+dnl Check for header files you need
+dnl AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/ioctl.h sys/time.h unistd.h)
+dnl AC_CHECK_HEADERS(sys/mman.h)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS([])
-
-dnl Check for Mingw support
-GR_PWIN32
-
-PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
-LIBS="$LIBS $GNURADIO_CORE_LIBS"
+dnl AC_CHECK_FUNCS([])
 
 dnl We pick up the boost cppflags, cxxflags and thread lib via GNURADIO_CORE
 dnl
@@ -119,21 +69,20 @@ dnl AX_BOOST_TEST_EXEC_MONITOR
 dnl AX_BOOST_UNIT_TEST_FRAMEWORK
 dnl AX_BOOST_WSERIALIZATION
 
-
-STD_DEFINES_AND_INCLUDES="$GNURADIO_CORE_CFLAGS"
-AC_SUBST(STD_DEFINES_AND_INCLUDES)
- 
 AC_CONFIG_FILES([\
 	  Makefile \
+	  apps/Makefile \
 	  config/Makefile \
-	  doc/Makefile \
-	  src/Makefile \
-	  src/lib/Makefile \
-	  src/python/Makefile \
-	  src/python/run_tests \
+	  grc/Makefile \
+	  lib/Makefile \
+	  python/Makefile \
+	  python/run_tests \
+	  swig/Makefile \
 	])
 
 dnl run_tests is created from run_tests.in.  Make it executable.
-AC_CONFIG_COMMANDS([run_tests], [chmod +x src/python/run_tests])
+AC_CONFIG_COMMANDS([run_tests], [chmod +x python/run_tests])
 
 AC_OUTPUT
+
+echo Configured gr-howto-write-a-block release $RELEASE for build.