diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-12-29 12:57:40 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-12-29 12:57:40 +0200 |
| commit | dd2516767fa58d56684e003f646ef6d611051a64 (patch) | |
| tree | 9fd1a78bfdc3779b049f3ef9bc252a3a0f518f8a | |
| parent | bf8adb089c0dab26292ede736e74d1bb20d6dbc8 (diff) | |
| parent | 0fca23de625d0643be52f7c70f7e117bce4cbfde (diff) | |
| download | egawk-dd2516767fa58d56684e003f646ef6d611051a64.tar.gz egawk-dd2516767fa58d56684e003f646ef6d611051a64.tar.bz2 egawk-dd2516767fa58d56684e003f646ef6d611051a64.zip | |
Merge branch 'master' into feature/fix-comments
| -rw-r--r-- | extension/ChangeLog | 9 | ||||
| -rw-r--r-- | extension/configh.in | 3 | ||||
| -rwxr-xr-x | extension/configure | 28 | ||||
| -rw-r--r-- | extension/configure.ac | 4 |
4 files changed, 27 insertions, 17 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 5fd1757e..06eedf3e 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +2017-12-29 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac (fmod): Put AC_SEARCH_LIBS before the call + to AC_CHECK_FUNCS and put fmod back into that list. Finally + causes config.h to have the correct check for HAVE_FMOD. + Thanks again to Michal Jaegermann <michal.jnn@gmail.com>. + 2017-12-28 Arnold D. Robbins <arnold@skeeve.com> More configuration fixes, mainly for Fedora. Thanks to @@ -6,7 +13,7 @@ * configure.ac (AC_HEADER_MAJOR): Comment out, no longer works. (sys/sysmacros.h, sys/mkdev.h): Check for header existence. - (fmod): Check with AC_SEARCH_LIB instead of AC_CHECK_FUNCS. + (fmod): Check with AC_SEARCH_LIBs instead of AC_CHECK_FUNCS. * filefuncs.c: Rework header inclusion checks and order so that we get the `major' macro without warnings on Fedora. * fnmatch.c: Ditto. diff --git a/extension/configh.in b/extension/configh.in index c2b16d7b..2789e1a7 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -27,6 +27,9 @@ /* Define to 1 if you have the `fdopendir' function. */ #undef HAVE_FDOPENDIR +/* Define to 1 if you have the `fmod' function. */ +#undef HAVE_FMOD + /* Define to 1 if you have the `fnmatch' function. */ #undef HAVE_FNMATCH diff --git a/extension/configure b/extension/configure index 854e296f..084334e1 100755 --- a/extension/configure +++ b/extension/configure @@ -12911,20 +12911,6 @@ $as_echo "#define HAVE_MPFR 1" >>confdefs.h ;; esac -for ac_func in fdopendir fnmatch getdtablesize \ - gettimeofday nanosleep select statvfs \ - GetSystemTimeAsFileTime -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 : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fmod" >&5 $as_echo_n "checking for library containing fmod... " >&6; } if ${ac_cv_search_fmod+:} false; then : @@ -12981,6 +12967,20 @@ if test "$ac_res" != no; then : fi +for ac_func in fdopendir fmod fnmatch getdtablesize \ + gettimeofday nanosleep select statvfs \ + GetSystemTimeAsFileTime +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 : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + diff --git a/extension/configure.ac b/extension/configure.ac index 14259333..e8b242a0 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -96,10 +96,10 @@ case `uname -m` in ;; esac -AC_CHECK_FUNCS(fdopendir fnmatch getdtablesize \ +AC_SEARCH_LIBS(fmod, m) +AC_CHECK_FUNCS(fdopendir fmod fnmatch getdtablesize \ gettimeofday nanosleep select statvfs \ GetSystemTimeAsFileTime) -AC_SEARCH_LIBS(fmod, m) GAWK_FUNC_DIRFD GAWK_PREREQ_DIRFD |