From b980c02fdb41c95ad45663137bdf20b3561e7cb0 Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Fri, 26 Apr 2013 06:05:30 +0000 Subject: configure.ac (Sebastian Pipping) --- Makefile.in | 2 +- config.h.in | 2 +- configure.ac | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 186 -------------------------------------------------- html/Makefile.in | 2 +- lang/Makefile.in | 2 +- libtest/Makefile.in | 2 +- m4/Makefile.in | 2 +- man/Makefile.in | 2 +- src/Makefile.in | 2 +- templates/Makefile.in | 2 +- 11 files changed, 195 insertions(+), 195 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/Makefile.in b/Makefile.in index 0ca0d7c..a582bb0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ missing mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/config.h.in b/config.h.in index 21d37a1..dd9abcc 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Check for dlopen in c */ #undef DLLIB diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..16b84a8 --- /dev/null +++ b/configure.ac @@ -0,0 +1,186 @@ +AC_INIT(src/httrack.c) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADERS(config.h) +AM_INIT_AUTOMAKE(httrack, 3.47.5) +VERSION_INFO="2:47:0" +AM_MAINTAINER_MODE + +AC_PREREQ(2.50) + +AC_PROG_CC +AC_PROG_CXX +AC_STDC_HEADERS +AM_PROG_LIBTOOL +AC_PROG_LN_S + +### Default CFLAGS +DEFAULT_CFLAGS="" +DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ +-Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \ +-Wnested-externs -D_REENTRANT" +AC_SUBST(DEFAULT_CFLAGS) +AC_SUBST(VERSION_INFO) + +### Check for platform +#case $host in +#AIX) AC_DEFINE(HTS_PLATFORM, 1, [Defined to build under AIX]);; +#*-solaris*) AC_DEFINE(HTS_PLATFORM, 2, [Defined to build under solaris]);; +#*-linux-gnu | *-irix6*) AC_DEFINE(HTS_PLATFORM, 3, [Defined to build under Linux]);; +#*) AC_DEFINE(HTS_PLATFORM, 3, [Default value used]);; +#esac + +### Check size of long and long long. +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) + +### Check LLint format +if test x"$ac_cv_sizeof_long" = x"8"; then +AC_MSG_CHECKING(long printf format) +AC_TRY_RUN([#include +main() { long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); + exit (c != 1234 || d != -1); } +], + [AC_MSG_RESULT(found) + AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format]) + AC_DEFINE(LLINT_TYPE,long int,[LLint type]) +], +[ +AC_TRY_RUN([#include +main() { long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); + exit (c != 1234 || d != -1); } +], +[ + AC_MSG_RESULT(found) + AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) + AC_DEFINE(LLINT_TYPE,long int,[LLint type]) +], +[ + AC_MSG_RESULT(no) + AC_MSG_RESULT(assuming not on target machine) + AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) + AC_DEFINE(LLINT_TYPE,int,[LLint type]) +]) +]) +elif test x"$ac_cv_sizeof_long_long" = x"8"; then +AC_MSG_CHECKING(long long printf format) +AC_TRY_RUN([#include +main() { long long int c = -1, d = -1; char* f = "%lld"; sscanf("1234", f, &c, &d); + exit (c != 1234 || d != -1); } +], + [AC_MSG_RESULT(found) + AC_DEFINE(LLINT_FORMAT,"%lld",[LLint format]) + AC_DEFINE(LLINT_TYPE,long long int,[LLint type]) +], +[ +AC_TRY_RUN([#include +main() { long long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); + exit (c != 1234 || d != -1); } +], +[ + AC_MSG_RESULT(found) + AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format]) + AC_DEFINE(LLINT_TYPE,long long int,[LLint type]) +], +[ +AC_TRY_RUN([#include +main() { long long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); + exit (c != 1234 || d != -1); } +], +[ + AC_MSG_RESULT(found) + AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) + AC_DEFINE(LLINT_TYPE,long long int,[LLint type]) +], +[ + AC_MSG_RESULT(no) + AC_MSG_RESULT(assuming not on target machine) + AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) + AC_DEFINE(LLINT_TYPE,int,[LLint type]) +]) +]) +]) +else +AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) +AC_DEFINE(LLINT_TYPE,int,[LLint type]) +fi + +### check for in_addr_t +AC_CHECK_TYPE(in_addr_t, +AC_DEFINE(HTS_DO_NOT_REDEFINE_in_addr_t,,[Check for in_addr_t]), +AC_MSG_WARN([*** in_addr_t not found]), +[#include +#include ]) + +### zlib +CHECK_ZLIB() + +### Support IPv6 +AC_CHECK_LIB(c, getaddrinfo, [V6_FLAG="-DINET6" +AC_DEFINE(HTS_INET6, 1,[Check for IPv6])], AC_MSG_WARN([*** IPv6 not found IPv6 compatibility disabled])) +AC_SUBST(V6_FLAG) + +### Check for LFS +AC_CHECK_LIB(c, fopen64, [LFS_FLAG="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" +AC_DEFINE(HTS_LFS, 1,[Check for large files support])], AC_MSG_RESULT([not found])) +AC_SUBST(LFS_FLAG) + +### Check for pthread +AC_CHECK_LIB(pthread, pthread_create, [THREADS_LIBS=-lpthread +AC_DEFINE(THREADS, 1,[Check for pthread])], AC_MSG_RESULT([not found])) +AC_SUBST(THREADS_LIBS) +if test x$THREADS_LIBS = x +then +AC_CHECK_LIB(c, pthread_create, [THREADS_LIBS= +AC_DEFINE(THREADS, 1,[Check for pthread in c])], AC_MSG_RESULT([not found])) +AC_SUBST(THREADS_LIBS) +if test x$THREADS_LIBS = x +then +AC_CHECK_LIB(pthreads, pthread_create, [THREADS_LIBS= +AC_DEFINE(THREADS, 1,[Check for pthread in pthreads])], AC_MSG_WARN([*** not found])) +AC_SUBST(THREADS_LIBS) +fi +fi +THREADS_CFLAGS= +AC_SUBST(THREADS_CFLAGS) + +### Check for socket/nsl (solaris) +AC_CHECK_LIB(socket, socket, [SOCKET_LIBS="-lnsl -lsocket" +AC_DEFINE(LIBSOCKET, 1,[Check for libsocket])], AC_MSG_RESULT([not necessary])) +AC_SUBST(SOCKET_LIBS) + +### Check for iconv +AC_CHECK_LIB(iconv, iconv, [ICONV_LIBS="-liconv" +AC_DEFINE(LIBICONV, 1,[Check for libiconv])], AC_MSG_RESULT([not necessary])) +AC_SUBST(ICONV_LIBS) + +### Check for dlsym +AC_CHECK_LIB(dl, dlopen, [DL_LIBS=-ldl +AC_DEFINE(DLLIB, 1,[Check for dl])], AC_MSG_RESULT([not found])) +AC_SUBST(DL_LIBS) +if test x$DL_LIBS = x +then +AC_CHECK_LIB(c, dlopen, [DL_LIBS= +AC_DEFINE(DLLIB, 1,[Check for dlopen in c])], AC_MSG_WARN([*** not found * this is bad])) +AC_SUBST(DL_LIBS) +fi + +### Check for ftime +AC_CHECK_LIB(c, ftime, [ +AC_DEFINE(FTIME, 1,[Check for ftime])], AC_MSG_RESULT([not found])) + +### Check for setuid +AC_CHECK_LIB(c, setuid, [ +AC_DEFINE(SETUID, 1,[Check for setuid])], AC_MSG_RESULT([not found])) + +### Check for snprintf +AC_FUNC_SNPRINTF() + +AC_OUTPUT([ Makefile +src/Makefile +man/Makefile +m4/Makefile +templates/Makefile +lang/Makefile +html/Makefile +libtest/Makefile +]) diff --git a/configure.in b/configure.in deleted file mode 100644 index 16b84a8..0000000 --- a/configure.in +++ /dev/null @@ -1,186 +0,0 @@ -AC_INIT(src/httrack.c) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE(httrack, 3.47.5) -VERSION_INFO="2:47:0" -AM_MAINTAINER_MODE - -AC_PREREQ(2.50) - -AC_PROG_CC -AC_PROG_CXX -AC_STDC_HEADERS -AM_PROG_LIBTOOL -AC_PROG_LN_S - -### Default CFLAGS -DEFAULT_CFLAGS="" -DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ --Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \ --Wnested-externs -D_REENTRANT" -AC_SUBST(DEFAULT_CFLAGS) -AC_SUBST(VERSION_INFO) - -### Check for platform -#case $host in -#AIX) AC_DEFINE(HTS_PLATFORM, 1, [Defined to build under AIX]);; -#*-solaris*) AC_DEFINE(HTS_PLATFORM, 2, [Defined to build under solaris]);; -#*-linux-gnu | *-irix6*) AC_DEFINE(HTS_PLATFORM, 3, [Defined to build under Linux]);; -#*) AC_DEFINE(HTS_PLATFORM, 3, [Default value used]);; -#esac - -### Check size of long and long long. -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(long long) - -### Check LLint format -if test x"$ac_cv_sizeof_long" = x"8"; then -AC_MSG_CHECKING(long printf format) -AC_TRY_RUN([#include -main() { long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); - exit (c != 1234 || d != -1); } -], - [AC_MSG_RESULT(found) - AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format]) - AC_DEFINE(LLINT_TYPE,long int,[LLint type]) -], -[ -AC_TRY_RUN([#include -main() { long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); - exit (c != 1234 || d != -1); } -], -[ - AC_MSG_RESULT(found) - AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) - AC_DEFINE(LLINT_TYPE,long int,[LLint type]) -], -[ - AC_MSG_RESULT(no) - AC_MSG_RESULT(assuming not on target machine) - AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) - AC_DEFINE(LLINT_TYPE,int,[LLint type]) -]) -]) -elif test x"$ac_cv_sizeof_long_long" = x"8"; then -AC_MSG_CHECKING(long long printf format) -AC_TRY_RUN([#include -main() { long long int c = -1, d = -1; char* f = "%lld"; sscanf("1234", f, &c, &d); - exit (c != 1234 || d != -1); } -], - [AC_MSG_RESULT(found) - AC_DEFINE(LLINT_FORMAT,"%lld",[LLint format]) - AC_DEFINE(LLINT_TYPE,long long int,[LLint type]) -], -[ -AC_TRY_RUN([#include -main() { long long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); - exit (c != 1234 || d != -1); } -], -[ - AC_MSG_RESULT(found) - AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format]) - AC_DEFINE(LLINT_TYPE,long long int,[LLint type]) -], -[ -AC_TRY_RUN([#include -main() { long long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); - exit (c != 1234 || d != -1); } -], -[ - AC_MSG_RESULT(found) - AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) - AC_DEFINE(LLINT_TYPE,long long int,[LLint type]) -], -[ - AC_MSG_RESULT(no) - AC_MSG_RESULT(assuming not on target machine) - AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) - AC_DEFINE(LLINT_TYPE,int,[LLint type]) -]) -]) -]) -else -AC_DEFINE(LLINT_FORMAT,"%d",[LLint format]) -AC_DEFINE(LLINT_TYPE,int,[LLint type]) -fi - -### check for in_addr_t -AC_CHECK_TYPE(in_addr_t, -AC_DEFINE(HTS_DO_NOT_REDEFINE_in_addr_t,,[Check for in_addr_t]), -AC_MSG_WARN([*** in_addr_t not found]), -[#include -#include ]) - -### zlib -CHECK_ZLIB() - -### Support IPv6 -AC_CHECK_LIB(c, getaddrinfo, [V6_FLAG="-DINET6" -AC_DEFINE(HTS_INET6, 1,[Check for IPv6])], AC_MSG_WARN([*** IPv6 not found IPv6 compatibility disabled])) -AC_SUBST(V6_FLAG) - -### Check for LFS -AC_CHECK_LIB(c, fopen64, [LFS_FLAG="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" -AC_DEFINE(HTS_LFS, 1,[Check for large files support])], AC_MSG_RESULT([not found])) -AC_SUBST(LFS_FLAG) - -### Check for pthread -AC_CHECK_LIB(pthread, pthread_create, [THREADS_LIBS=-lpthread -AC_DEFINE(THREADS, 1,[Check for pthread])], AC_MSG_RESULT([not found])) -AC_SUBST(THREADS_LIBS) -if test x$THREADS_LIBS = x -then -AC_CHECK_LIB(c, pthread_create, [THREADS_LIBS= -AC_DEFINE(THREADS, 1,[Check for pthread in c])], AC_MSG_RESULT([not found])) -AC_SUBST(THREADS_LIBS) -if test x$THREADS_LIBS = x -then -AC_CHECK_LIB(pthreads, pthread_create, [THREADS_LIBS= -AC_DEFINE(THREADS, 1,[Check for pthread in pthreads])], AC_MSG_WARN([*** not found])) -AC_SUBST(THREADS_LIBS) -fi -fi -THREADS_CFLAGS= -AC_SUBST(THREADS_CFLAGS) - -### Check for socket/nsl (solaris) -AC_CHECK_LIB(socket, socket, [SOCKET_LIBS="-lnsl -lsocket" -AC_DEFINE(LIBSOCKET, 1,[Check for libsocket])], AC_MSG_RESULT([not necessary])) -AC_SUBST(SOCKET_LIBS) - -### Check for iconv -AC_CHECK_LIB(iconv, iconv, [ICONV_LIBS="-liconv" -AC_DEFINE(LIBICONV, 1,[Check for libiconv])], AC_MSG_RESULT([not necessary])) -AC_SUBST(ICONV_LIBS) - -### Check for dlsym -AC_CHECK_LIB(dl, dlopen, [DL_LIBS=-ldl -AC_DEFINE(DLLIB, 1,[Check for dl])], AC_MSG_RESULT([not found])) -AC_SUBST(DL_LIBS) -if test x$DL_LIBS = x -then -AC_CHECK_LIB(c, dlopen, [DL_LIBS= -AC_DEFINE(DLLIB, 1,[Check for dlopen in c])], AC_MSG_WARN([*** not found * this is bad])) -AC_SUBST(DL_LIBS) -fi - -### Check for ftime -AC_CHECK_LIB(c, ftime, [ -AC_DEFINE(FTIME, 1,[Check for ftime])], AC_MSG_RESULT([not found])) - -### Check for setuid -AC_CHECK_LIB(c, setuid, [ -AC_DEFINE(SETUID, 1,[Check for setuid])], AC_MSG_RESULT([not found])) - -### Check for snprintf -AC_FUNC_SNPRINTF() - -AC_OUTPUT([ Makefile -src/Makefile -man/Makefile -m4/Makefile -templates/Makefile -lang/Makefile -html/Makefile -libtest/Makefile -]) diff --git a/html/Makefile.in b/html/Makefile.in index e739995..e3fd817 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -39,7 +39,7 @@ host_triplet = @host@ subdir = html DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/lang/Makefile.in b/lang/Makefile.in index 3ae1ad2..9ea7d47 100644 --- a/lang/Makefile.in +++ b/lang/Makefile.in @@ -39,7 +39,7 @@ host_triplet = @host@ subdir = lang DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/libtest/Makefile.in b/libtest/Makefile.in index 97b8a0a..978c2ca 100644 --- a/libtest/Makefile.in +++ b/libtest/Makefile.in @@ -40,7 +40,7 @@ host_triplet = @host@ subdir = libtest DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/m4/Makefile.in b/m4/Makefile.in index f0350d5..e11b3a3 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -38,7 +38,7 @@ host_triplet = @host@ subdir = m4 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/man/Makefile.in b/man/Makefile.in index d21dba4..894164b 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -38,7 +38,7 @@ host_triplet = @host@ subdir = man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/Makefile.in b/src/Makefile.in index f293b62..357edff 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -45,7 +45,7 @@ bin_PROGRAMS = proxytrack$(EXEEXT) httrack$(EXEEXT) htsserver$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/templates/Makefile.in b/templates/Makefile.in index 426adf8..9ad0703 100644 --- a/templates/Makefile.in +++ b/templates/Makefile.in @@ -39,7 +39,7 @@ host_triplet = @host@ subdir = templates DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -- cgit v1.2.3