diff options
| author | Nick White <git@njw.me.uk> | 2009-03-05 05:45:03 +0000 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2009-03-05 05:45:03 +0000 |
| commit | 6a7da14fe5b1f8666ee7e3994fbd975e83f7b43a (patch) | |
| tree | 394489cb2084c35b41b184501fd416897962fb2d | |
| parent | 499575cf05fd6e0f3b3f0ccf581403996b597eb9 (diff) | |
Improved build scripts
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 5b354a5..daf2e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,45 +1,32 @@ # -*- 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]) +AC_PREREQ([2.63]) +AC_INIT([getht], [0.1]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE() # Checks for programs. AC_PROG_CC -AC_PROG_INSTALL +AC_PROG_AWK +AC_PROG_MAKE_SET # Checks for libraries. - -dnl check for libxml2 -AM_PATH_XML2([2.0.0]) -CFLAGS="$CFLAGS $XML_CPPFLAGS" -LIBS="$LIBS $XML_LIBS" -#PKG_CHECK_MODULES(libxml-2.0) -#AC_SUBST(XML_CPPFLAGS) -#AC_SUBST(XML_LIBS) - -dnl check for libcurl -LIBCURL_CHECK_CONFIG([yes], [7.7.2]) -CFLAGS="$CFLAGS $LIBCURL_CPPFLAGS" -LIBS="$LIBS $LIBCURL" +PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.0.0]) +PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.7.2]) +LIBS="$LIBXML2_LIBS $LIBCURL_LIBS $LIBS" +CFLAGS="$LIBXML2_CFLAGS $LIBCURL_CFLAGS $CFLAGS" # 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_CHECK_FUNCS([mkdir]) AC_CONFIG_FILES([Makefile doc/Makefile |