From f7d82446b4b95c21dfec2b7788093ce5f6974143 Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 24 Dec 2014 13:37:32 +0000 Subject: [PATCH] - configure.ac: minor cleanups git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5110 82007160-df01-0410-b94d-b575c5fd34c7 --- configure | 100 +++----------------------------------- configure.ac | 13 ++--- src/libopm/configure | 90 ++-------------------------------- src/libopm/configure.ac | 3 +- src/libopm/src/setup.h.in | 6 --- src/setup.h.in | 6 --- 6 files changed, 18 insertions(+), 200 deletions(-) diff --git a/configure b/configure index 09b9ba5..22ff393 100755 --- a/configure +++ b/configure @@ -12467,87 +12467,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - -#ifndef __cplusplus - /* Ultrix mips cc rejects this sort of thing. */ - typedef int charset[2]; - const charset cs = { 0, 0 }; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this sort of thing. */ - char tx; - char *t = &tx; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; } bx; - struct s *b = &bx; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes -else - ac_cv_c_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -$as_echo "#define const /**/" >>confdefs.h - -fi - ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes; then : @@ -13123,13 +13042,12 @@ fi done -for ac_func in gethostbyname gethostbyname2 +for ac_func in gethostbyname do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +if test "x$ac_cv_func_gethostbyname" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GETHOSTBYNAME 1 _ACEOF fi @@ -15838,11 +15756,9 @@ fi -echo "##############################################################################" -echo "Everything is now configured, but you can find some more (infrequently" -echo "changed) options in options.h. To compile HOPM now, just type make. It" -echo "requires GNU Make, which may be installed as gmake on your system." +echo "###############################################################################" +echo "Configuration complete. Type make (or gmake on some *BSD machines) to compile." echo -echo "hopm will be installed in ${prefix}. To change this, run:" +echo "HOPM will be installed in ${prefix}. To change this, run:" echo " ./configure --prefix=DIRECTORY" -echo "##############################################################################" +echo "###############################################################################" diff --git a/configure.ac b/configure.ac index f593246..15011f2 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,6 @@ AC_CHECK_HEADERS(sys/poll.h, have_poll_sys_h=yes, have_sys_poll_h=no) AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h strings.h) dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST AC_TYPE_SIZE_T AC_HEADER_TIME AC_STRUCT_TM @@ -65,7 +64,7 @@ AC_CHECK_FUNC(getnameinfo, [], AC_SEARCH_LIBS(getnameinfo, nsl)) AC_CHECK_FUNCS(strlcpy strlcat inet_aton inet_pton socket strdup strstr) dnl Check if we can use gethostbyname2 for ipv6 -AC_CHECK_FUNCS(gethostbyname gethostbyname2) +AC_CHECK_FUNCS(gethostbyname) dnl AIX fun AC_C_BIGENDIAN @@ -96,11 +95,9 @@ AC_CONFIG_SUBDIRS(src/libopm) AC_OUTPUT(Makefile doc/Makefile src/Makefile) -echo "##############################################################################" -echo "Everything is now configured, but you can find some more (infrequently" -echo "changed) options in options.h. To compile HOPM now, just type make. It" -echo "requires GNU Make, which may be installed as gmake on your system." +echo "###############################################################################" +echo "Configuration complete. Type make (or gmake on some *BSD machines) to compile." echo -echo "hopm will be installed in ${prefix}. To change this, run:" +echo "HOPM will be installed in ${prefix}. To change this, run:" echo " ./configure --prefix=DIRECTORY" -echo "##############################################################################" +echo "###############################################################################" diff --git a/src/libopm/configure b/src/libopm/configure index e67e9b2..6df73ba 100755 --- a/src/libopm/configure +++ b/src/libopm/configure @@ -12280,87 +12280,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - -#ifndef __cplusplus - /* Ultrix mips cc rejects this sort of thing. */ - typedef int charset[2]; - const charset cs = { 0, 0 }; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this sort of thing. */ - char tx; - char *t = &tx; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; } bx; - struct s *b = &bx; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes -else - ac_cv_c_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -$as_echo "#define const /**/" >>confdefs.h - -fi - ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes; then : @@ -12440,13 +12359,12 @@ fi done -for ac_func in gethostbyname gethostbyname2 +for ac_func in gethostbyname do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +if test "x$ac_cv_func_gethostbyname" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GETHOSTBYNAME 1 _ACEOF fi diff --git a/src/libopm/configure.ac b/src/libopm/configure.ac index ce36321..deff312 100644 --- a/src/libopm/configure.ac +++ b/src/libopm/configure.ac @@ -39,7 +39,6 @@ AC_CHECK_HEADERS(sys/poll.h, have_poll_sys_h=yes, have_sys_poll_h=no) AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h strings.h) dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST AC_TYPE_SIZE_T AC_HEADER_TIME @@ -55,7 +54,7 @@ fi AC_CHECK_FUNCS(inet_aton inet_pton) dnl Check if we can use gethostbyname2 for ipv6 -AC_CHECK_FUNCS(gethostbyname gethostbyname2) +AC_CHECK_FUNCS(gethostbyname) dnl AIX fun AC_C_BIGENDIAN diff --git a/src/libopm/src/setup.h.in b/src/libopm/src/setup.h.in index 02b48ba..afb7e78 100644 --- a/src/libopm/src/setup.h.in +++ b/src/libopm/src/setup.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME -/* Define to 1 if you have the `gethostbyname2' function. */ -#undef HAVE_GETHOSTBYNAME2 - /* Define to 1 if you have the `inet_aton' function. */ #undef HAVE_INET_ATON @@ -102,8 +99,5 @@ # endif #endif -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - /* Define to `unsigned int' if does not define. */ #undef size_t diff --git a/src/setup.h.in b/src/setup.h.in index 6b190f1..0e6a91b 100644 --- a/src/setup.h.in +++ b/src/setup.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME -/* Define to 1 if you have the `gethostbyname2' function. */ -#undef HAVE_GETHOSTBYNAME2 - /* Define to 1 if you have the `inet_aton' function. */ #undef HAVE_INET_ATON @@ -136,9 +133,6 @@ `char[]'. */ #undef YYTEXT_POINTER -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - /* Define to `unsigned int' if does not define. */ #undef size_t -- 2.30.2