Author: bgbnbigben
Date: 2011-02-15 17:26:58 -0800 (Tue, 15 Feb 2011)
New Revision: 8434
Log:
Rejigged the configure.in file to work slightly better than it did.


Modified:
   trunk/configure.in

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in  2011-02-16 01:09:42 UTC (rev 8433)
+++ trunk/configure.in  2011-02-16 01:26:58 UTC (rev 8434)
@@ -335,12 +335,6 @@
 AC_HEADER_DIRENT
 AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H))
 AC_CHECK_HEADER(sys/stdtypes.h,AC_DEFINE(HAVE_SYS_SELECT_H))
-AC_CHECK_FUNC(scandir,[
-    if test "$uname" = SunOS -o "$uname" = QNX; then
-        AC_MSG_WARN(Not using $uname scandir emulation function unless POSIX 
compatible definitions are found.)
-    else
-        AC_DEFINE(HAVE_SCANDIR)
-    fi])
 
 dnl Do we have the POSIX compatible scandir() prototype?
 AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype],
@@ -358,10 +352,16 @@
     ])
 
 if test "$ac_cv_cxx_scandir_posix" = yes; then
-    AC_DEFINE(HAVE_SCANDIR)
     AC_DEFINE(HAVE_SCANDIR_POSIX)
 fi
 
+AC_CHECK_FUNC(scandir,[
+    if test \("$uname" = SunOS -o "$uname" = QNX\ -a 
"$ac_cv_cxx_scandir_posix" != yes; then
+        AC_MSG_WARN(Not using $uname scandir emulation function.)
+    else
+        AC_DEFINE(HAVE_SCANDIR)
+    fi])
+
 dnl String headers and functions...
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
 AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to