From 0ccfa432206769a540be50c6e39295c58bf4ea56 Mon Sep 17 00:00:00 2001 From: Nick White Date: Wed, 9 May 2007 00:13:56 +0000 Subject: Moved configure.in to configure.ac, as recommended git-archimport-id: getht@sv.gnu.org/getht--mainline--0.1--patch-28 --- ChangeLog | 1 - configure.ac | 47 +++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 47 ----------------------------------------------- prepare-package.sh | 4 ++-- 4 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/ChangeLog b/ChangeLog index fd935f6..e69de29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +0,0 @@ -2006-08: pre-release diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..306a49b --- /dev/null +++ b/configure.ac @@ -0,0 +1,47 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.61) +AC_INIT(getht, 0.0.1) +AC_CONFIG_SRCDIR([src/]) +AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION) +AC_LANG([C]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL + +# Checks for libraries. + +dnl check for zlib +CHECK_ZLIB() + +dnl check for libxml2 +AM_PATH_XML2([2.0.0]) +CFLAGS="$CFLAGS $XML_CPPFLAGS" +LIBS="$LIBS $XML_LIBS" + +dnl check for libcurl +LIBCURL_CHECK_CONFIG([yes], [7.7.2]) +CFLAGS="$CFLAGS $LIBCURL_CPPFLAGS" +LIBS="$LIBS $LIBCURL" + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T + +# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS([mkdir strdup]) + +AC_CONFIG_FILES([Makefile + doc/Makefile + src/Makefile]) +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index 306a49b..0000000 --- a/configure.in +++ /dev/null @@ -1,47 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.61) -AC_INIT(getht, 0.0.1) -AC_CONFIG_SRCDIR([src/]) -AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION) -AC_LANG([C]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL - -# Checks for libraries. - -dnl check for zlib -CHECK_ZLIB() - -dnl check for libxml2 -AM_PATH_XML2([2.0.0]) -CFLAGS="$CFLAGS $XML_CPPFLAGS" -LIBS="$LIBS $XML_LIBS" - -dnl check for libcurl -LIBCURL_CHECK_CONFIG([yes], [7.7.2]) -CFLAGS="$CFLAGS $LIBCURL_CPPFLAGS" -LIBS="$LIBS $LIBCURL" - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([mkdir strdup]) - -AC_CONFIG_FILES([Makefile - doc/Makefile - src/Makefile]) -AC_OUTPUT diff --git a/prepare-package.sh b/prepare-package.sh index d92f3d9..f994921 100755 --- a/prepare-package.sh +++ b/prepare-package.sh @@ -37,8 +37,8 @@ rm -rf \{arch\} rm -rf .arch_ids rm -f ++log.getht* -# ensure version number in configure.in is set correctly -sed -i "s|^AC_INIT(getht, .*)$|AC_INIT(getht, $VERSION)|" configure.in +# ensure version number in configure.ac is set correctly +sed -i "s|^AC_INIT(getht, .*)$|AC_INIT(getht, $VERSION)|" configure.ac echo Building necessary autotools parts autoreconf -i -- cgit v1.2.3