summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--configure.in16
-rw-r--r--src/filename_list.cxx7
3 files changed, 21 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 1e01d9d79..35b7a459c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@ CHANGES SINCE FLTK 1.0.10
- Eliminated all "string literal converted to char *"
warnings.
+ - Added support for AIX (static library only).
+
- Fl_has_idle only tested N-1 callbacks and missed one.
- Restored WM_SYNCPAINT handling under WIN32; this fixed
diff --git a/configure.in b/configure.in
index 4b05cf97b..95dfc831d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf"
dnl
-dnl "$Id: configure.in,v 1.33.2.25 2001/02/21 21:37:30 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.26 2001/04/13 19:13:14 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@@ -81,6 +81,12 @@ if eval "test x$enable_shared = xyes"; then
DSONAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
;;
+ AIX*)
+ PICFLAG=0
+
+ echo "Warning: shared libraries are not currently supported under AIX."
+ echo " Building static libraries."
+ ;;
*)
echo "Warning: shared libraries may not be supported. Trying -shared"
echo " option with compiler."
@@ -311,6 +317,12 @@ else
CXXFLAGS="-PIC $CXXFLAGS"
fi
;;
+ AIX*)
+ if test -z "$DEBUGFLAG"; then
+ CFLAGS="-O2 $CFLAGS"
+ CXXFLAGS="-O2 $CXXFLAGS"
+ fi
+ ;;
*)
# Running some other operating system; inform the user they
# should contribute the necessary options to fltk-bugs@fltk.org...
@@ -334,5 +346,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude)
dnl
-dnl End of "$Id: configure.in,v 1.33.2.25 2001/02/21 21:37:30 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.26 2001/04/13 19:13:14 easysw Exp $".
dnl
diff --git a/src/filename_list.cxx b/src/filename_list.cxx
index 9c636f4af..cc87ea44f 100644
--- a/src/filename_list.cxx
+++ b/src/filename_list.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: filename_list.cxx,v 1.10.2.9 2001/01/22 15:13:40 easysw Exp $"
+// "$Id: filename_list.cxx,v 1.10.2.10 2001/04/13 19:13:14 easysw Exp $"
//
// Filename list routines for the Fast Light Tool Kit (FLTK).
//
@@ -46,6 +46,9 @@ int filename_list(const char *d, dirent ***list) {
#elif defined(__osf__)
// OSF, DU 4.0x
return scandir(d, list, 0, (int(*)(dirent **, dirent **))numericsort);
+#elif defined(__aix)
+ // AIX is almost standard...
+ return scandir(d, list, 0, (int(*)(void*, void*))numericsort);
#elif HAVE_SCANDIR && !defined(__sgi)
// The vast majority of Unix systems want the sort function to have this
// prototype, most likely so that it can be passed to qsort without any
@@ -59,5 +62,5 @@ int filename_list(const char *d, dirent ***list) {
}
//
-// End of "$Id: filename_list.cxx,v 1.10.2.9 2001/01/22 15:13:40 easysw Exp $".
+// End of "$Id: filename_list.cxx,v 1.10.2.10 2001/04/13 19:13:14 easysw Exp $".
//