Bug 597: fix the strftime check to include arguments, to avoid a conflict

         in gcc-3.3

diff --git a/CHANGES b/CHANGES
index a30187c9ac9ac3e104949899e44e4ec121f91ee0..da32a4d82400180d251575ff5707a8f47aa618a6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.2.1
 
+* check strftime with arguments, gcc-3.3 fix (23 Dec 2004)
 * initialize some variables in some scripts that may not
   be initialzed in setup.cache (23 Dec 2004)
 * remove need to have separate "fax" user (22 Dec 2004)

diff --git a/configure b/configure
index 2576076c97555a888f3216e4723f0950d7997c5a..b580a21ca437d0d07d9a0e7fe13084d6b324661e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1521,6 +1521,22 @@ EOF
     runMake t "t:; \${CCF} t.c $libs"
 }
 
+#
+# Look for a library using a known (unique) function.
+#
+CheckForLibraryWithArgs()
+{
+    f=$1; shift
+    a=$1; shift
+    libs="$@";
+    cat>t.c<<EOF
+int t() { $f($a); return 0; }
+int main(){ t(); return 0; }
+EOF
+    capture cat t.c
+    runMake t "t:; \${CCF} t.c $libs"
+}
+
 #
 # Look for an include file.
 #
@@ -1590,7 +1606,7 @@ CheckForLibrary crypt -lc || {
        fi
     done
 }
-CheckForLibrary strftime -lc || {
+CheckForLibraryWithArgs strftime "(void*)0, 0, (void*)0, (void*)0" -lc || {
     #
     # SCO has strftime in -lintl.
     #