From 7ec29c39d339f4b452156ac939e38224349ae288 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Thu, 2 Apr 2026 17:25:17 +0200 Subject: [PATCH 1/5] [cmake] Set missing target properties for builtin freetype --- builtins/freetype/CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/builtins/freetype/CMakeLists.txt b/builtins/freetype/CMakeLists.txt index be5033bfc4e14..2ed5e4c3bb4ec 100644 --- a/builtins/freetype/CMakeLists.txt +++ b/builtins/freetype/CMakeLists.txt @@ -11,7 +11,7 @@ set(FREETYPE_HASH "e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c89 set(FREETYPE_PREFIX ${CMAKE_BINARY_DIR}/builtins/FREETYPE-prefix) -# The CMake of FreeType will call the static library differently if the CMAKE_BUILD_TYPE is Debug, bu adding a +# The CMake of FreeType will call the static library differently if the CMAKE_BUILD_TYPE is Debug, by adding a # "d" to the name of the file. This is unusual if compared to the behaviour of other ROOT builtins, where the name # changes only between Linux/macOS and Windows. if(MSVC) @@ -60,15 +60,23 @@ ExternalProject_Add( TIMEOUT 600 ) +set(incdir ${FREETYPE_PREFIX}/include/freetype2) +file(MAKE_DIRECTORY "${incdir}") + add_library(Freetype::Freetype IMPORTED STATIC GLOBAL) +set_target_properties(Freetype::Freetype PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${FREETYPE_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${incdir}") + +if(builtin_zlib) + add_dependencies(BUILTIN_FREETYPE BUILTIN_ZLIB) +endif() + # Set the canonical output of find_package according to # https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#standard-variable-names -set(FREETYPE_INCLUDE_DIRS ${FREETYPE_PREFIX}/include/freetype2 PARENT_SCOPE) +set(FREETYPE_INCLUDE_DIRS ${incdir} PARENT_SCOPE) set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} PARENT_SCOPE) set(Freetype_FOUND TRUE PARENT_SCOPE) set(Freetype_VERSION ${FREETYPE_VERSION} PARENT_SCOPE) - -if(builtin_zlib) - add_dependencies(BUILTIN_FREETYPE BUILTIN_ZLIB) -endif() From c93807268077f90cd749a0b298df48967df4a92a Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Mon, 6 Apr 2026 12:42:12 +0200 Subject: [PATCH 2/5] [cmake] link to freetype CMake target [cmake] explicit link to ZLIB since freetype links privately to it --- graf2d/cocoa/CMakeLists.txt | 4 +--- graf2d/graf/CMakeLists.txt | 4 +--- graf2d/win32gdk/CMakeLists.txt | 5 ++--- graf2d/x11ttf/CMakeLists.txt | 4 ++-- graf3d/ftgl/CMakeLists.txt | 3 +-- graf3d/gl/CMakeLists.txt | 3 ++- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/graf2d/cocoa/CMakeLists.txt b/graf2d/cocoa/CMakeLists.txt index 3bdce5e3558a2..6ba704372e0a5 100644 --- a/graf2d/cocoa/CMakeLists.txt +++ b/graf2d/cocoa/CMakeLists.txt @@ -41,13 +41,11 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GCocoa GQuartz ${COCOA_FRAMEWORK} ${OPENGL_FRAMEWORK} - ${FREETYPE_LIBRARIES} + Freetype::Freetype ) target_include_directories(GCocoa PRIVATE ${CMAKE_SOURCE_DIR}/graf3d/gl/inc) # We know GL is deprecated on macOS. And our answer is WebGUI/Graphics. target_compile_options(GCocoa PRIVATE -ObjC++ -Wno-deprecated-declarations) -target_include_directories(GCocoa PRIVATE ${FREETYPE_INCLUDE_DIRS}) - target_include_directories(GCocoa PRIVATE ${OPENGL_INCLUDE_DIR}) diff --git a/graf2d/graf/CMakeLists.txt b/graf2d/graf/CMakeLists.txt index d7d1b77c21a61..f7a0f9703723e 100644 --- a/graf2d/graf/CMakeLists.txt +++ b/graf2d/graf/CMakeLists.txt @@ -88,7 +88,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf DICTIONARY_OPTIONS -writeEmptyRootPCM LIBRARIES - ${FREETYPE_LIBRARIES} + Freetype::Freetype ZLIB::ZLIB mathtext DEPENDENCIES @@ -99,5 +99,3 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf BUILTINS FREETYPE ) - -target_include_directories(Graf PRIVATE ${FREETYPE_INCLUDE_DIRS}) diff --git a/graf2d/win32gdk/CMakeLists.txt b/graf2d/win32gdk/CMakeLists.txt index c25610240fa93..fefd4b9b3387a 100644 --- a/graf2d/win32gdk/CMakeLists.txt +++ b/graf2d/win32gdk/CMakeLists.txt @@ -10,8 +10,7 @@ ############################################################################ # use relative paths to avoid filtering in dictionary generator -include_directories(${FREETYPE_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/gdk/src +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/gdk/src ${CMAKE_CURRENT_SOURCE_DIR}/gdk/src/gdk ${CMAKE_CURRENT_SOURCE_DIR}/gdk/src/glib) @@ -117,7 +116,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Win32gdk DICTIONARY_OPTIONS -writeEmptyRootPCM LIBRARIES - ${FREETYPE_LIBRARIES} + Freetype::Freetype ${gdklib} ${gliblib} Glu32.lib diff --git a/graf2d/x11ttf/CMakeLists.txt b/graf2d/x11ttf/CMakeLists.txt index cd8a77bd07867..dc0902cd941f8 100644 --- a/graf2d/x11ttf/CMakeLists.txt +++ b/graf2d/x11ttf/CMakeLists.txt @@ -20,7 +20,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GX11TTF ${X11_LIBRARIES} ${X11_Xpm_LIB} ${X11_Xft_LIB} - ${FREETYPE_LIBRARIES} + Freetype::Freetype ZLIB::ZLIB ${CMAKE_THREAD_LIBS_INIT} DEPENDENCIES @@ -28,4 +28,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GX11TTF Graf ) -target_include_directories(GX11TTF PRIVATE ${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) +target_include_directories(GX11TTF PRIVATE ${X11_INCLUDE_DIR}) diff --git a/graf3d/ftgl/CMakeLists.txt b/graf3d/ftgl/CMakeLists.txt index 38bd2046db022..2aeb51f5d7ab3 100644 --- a/graf3d/ftgl/CMakeLists.txt +++ b/graf3d/ftgl/CMakeLists.txt @@ -38,14 +38,13 @@ ROOT_LINKER_LIBRARY(FTGL LIBRARIES OpenGL::GL OpenGL::GLU - ${FREETYPE_LIBRARIES} + Freetype::Freetype ZLIB::ZLIB BUILTINS FREETYPE ) target_include_directories(FTGL PRIVATE - ${FREETYPE_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/graf3d/gl/inc ) diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt index 4fb6341aa7d8a..4205969bc42bc 100644 --- a/graf3d/gl/CMakeLists.txt +++ b/graf3d/gl/CMakeLists.txt @@ -209,6 +209,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL OpenGL::GLU ${FTGL_LIBRARIES} ${GL2PS_LIBRARIES} + Freetype::Freetype + ZLIB::ZLIB ${X11_LIBRARIES} ROOTGlad DEPENDENCIES @@ -224,7 +226,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL target_include_directories(RGL PRIVATE ${OPENGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} - ${FREETYPE_INCLUDE_DIRS} ) if(builtin_gl2ps) From c28c8e303468a0c575ae4f4a7d123fb1c61c0f1b Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Thu, 2 Apr 2026 17:26:09 +0200 Subject: [PATCH 3/5] [cmake] Simplify for external freetype --- cmake/modules/SearchInstalledSoftware.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake index c872043cf5c85..882448bdce218 100644 --- a/cmake/modules/SearchInstalledSoftware.cmake +++ b/cmake/modules/SearchInstalledSoftware.cmake @@ -114,7 +114,7 @@ if(asimage) ROOT_FIND_REQUIRED_DEP(GIF builtin_gif) ROOT_FIND_REQUIRED_DEP(JPEG builtin_jpeg) # We cannot PNG here because while searching PNG, CMake will also find ZLIB. - # If found, CMake will define the default variables and target: + # If found, CMake will define the default variables and target: # see https://cmake.org/cmake/help/latest/module/FindZLIB.html). # For this reason, the check has to be put below, after ZLIB is searched for. #ROOT_FIND_REQUIRED_DEP(PNG builtin_png) @@ -252,9 +252,7 @@ if(NOT builtin_freetype) find_package(Freetype REQUIRED) else() find_package(Freetype) - if(FREETYPE_FOUND) - set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR_freetype2}) - else() + if(NOT FREETYPE_FOUND) message(STATUS "FreeType not found. Switching on builtin_freetype option") set(builtin_freetype ON CACHE BOOL "Enabled because FreeType not found (${builtin_freetype_description})" FORCE) endif() From 17ecfa46b5eed4403a08ecf02f03fcaf5fb04495 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Fri, 20 Mar 2026 16:34:44 +0100 Subject: [PATCH 4/5] [afterimage] migrate from configure-make to CMake and merge with Windows make it compile also as part of ROOT suppress debug output in all platforms alma10 has no MMX so detect it macos detect x11 disabled fix typo, simplify check, check for malloc that is not present on mac15 win32: fix wd flags passing add missing dependencies otherwise afterimage might be built before eg JPEG builtin is available fix typo and windows quote --- cmake/modules/RootMacros.cmake | 2 +- cmake/modules/SearchInstalledSoftware.cmake | 99 - graf2d/asimage/CMakeLists.txt | 20 +- graf2d/asimage/README | 79 +- graf2d/asimage/doc/index.md | 2 +- graf2d/asimage/src/TASImage.cxx | 3 +- graf2d/asimage/src/TASPaletteEditor.cxx | 4 +- graf2d/asimage/src/TASPluginGS.cxx | 3 +- graf2d/asimage/src/libAfterImage/.cvsignore | 8 - graf2d/asimage/src/libAfterImage/.depend | 131 - graf2d/asimage/src/libAfterImage/.shared | 44 - .../asimage/src/libAfterImage/CMakeLists.txt | 182 +- graf2d/asimage/src/libAfterImage/ChangeLog | 3797 ------ graf2d/asimage/src/libAfterImage/Makefile.in | 406 - graf2d/asimage/src/libAfterImage/README | 30 - graf2d/asimage/src/libAfterImage/aclocal.m4 | 988 -- graf2d/asimage/src/libAfterImage/afterbase.c | 9 +- graf2d/asimage/src/libAfterImage/afterbase.h | 38 +- .../asimage/src/libAfterImage/afterbase.h.in | 41 - .../src/libAfterImage/afterimage-config.in | 141 - .../src/libAfterImage/afterimage-libs.in | 27 - graf2d/asimage/src/libAfterImage/afterimage.h | 14 - .../src/libAfterImage/afterrootpngwrite.c | 6 - graf2d/asimage/src/libAfterImage/ascmap.c | 10 - graf2d/asimage/src/libAfterImage/asfont.c | 11 - .../src/libAfterImage/asim_afterbase.h | 23 +- graf2d/asimage/src/libAfterImage/asimage.c | 11 - graf2d/asimage/src/libAfterImage/asimage.h | 2 - graf2d/asimage/src/libAfterImage/asstorage.c | 15 - graf2d/asimage/src/libAfterImage/asvisual.c | 14 +- graf2d/asimage/src/libAfterImage/asvisual.h | 10 +- graf2d/asimage/src/libAfterImage/blender.c | 12 +- graf2d/asimage/src/libAfterImage/bmp.c | 5 +- graf2d/asimage/src/libAfterImage/char2uni.c | 10 - graf2d/asimage/src/libAfterImage/config.guess | 1815 --- graf2d/asimage/src/libAfterImage/config.h.in | 179 - graf2d/asimage/src/libAfterImage/config.sub | 1807 --- graf2d/asimage/src/libAfterImage/configure | 10614 ---------------- graf2d/asimage/src/libAfterImage/configure.in | 796 -- graf2d/asimage/src/libAfterImage/draw.c | 12 +- graf2d/asimage/src/libAfterImage/export.c | 45 +- graf2d/asimage/src/libAfterImage/imencdec.c | 12 +- graf2d/asimage/src/libAfterImage/import.c | 16 +- graf2d/asimage/src/libAfterImage/import.h | 2 - graf2d/asimage/src/libAfterImage/install-sh | 323 - .../src/libAfterImage/libAfterImage.dsp | 573 - .../src/libAfterImage/libAfterImage.dsw | 44 - .../src/libAfterImage/libAfterImage.mak | 813 -- graf2d/asimage/src/libAfterImage/scanline.c | 14 +- graf2d/asimage/src/libAfterImage/test_mmx.c | 6 +- graf2d/asimage/src/libAfterImage/transform.c | 9 - graf2d/asimage/src/libAfterImage/ungif.c | 12 +- .../src/libAfterImage/win32/StdAfx.cpp | 8 - .../asimage/src/libAfterImage/win32/StdAfx.h | 28 - .../src/libAfterImage/win32/afterbase.h | 12 - .../src/libAfterImage/win32/asview.cpp | 159 - .../src/libAfterImage/win32/asview.dsp | 122 - .../src/libAfterImage/win32/asview.mak | 229 - .../asimage/src/libAfterImage/win32/config.h | 174 - graf2d/asimage/src/libAfterImage/xcf.c | 12 +- graf2d/asimage/src/libAfterImage/ximage.c | 13 +- graf2d/asimage/src/libAfterImage/ximage.h | 2 - graf2d/asimage/src/libAfterImage/xpm.c | 9 +- 63 files changed, 231 insertions(+), 23826 deletions(-) delete mode 100644 graf2d/asimage/src/libAfterImage/.cvsignore delete mode 100644 graf2d/asimage/src/libAfterImage/.depend delete mode 100644 graf2d/asimage/src/libAfterImage/.shared delete mode 100644 graf2d/asimage/src/libAfterImage/ChangeLog delete mode 100644 graf2d/asimage/src/libAfterImage/Makefile.in delete mode 100644 graf2d/asimage/src/libAfterImage/README delete mode 100644 graf2d/asimage/src/libAfterImage/aclocal.m4 delete mode 100644 graf2d/asimage/src/libAfterImage/afterbase.h.in delete mode 100644 graf2d/asimage/src/libAfterImage/afterimage-config.in delete mode 100644 graf2d/asimage/src/libAfterImage/afterimage-libs.in delete mode 100755 graf2d/asimage/src/libAfterImage/config.guess delete mode 100644 graf2d/asimage/src/libAfterImage/config.h.in delete mode 100755 graf2d/asimage/src/libAfterImage/config.sub delete mode 100755 graf2d/asimage/src/libAfterImage/configure delete mode 100644 graf2d/asimage/src/libAfterImage/configure.in delete mode 100755 graf2d/asimage/src/libAfterImage/install-sh delete mode 100644 graf2d/asimage/src/libAfterImage/libAfterImage.dsp delete mode 100644 graf2d/asimage/src/libAfterImage/libAfterImage.dsw delete mode 100644 graf2d/asimage/src/libAfterImage/libAfterImage.mak delete mode 100644 graf2d/asimage/src/libAfterImage/win32/StdAfx.cpp delete mode 100644 graf2d/asimage/src/libAfterImage/win32/StdAfx.h delete mode 100644 graf2d/asimage/src/libAfterImage/win32/afterbase.h delete mode 100644 graf2d/asimage/src/libAfterImage/win32/asview.cpp delete mode 100644 graf2d/asimage/src/libAfterImage/win32/asview.dsp delete mode 100644 graf2d/asimage/src/libAfterImage/win32/asview.mak delete mode 100644 graf2d/asimage/src/libAfterImage/win32/config.h diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake index c3fd867327ae5..cfa089f4f778a 100644 --- a/cmake/modules/RootMacros.cmake +++ b/cmake/modules/RootMacros.cmake @@ -1324,7 +1324,7 @@ endmacro() # and then use those for linking. # LIBRARIES lib1 lib2 : private arguments for target_link_library() # DEPENDENCIES lib1 lib2 : PUBLIC arguments for target_link_library() such as Core, MathCore -# BUILTINS builtin1 builtin2 : builtins like AFTERIMAGE +# BUILTINS builtin1 builtin2 : builtins like xxhash # LINKDEF LinkDef.h : linkdef file, default value is "LinkDef.h" # DICTIONARY_OPTIONS option : options passed to rootcling # INSTALL_OPTIONS option : options passed to install headers diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake index 882448bdce218..40121a5697480 100644 --- a/cmake/modules/SearchInstalledSoftware.cmake +++ b/cmake/modules/SearchInstalledSoftware.cmake @@ -449,105 +449,6 @@ if(asimage) endif() endif() endif() - - #---AfterImage--------------------------------------------------------------- - set(AFTERIMAGE_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libAfterImage${CMAKE_STATIC_LIBRARY_SUFFIX}) - if(WIN32) - set(ASTEP_LIB_DIR ".") - if(NOT CMAKE_GENERATOR MATCHES Ninja) - if(winrtdebug) - set(astepbld Debug) - else() - set(astepbld Release) - endif() - set(ASTEP_LIB_DIR "${astepbld}") - set(ASTEP_EXTRA_BUILD_ARGS --config ${astepbld}) - endif() - ExternalProject_Add( - AFTERIMAGE - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/graf2d/asimage/src/libAfterImage AFTERIMAGE - INSTALL_DIR ${CMAKE_BINARY_DIR} - CMAKE_ARGS -G ${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DFREETYPE_INCLUDE_DIR=${FREETYPE_INCLUDE_DIRS} - -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS} - -DJPEG_INCLUDE_DIR=${JPEG_INCLUDE_DIR} - -DJPEG_LIBRARY_LOCATION=${JPEG_LIBRARY_LOCATION} - -DPNG_INCLUDE_DIR=${PNG_INCLUDE_DIR} - -DPNG_LIBRARY_LOCATION=${PNG_LIBRARY_LOCATION} - -DGIF_INCLUDE_DIR=${GIF_INCLUDE_DIR} - -DGIF_LIBRARY_LOCATION=${GIF_LIBRARY_LOCATION} - BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ASTEP_EXTRA_BUILD_ARGS} - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ASTEP_LIB_DIR}/libAfterImage.lib /lib/ - LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1 - BUILD_IN_SOURCE 0 - BUILD_BYPRODUCTS ${AFTERIMAGE_LIBRARIES} - TIMEOUT 600 - ) - set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE) - else() - if(asimage_tiff) - list(APPEND afterimage_extra_args --with-tiff-includes=${TIFF_INCLUDE_DIR}) - else() - list(APPEND afterimage_extra_args --with-tiff=no) - endif() - if(x11) - list(APPEND afterimage_extra_args --with-x) - else() - list(APPEND afterimage_extra_args --without-x) - endif() - if(builtin_freetype) - list(APPEND afterimage_extra_args --with-ttf-includes=-I${FREETYPE_INCLUDE_DIRS}) - set(_after_cflags "${_after_cflags} -DHAVE_FREETYPE_FREETYPE -DPNG_ARM_NEON_OPT=0") - endif() - if(CMAKE_OSX_SYSROOT) - set(_after_cflags "${_after_cflags} -isysroot ${CMAKE_OSX_SYSROOT}") - endif() - if(builtin_zlib) - set(_after_cflags "${_after_cflags} -I${ZLIB_INCLUDE_DIRS}") - endif() - if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) - set(AFTERIMAGE_LIBRARIES ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE/libAfterImage${CMAKE_STATIC_LIBRARY_SUFFIX}) - endif() - ExternalProject_Add( - AFTERIMAGE - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/graf2d/asimage/src/libAfterImage AFTERIMAGE - INSTALL_DIR ${CMAKE_BINARY_DIR} - CONFIGURE_COMMAND ./configure --prefix - --libdir=/lib - --with-ttf --with-afterbase=no - --without-svg --disable-glx - --with-jpeg - --with-jpeg-includes=${JPEG_INCLUDE_DIR} - --with-png - --with-png-includes=${PNG_INCLUDE_DIR} - --with-gif - --with-gif-includes=${GIF_INCLUDE_DIR} - ${afterimage_extra_args} - CC=${CMAKE_C_COMPILER} CFLAGS=${_after_cflags} - LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 LOG_OUTPUT_ON_FAILURE 1 - BUILD_IN_SOURCE 1 - BUILD_BYPRODUCTS ${AFTERIMAGE_LIBRARIES} - TIMEOUT 600 - ) - set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include/libAfterImage) - if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) - set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE) - endif() - endif() - if(builtin_gif) - add_dependencies(AFTERIMAGE BUILTIN_LIBGIF) - endif() - if(builtin_jpeg) - add_dependencies(AFTERIMAGE BUILTIN_LIBJPEG) - endif() - if(builtin_png) - add_dependencies(AFTERIMAGE BUILTIN_LIBPNG) - endif() - if(builtin_freetype) - add_dependencies(AFTERIMAGE BUILTIN_FREETYPE) - endif() - set(AFTERIMAGE_TARGET AFTERIMAGE) endif() #---Check for GSL library--------------------------------------------------------------- diff --git a/graf2d/asimage/CMakeLists.txt b/graf2d/asimage/CMakeLists.txt index 87e27bd490b2f..3b5188c126edb 100644 --- a/graf2d/asimage/CMakeLists.txt +++ b/graf2d/asimage/CMakeLists.txt @@ -9,6 +9,8 @@ # @author Pere Mato, CERN ############################################################################ +add_subdirectory(src/libAfterImage) + ROOT_STANDARD_LIBRARY_PACKAGE(ASImage NO_INSTALL_HEADERS HEADERS @@ -23,7 +25,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage DICTIONARY_OPTIONS -writeEmptyRootPCM LIBRARIES - ${AFTERIMAGE_LIBRARIES} + libAfterImage ${ASEXTRA_LIBRARIES} ${FREETYPE_LIBRARIES} ${X11_LIBRARIES} @@ -32,12 +34,12 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImage Core Graf Postscript - BUILTINS - AFTERIMAGE ) -target_include_directories(ASImage SYSTEM PRIVATE ${FREETYPE_INCLUDE_DIRS} ${AFTERIMAGE_INCLUDE_DIR} ${X11_INCLUDE_DIR}) -target_link_libraries(ASImage PRIVATE JPEG::JPEG PNG::PNG GIF::GIF) +target_link_libraries(ASImage PRIVATE JPEG::JPEG PNG::PNG GIF::GIF libAfterImage Freetype::Freetype) +if (x11) + target_link_libraries(ASImage PRIVATE X11::X11) +endif() ROOT_STANDARD_LIBRARY_PACKAGE(ASImageGui NO_INSTALL_HEADERS @@ -50,7 +52,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImageGui DICTIONARY_OPTIONS -writeEmptyRootPCM LIBRARIES - ${AFTERIMAGE_LIBRARIES} + libAfterImage ${ASEXTRA_LIBRARIES} ${FREETYPE_LIBRARIES} ${X11_LIBRARIES} @@ -60,7 +62,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImageGui ASImage ) -target_include_directories(ASImageGui SYSTEM PRIVATE ${FREETYPE_INCLUDE_DIRS} ${AFTERIMAGE_INCLUDE_DIR} ${X11_INCLUDE_DIR}) -target_link_libraries(ASImageGui PRIVATE JPEG::JPEG PNG::PNG GIF::GIF) +target_link_libraries(ASImageGui PRIVATE JPEG::JPEG PNG::PNG GIF::GIF libAfterImage Freetype::Freetype) +if (x11) + target_link_libraries(ASImageGui PRIVATE X11::X11) +endif() ROOT_INSTALL_HEADERS() diff --git a/graf2d/asimage/README b/graf2d/asimage/README index 4b1eaf725092c..b3babf9dc65e6 100644 --- a/graf2d/asimage/README +++ b/graf2d/asimage/README @@ -1,80 +1,5 @@ -The package libAfterImage has been imported from its official repository using the command: +Originally, the package libAfterImage was imported from its official repository using the command: cvs -d :pserver:anonymous@cvs.aftercode.net:/home/cvsroot checkout afterstep-stable/libAfterImage -This command download the source in: - - afterstep-stable/libAfterImage - -To get the updates for this package it is enough to do "cvs update" from this directory. - -To import libAfterImage into the ROOT svn repository we use the following command script: - - cd ~/afterstep-stable/libAfterImage - cvs update - cd /tmp - cp -rf ~/afterstep-stable/libAfterImage . - cd libAfterImage - rm -f Makefile config.status afterimage-libs config.log - rm -rf apps aftershow config.h - rm -rf ./libpng/CVS ./CVS ./win32/CVS ./libungif/CVS ./libjpeg/CVS ./zlib/CVS - cd libAfterImage - cp -R * $ROOTSYS/graf2d/asimage/src/libAfterImage - cd /tmp - rm -r libAfterImage - -Some files have been modified compare to the official libAfterImage version: - - config.h.in has been modified in order to use freetype from the ROOT - repository. - - libjpeg/jcmainct.c libjpeg/jdmainct.c have been modified to avoid a - compilation warning. These two pieces of code contain a variable called - "main" (some compiler do not like this). This variable name has been - changed to "mainptr". - - libjpeg/jmorecfg.h generated a warning on Windows: "a benign redifinition". - This warning has been disabled. - - libjpeg/jconfig.h: disable INLINE definition. - - libjpeg/jidctred.c: removed from repository (replaced by jidctint.c) - - libjpeg/jmorecfg.h and libjpeg/jconfig.h: fix a problem with boolean. - - configure.in: support clang++ by removing some warnings. - - libpng/pngpriv.h: fp.h was moved into math.h. This fix was originated by G. Eullisse - ALICE (April 2025) - - configure: - - has been modified to look at the ".dylib" file extension to find - the X11 libraries. This is needed on the Mac Leopard system. - - the compiling option -Winline has been removed because it produced many - warnings with gcc 4.3. - - support clang++ by removing some warnings. - - libAfterImage.mak: - Remove the word "Warning" in the message - "Warning: cannot find "libAfterImage.dep" to prevent to SPI - nightly build to issue an error. - - import.c: to fix the warning (on SLC5): - "warning: dereferencing type-punned pointer will break strict-aliasing rules" - - import.c and ungif.c (Ubuntu gcc 4.4): - "warning: ignoring return value of 'fread', declared with attribute warn_unused_result" - - export.c: to fix a warning on Open Solaris: - "initializer will be sign-extended: -1" - - export.c and import.c: - OSX Lion comes with builtin libpng 1.5.1 which obsoletes some 1.2 constructs - - asimage.c, char2uni.c, export.c, imencdec.c: - - fix a warning with clang: - "comparison of unsigned enum expression < 0 is always false" - -Note: -The file afterbase.h gets autogenerated by configure from afterbase.h.in -if afterbase.h.in has not changed, afterbase.h remains unchanged. - +Most files were modified and the build system adapted, compared to the official (obsolete) libAfterImage version. diff --git a/graf2d/asimage/doc/index.md b/graf2d/asimage/doc/index.md index 18b28e3c218e6..dfba94734e0e8 100644 --- a/graf2d/asimage/doc/index.md +++ b/graf2d/asimage/doc/index.md @@ -2,7 +2,7 @@ \ingroup Graphics2D \brief Classes interfacing to libAfterImage. - - [libAfterImage Imaging Library.](http://www.afterstep.org/afterimage/index.php) + - Originally forked from [libAfterImage Imaging Library](http://www.afterstep.org/afterimage/index.php), now self-maintained. - Several tutorials demonstrate how to use images in ROOT: - rose_image.C shows how to draw an image in a pad. - galaxy_image.C illustrates the TASImage class and an image editor. diff --git a/graf2d/asimage/src/TASImage.cxx b/graf2d/asimage/src/TASImage.cxx index b35bcb14f81c1..cecb70f20ddbf 100644 --- a/graf2d/asimage/src/TASImage.cxx +++ b/graf2d/asimage/src/TASImage.cxx @@ -107,9 +107,8 @@ ROOT tutorials: `$ROOTSYS/tutorials/visualisation/image/` #endif # include #else -# include -# include # define X_DISPLAY_MISSING 1 +# include #endif # include # include diff --git a/graf2d/asimage/src/TASPaletteEditor.cxx b/graf2d/asimage/src/TASPaletteEditor.cxx index 200d340075a2a..0ea09d1d6ce67 100644 --- a/graf2d/asimage/src/TASPaletteEditor.cxx +++ b/graf2d/asimage/src/TASPaletteEditor.cxx @@ -45,8 +45,8 @@ It is called by a pull down menu item of TASImage. #ifndef WIN32 # include #else -# include -# include +# define X_DISPLAY_MISSING 1 +# include #endif # include extern "C" { diff --git a/graf2d/asimage/src/TASPluginGS.cxx b/graf2d/asimage/src/TASPluginGS.cxx index 6b38db99c0dad..1a5b976d46e0c 100644 --- a/graf2d/asimage/src/TASPluginGS.cxx +++ b/graf2d/asimage/src/TASPluginGS.cxx @@ -33,9 +33,8 @@ Allows to read PS/EPS/PDF files via GhostScript #ifndef WIN32 # include #else -# include -# include # define X_DISPLAY_MISSING 1 +# include #endif # include diff --git a/graf2d/asimage/src/libAfterImage/.cvsignore b/graf2d/asimage/src/libAfterImage/.cvsignore deleted file mode 100644 index 3145fbd0709c0..0000000000000 --- a/graf2d/asimage/src/libAfterImage/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -config.h -config.log -config.cache -Makefile -config.status -afterbase.h -afterimage-libs -.cvsignore diff --git a/graf2d/asimage/src/libAfterImage/.depend b/graf2d/asimage/src/libAfterImage/.depend deleted file mode 100644 index 16473cae3f413..0000000000000 --- a/graf2d/asimage/src/libAfterImage/.depend +++ /dev/null @@ -1,131 +0,0 @@ -./asimage.o : \ - win32/config.h \ - config.h \ - asvisual.h \ - blender.h \ - asimage.h \ - ascmap.h - -./ascmap.o : \ - win32/config.h \ - config.h \ - asimage.h \ - import.h \ - export.h \ - imencdec.h \ - ascmap.h - -./asfont.o : \ - win32/config.h \ - config.h \ - asfont.h \ - asimage.h \ - asvisual.h - -./asstorage.o : \ - win32/config.h \ - config.h \ - asstorage.h \ - afterimage.h - -./asvisual.o : \ - win32/config.h \ - config.h \ - asvisual.h - -./blender.o : \ - win32/config.h \ - config.h \ - asvisual.h \ - blender.h - -./bmp.o : \ - asimage.h \ - imencdec.h \ - bmp.h - -./char2uni.o : \ - win32/config.h \ - config.h \ - char2uni.h - -./draw.o : \ - win32/config.h \ - config.h \ - asvisual.h \ - asimage.h \ - draw.h \ - afterimage.h - -./export.o : \ - win32/config.h \ - config.h \ - asimage.h \ - imencdec.h \ - xcf.h \ - xpm.h \ - ungif.h \ - import.h \ - export.h \ - ascmap.h \ - bmp.h - -./imencdec.o : \ - win32/config.h \ - config.h \ - asvisual.h \ - blender.h \ - asimage.h \ - imencdec.h - -./import.o : \ - win32/config.h \ - config.h \ - asimage.h \ - imencdec.h \ - bmp.h \ - ximage.h \ - xcf.h \ - xpm.h \ - ungif.h \ - import.h \ - transform.h - - -./transform.o : \ - win32/config.h \ - config.h \ - asvisual.h \ - blender.h \ - asimage.h \ - imencdec.h \ - transform.h - -./ungif.o : \ - win32/config.h \ - config.h \ - asimage.h \ - ascmap.h \ - ungif.h - -./xcf.o : \ - win32/config.h \ - config.h \ - asimage.h \ - xcf.h - -./ximage.o : \ - win32/config.h \ - config.h \ - asvisual.h \ - blender.h \ - asimage.h \ - imencdec.h \ - ximage.h - -./xpm.o : \ - win32/config.h \ - config.h \ - asimage.h \ - ascmap.h \ - xpm.h diff --git a/graf2d/asimage/src/libAfterImage/.shared b/graf2d/asimage/src/libAfterImage/.shared deleted file mode 100644 index 110a949d8ecd4..0000000000000 --- a/graf2d/asimage/src/libAfterImage/.shared +++ /dev/null @@ -1,44 +0,0 @@ -LIBAFTERIMAGE_OBJS = \ - $(LIBAFTERIMAGE_PATH)/asimage.c \ - $(LIBAFTERIMAGE_PATH)/ascmap.c \ - $(LIBAFTERIMAGE_PATH)/asfont.c \ - $(LIBAFTERIMAGE_PATH)/afterrootpngwrite.c \ - $(LIBAFTERIMAGE_PATH)/asstorage.c \ - $(LIBAFTERIMAGE_PATH)/asvisual.c \ - $(LIBAFTERIMAGE_PATH)/blender.c \ - $(LIBAFTERIMAGE_PATH)/bmp.c \ - $(LIBAFTERIMAGE_PATH)/char2uni.c \ - $(LIBAFTERIMAGE_PATH)/draw.c \ - $(LIBAFTERIMAGE_PATH)/export.c \ - $(LIBAFTERIMAGE_PATH)/imencdec.c \ - $(LIBAFTERIMAGE_PATH)/import.c \ - $(LIBAFTERIMAGE_PATH)/transform.c \ - $(LIBAFTERIMAGE_PATH)/ungif.c \ - $(LIBAFTERIMAGE_PATH)/xcf.c \ - $(LIBAFTERIMAGE_PATH)/ximage.c \ - $(LIBAFTERIMAGE_PATH)/xpm.c - -LIBAFTERIMAGE_INCS = \ - $(LIBAFTERIMAGE_PATH)/afterimage.h \ - $(LIBAFTERIMAGE_PATH)/config.h \ - $(LIBAFTERIMAGE_PATH)/afterbase.h \ - $(LIBAFTERIMAGE_PATH)/ascmap.h \ - $(LIBAFTERIMAGE_PATH)/asfont.h \ - $(LIBAFTERIMAGE_PATH)/afterrootpngwrite.h \ - $(LIBAFTERIMAGE_PATH)/asim_afterbase.h \ - $(LIBAFTERIMAGE_PATH)/asimage.h \ - $(LIBAFTERIMAGE_PATH)/asstorage.h \ - $(LIBAFTERIMAGE_PATH)/asvisual.h \ - $(LIBAFTERIMAGE_PATH)/blender.h \ - $(LIBAFTERIMAGE_PATH)/bmp.h \ - $(LIBAFTERIMAGE_PATH)/char2uni.h \ - $(LIBAFTERIMAGE_PATH)/draw.h \ - $(LIBAFTERIMAGE_PATH)/export.h \ - $(LIBAFTERIMAGE_PATH)/imencdec.h \ - $(LIBAFTERIMAGE_PATH)/import.h \ - $(LIBAFTERIMAGE_PATH)/transform.h \ - $(LIBAFTERIMAGE_PATH)/ungif.h \ - $(LIBAFTERIMAGE_PATH)/xcf.h \ - $(LIBAFTERIMAGE_PATH)/ximage.h \ - $(LIBAFTERIMAGE_PATH)/xpm.h \ - $(LIBAFTERIMAGE_PATH)/xwrap.h diff --git a/graf2d/asimage/src/libAfterImage/CMakeLists.txt b/graf2d/asimage/src/libAfterImage/CMakeLists.txt index 34ed6093dfc22..e750c2a3d26f2 100644 --- a/graf2d/asimage/src/libAfterImage/CMakeLists.txt +++ b/graf2d/asimage/src/libAfterImage/CMakeLists.txt @@ -1,55 +1,161 @@ # libAferImage CMakeLists.txt +project(AFTERIMAGE) +cmake_minimum_required(VERSION 3.21) -PROJECT(AFTERIMAGE) -if(WIN32) - # required for the following feature & bug fix: - # 3.15: Added $ generator expression - # 3.16: Bug fix with CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS: the auto-generated exports - # are now updated only when the object files providing the symbols are updated - cmake_minimum_required(VERSION 3.16 FATAL_ERROR) - # Set CMP0091 (MSVC runtime library flags are selected by an abstraction) to OLD - # to keep the old way of selecting the runtime library with the -MD/-MDd compiler flag - cmake_policy(SET CMP0091 OLD) -else() - cmake_minimum_required(VERSION 3.10 FATAL_ERROR) -endif() +set(LIB_NAME libAfterImage) + +set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -SET(LIB_NAME libAfterImage) +set(H_FILES + afterbase.h + afterrootpngwrite.h + asfont.h + asimage.h + asvisual.h + bmp.h + colornames.h + export.h + import.h + transform.h + xcf.h + xpm.h + afterimage.h + ascmap.h + asim_afterbase.h + asstorage.h + blender.h + char2uni.h + draw.h + imencdec.h + scanline.h + ungif.h + ximage.h + xwrap.h) -# Microsoft Visual Studio: -IF(MSVC) - # Define - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DNO_DEBUG_OUTPUT /D_MBCS /D_LIB /wd4996 /wd4267 /wd4018 /wd4244") -ENDIF() +set(SRC_FILES + afterbase.c + ascmap.c + asfont.c + asimage.c + asstorage.c + asvisual.c + blender.c + bmp.c + char2uni.c + export.c + import.c + transform.c + ungif.c + xcf.c + ximage.c + xpm.c + draw.c + imencdec.c + scanline.c + afterrootpngwrite.c) -set(FREETYPE_INCLUDE_DIR "" CACHE PATH "Path to Freetype include dir") -set(ZLIB_INCLUDE_DIR "" CACHE PATH "Path to zlib include dir") +add_library(${LIB_NAME} STATIC ${H_FILES} ${SRC_FILES}) +set_property(TARGET ${LIB_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) -if(NOT EXISTS "${FREETYPE_INCLUDE_DIR}/ft2build.h") - message(SEND_ERROR "Can't find ft2build.h in ${FREETYPE_INCLUDE_DIR}") +if(TARGET BUILTIN_LIBGIF) + add_dependencies(${LIB_NAME} BUILTIN_LIBGIF) +endif() +if(TARGET BUILTIN_LIBJPEG) + add_dependencies(${LIB_NAME} BUILTIN_LIBJPEG) +endif() +if(TARGET BUILTIN_LIBPNG) + add_dependencies(${LIB_NAME} BUILTIN_LIBPNG) +endif() +if(TARGET BUILTIN_FREETYPE) + add_dependencies(${LIB_NAME} BUILTIN_FREETYPE) endif() -if(NOT EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") - message(SEND_ERROR "Can't find zlib.h in ${ZLIB_INCLUDE_DIR}") +target_include_directories(${LIB_NAME} PUBLIC ./) +target_link_libraries( + ${LIB_NAME} PRIVATE ${ASEXTRA_LIBRARIES} Freetype::Freetype ZLIB::ZLIB) +if(TARGET X11::X11) +target_link_libraries( + ${LIB_NAME} PRIVATE X11::X11) endif() -INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${GIF_INCLUDE_DIR}) +include(CheckIncludeFiles) -set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") +target_compile_definitions( + ${LIB_NAME} + PRIVATE HAVE_ERRNO_H + HAVE_FREETYPE + HAVE_FREETYPE_FREETYPE + HAVE_FT2BUILD_H + HAVE_INTTYPES_H + HAVE_MEMORY_H + HAVE_PROTOTYPES + HAVE_STDARG_H + HAVE_STDDEF_H + HAVE_STRING_H + HAVE_SYS_STAT_H + HAVE_SYS_TYPES_H + HAVE_SYS_WAIT_H + HAVE_XPM + HAVE_ZLIB_H + NO_DEBUG_OUTPUT) -FILE(GLOB H_FILES "*.h") +check_include_files(malloc.h PROJECT_HAVE_MALLOC) +if (PROJECT_HAVE_MALLOC) + target_compile_definitions( + ${LIB_NAME} + PRIVATE HAVE_MALLOC_H) +endif() -SET(SRC_FILES - afterbase.c ascmap.c asfont.c - asimage.c asstorage.c asvisual.c blender.c bmp.c char2uni.c - export.c import.c transform.c ungif.c xcf.c ximage.c xpm.c draw.c - imencdec.c scanline.c - afterrootpngwrite.c -) +if(TARGET JPEG::JPEG) + target_compile_definitions(${LIB_NAME} PRIVATE HAVE_JPEG) +endif() +if(TARGET PNG::PNG) + target_compile_definitions(${LIB_NAME} PRIVATE HAVE_PNG) +endif() +if(TARGET GIF::GIF) + target_compile_definitions(${LIB_NAME} PRIVATE HAVE_GIF) # +endif() +if(TARGET TIFF::TIFF) + target_compile_definitions(${LIB_NAME} PRIVATE HAVE_TIFF) # asimage_tiff +endif() -ADD_LIBRARY(${LIB_NAME} STATIC ${H_FILES} ${SRC_FILES}) +if(WIN32) + # Microsoft Visual Studio: + if(MSVC) + # Define + target_compile_definitions(${LIB_NAME} PRIVATE _CRT_SECURE_NO_DEPRECATE + _MBCS _LIB) + target_compile_options(${LIB_NAME} PRIVATE /wd4996 /wd4267 /wd4018 /wd4244) -target_link_libraries(${LIB_NAME} PRIVATE ${JPEG_LIBRARY_LOCATION} ${PNG_LIBRARY_LOCATION} ${GIF_LIBRARY_LOCATION}) + endif() + target_compile_definitions( + ${LIB_NAME} + PRIVATE NO_DOUBLE_FCLOSE_AFTER_FDOPEN X_DISPLAY_MISSING + HAVE_UNSIGNED_CHAR HAVE_UNSIGNED_SHORT HAVE_BOOLEAN) +else() + target_compile_definitions( + ${LIB_NAME} + PRIVATE HAVE_SYS_TIME_H + HAVE_DIRENT_H + HAVE_LONG_LONG + HAVE_STDINT_H + HAVE_STDLIB_H + HAVE_UNISTD_H + HAVE_STRINGS_H + SHAPE + STDC_HEADERS + TIME_WITH_SYS_TIME) + check_include_files(mmintrin.h PROJECT_HAVE_SSE2_INTRINSICS) + if (PROJECT_HAVE_SSE2_INTRINSICS) + target_compile_definitions( + ${LIB_NAME} + PRIVATE HAVE_MMX) + endif() + if(NOT TARGET X11::X11) + target_compile_definitions( + ${LIB_NAME} PRIVATE X_DISPLAY_MISSING) + endif() + +endif() install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION}) diff --git a/graf2d/asimage/src/libAfterImage/ChangeLog b/graf2d/asimage/src/libAfterImage/ChangeLog deleted file mode 100644 index feb43bab7b913..0000000000000 --- a/graf2d/asimage/src/libAfterImage/ChangeLog +++ /dev/null @@ -1,3797 +0,0 @@ - -2011-01-13 sasha - - * Changed version to 2.2.11 and fixed build to compile ASWallpaper - -2010-09-23 sasha - - * fixed memory leak in xcf file loading - * fixed memory leak in tga image loading - * fixed minor memory leak in gif saving code. - * fixed memory leak in xml processing on image loading - * fixed major memory leak at vectorize_asimage - * Fixed BMP writing to not set compression to 1 - we don't use any - -2010-09-15 sasha - - * fixed possible dereferencing of NULL pointer in asimage_destroy - (minor) - -2010-09-08 sasha - - * trimmed some dead code - * fixed visual2visual_prop bug in *size usage - * fixed param hidden warnings - * corrected usage of get_xpm_string() to use proper enum value - -2010-09-03 sasha - - * Fixed possible memory leak in xpm code when image is too big - * fixed unlikely but possible (if height>width) buffer overrun bug - in gradient generation code - * Fixed unlikely but possible use of uninitialized variable in - ASImage2xpmRawBuff - -2010-05-20 sasha - - * updated to libjpeg v.8b - -2010-01-29 sasha - - * added transupp to libjpeg just in case - * upgraded built-in libjpeg to version 8 - -2009-12-11 sasha - - * fixed segfault in on look change where previous look has obsolete - font settings - -2009-11-12 sasha - - * fixed export.c to properly assign default export values using - union members - contributed by Axel Naumann - -2009-10-14 sasha - - * fixed annoying ICC warnings in mystrdup use without libAfterBase - -2009-10-13 sasha - - * minor fix in afterbase.c to correct ambiguity in evaluation order - -2009-08-25 sasha - - * fixed ascompose to build without X libs - -2009-05-04 sasha - - * updated ChangeLog for the release - * AfterStep release v 2.2.9 - -2009-03-18 sasha - - * added ifdef to avoid double fclose under MSVC2005 and newer - -2009-02-11 sasha - - * Got rid of dpy global variable in libAfterBase and libAfterIMage - for good. Moved it into libAfterStep instead, as it incorporates - screen handling functionality. - -2009-01-30 sasha - - * fixed warning in jpeg2ASImage - -2009-01-16 sasha - - * fix to fill_hline_colored to work on scratch canvas + some - debugging of reported fill bugs on 64bit systems - -2009-01-13 sasha - - * fixed aliasing for drawing with brush wider then 1x1; Fixed areas - of low intensity inside solid lines - * fixed clipping in straight ellips drawing where y+ry > height - * added missing declaration of Bool asim_set_custom_brush_colored() - -2009-01-12 sasha - - * somewhat fixed drawing with ARGB brush over ARGB canvas; Still - unclear what would happen if those are different ; - -2008-12-17 sasha - - * fixed memory leak in ASImage2gif file needed to be closed even - after Egif closes it too - * fixed Makefile to work on FBSD/Gentoo - -2008-11-12 sasha - - * fixed references to the global variable dpy in GLX code - -2008-09-30 sasha - - * [no log message] - -2008-08-15 sasha - - * added utility to check if glyphs are available in the font for a - certain char or a list of chars - -2008-06-24 sasha - - * [no log message] - * Fixed root pixmap setting - to handle XKillClient failures and - not free pixmap after it was put on the root - -2008-06-23 sasha - - * [no log message] - -2008-06-18 sasha - - * [no log message] - * Updated ChangeLog for libAfterImage 1.18 release - * libAfterImage 1.18 release - -2008-06-13 sasha - - * implemented EdgeResistanceToDragging setting - -2008-06-10 sasha - - * compile bugs without X fixed - -2008-06-02 sasha - - * added missing scanline.h - -2008-05-30 sasha - - * additional logic to avoid red/blue artifacts - -2008-05-29 sasha - - * implemented some 12-bps raw image processing- demosaicing - -2008-05-02 sasha - - * [no log message] - -2008-04-23 sasha - - * Fixed build on non-gcc compilers - -2008-04-17 sasha - - * preliminary support for loading RAW camera photos stored as tiff - images with CFA data - still need to implement interpolation, - white balance, and leveling - * compile warning on signed/unsigfned comparison - -2008-04-10 sasha - - * fixed alpha overflow in color2alpha - -2008-04-07 sasha - - * implemented color2alpha method from GIMP without color correction - that was damaging the image. Complete with color2alpha xml tag - -2008-04-03 sasha - - * implemented pixelization filter - -2008-03-24 sasha - - * fixed bunch of compilation bugs showing up on old systems - -2008-03-17 sasha - - * hopefully fixed syslimit.h warnings on FBSD - -2008-03-07 sasha - - * [no log message] - -2008-03-06 sasha - - * fixed problem with docs having spaces in filenames - -2008-03-05 sasha - - * disabled build for Sound2 for now - -2008-03-04 sasha - - * fixed segfault in xcf code where layer is larger then image - * updated NEW and ChangeLogs for release 2.2.8 - * AfterStep release v. 2.2.8 - -2008-02-29 sasha - - * some more brainstorming as related to aftershow design - -2008-02-26 sasha - - * updated afterbase.c to include new stuff from libAfterBase for - xml - -2008-02-22 sasha - - * [no log message] - -2008-02-19 sasha - - * xml manipulation code added - -2008-02-18 sasha - - * [no log message] - -2008-02-16 sasha - - * started implementing aftershow client to be used by shell scripts - to redirect stdio to aftershow - * fixed asfont get_glyph_map to not confuse compilers into thinking - that there might be uninitialized stuff - -2008-02-15 sasha - - * added code to handle client connections and input to aftershow - * updated libAfterImage.mak - -2008-02-14 sasha - - * added socket setup code - need to move socket.c in here in case - afterbase is unavailable - * more X initialization code for aftershow - -2008-02-13 sasha - - * [no log message] - -2008-02-08 sasha - - * started implementing aftershow daemon - * started work on aftershow daemon - * fixed memory leak in ascompose processing in interactive mode - * compile warning on solaris in pixmap.c - -2008-02-07 sasha - - * fixed compile warning with gcc 4.3 - -2008-02-06 sasha - - * fixed compile warnings in asfont.c in win32 - * removed old png files from project - * fixed png.h to properly include zlib.h on windows and undeffed - stdint.h on win32 - -2008-02-01 sasha - - * fixed makefile to not reference obsolete libong files - -2008-01-25 sasha - - * added functionality to ascompose to allow for constantly updating - display of stuff; command line should be: script.sh | ascompose - -I --endless --click-timeout 0 -q -f -; - -2008-01-18 sasha - - * implemented full color drawing in draw.c using prototypes from - ROOT by Valeri Onuchin. Needs testing and and changes to - aply_context() - * changed draw.c to use 32bit values in canvas, possibly to enable - rendering in all 4 channels in future - need more work - -2008-01-17 sasha - - * fixed handling of grayscale PNG images with bit depth < 8 - -2008-01-16 sasha - - * partially fixed segfault on loading grayscale PNG images - * fixed segfault on loading grayscale PNG images - * enabled debugging for bigendian tests - -2008-01-15 sasha - - * moved HAVE_XPM to after config.h in libAI xpm.c; updated main - configure - * exclude xpm.c from built when no xpm is requested; no longer - support standard libgif and libxpm - -2008-01-09 sasha - - * implemented functionality to setup slicing of frame sides and - titlebar elements - * added code to kill Esetroot client if desktop background was set - by it - -2008-01-08 sasha - - * added functionality to ascompose to set XROOTPMAP property while - changing root background - -2008-01-04 sasha - - * removed erroneous configure.h include in ascompose - -2008-01-03 born2late - - * added utf8 support according to sasha s instructions - seems to - work - -2007-12-27 sasha - - * removed config.h from installation script - * added new convinience function to convert Lead Tools like DIBs - into ASImage in one call; Fixed typo in ASImage2DIB. - * Fixed major bug that maybe causing memory corruption on any - system where malloc does not return pointer aligned on 8-byte - boundary - * sanity fix to configure - -2007-12-26 sasha - - * fixed logic to not enlarge icons in menus if target size is too - big - -2007-12-19 sasha - - * giving up on trying to figure out why asvector does not work on - Power PC - -2007-12-18 sasha - - * yet another try in resolving endiannes of the XImage encoding - -2007-12-17 sasha - - * rewrote scanline2ximage32 to properly account for offset and - hopefully fix byteordering issue - -2007-12-14 sasha - - * hopefully fixed incorrect byte order while converting XImage on - 32 bit visuals back to ASImage on big endian machines - * minor cleanups in configure script to use lowercase NO - -2007-12-05 sasha - - * updated built-in libpng to 1.2.23 - -2007-11-30 sasha - - * updated xwrap.h to be the same as in libAfterBase and fixed - compilation under newer MSVC - -2007-11-26 sasha - - * Fixed memory leak in DGifCloseFile where pointer to GifFile gets - overwritten with NULL leaving dungling memory - -2007-11-20 sasha - - * fixed memory leak in gif import code - -2007-11-16 sasha - - * fixed missing initialization of ASColormap structure in - colormap_asimage - * disabled performance output in transform.c - -2007-10-25 sasha - - * added ability to load ASXML images for set size - should use - .width and .height vars inside the image to calculate different - sizes - -2007-10-16 sasha - - * Implemented proper transfer of ASImage to OpenGL drawables using - textures and pixel ops - -2007-09-21 sasha - - * altered configure to make building of apps optional - if the dir - is present - -2007-09-18 sasha - - * removed __FUNCTION__ to fix compile on Solaris - -2007-09-17 sasha - - * fixed compile errors under MSVC - * fixed compile errors in asstorage.c under MSVC - -2007-09-15 sasha - - * fixed compile warnings on solaris in asvisual.c reported by ROOT - project - * fixed compile problem under VisualStudio .Net 2005, as reported - by Valeri Onuchin - * added functions for reading raw XPM and PNG buffers, contributed - by Valeri Onuchin of ROOT project - * added ASImage2xpmRawBuff() contributed by Valeriy Onuchin of ROOT - project - -2007-09-14 sasha - - * fixed compile bug when building with shmimage and without - libAfterBase - -2007-09-12 born2late - - * minor typos corrected - -2007-09-05 sasha - - * fixed one off error in blurring code potentialy causing a - segfault - -2007-08-23 sasha - - * updated ChangeLog for release - -2007-08-22 sasha - - * compile problem on solaris fixed; Feeble attempts at increasing - performance without any results - * compile fixes and minor optimization of the blurring code - -2007-08-20 sasha - - * AfterStep 2.2.7 release - -2007-08-02 sasha - - * fixed printing of CARD32 values on 64 bit CPUs as lX - * Fixed install targets in Makefiles to create dirs - -2007-08-01 sasha - - * Fixed install targets in Makefiles to create dirs - * fixed configure and deps checking in apps - * updated ChangeLog for libAfterImage release - * Updated embedded libPNG and Zlib to latest versions; Fixed bugs - in find_file when compiled without libAfterBase. - * libAfterImage v. 1.15 release - -2007-07-31 sasha - - * added some docs to libAfterImage - * Completed refactoring gaussian blur code. It now works both in - vertical and horizontal direction. Maximum blur radius is 128, - and its bloody fast too - * optimizations to gaussian blur and fixed mystrdup(NULL) in libAI - standalone - * fixed gaussian blur at the begining and the end; added lookup - tables for standard deviation and multiplier, prototyped vertical - pass - -2007-07-30 sasha - - * implemented integer math version of gaussian blur algorithm - * fixed blur function to not limit radius to 10 and properly - calculate gaussian distribution - -2007-07-28 sasha - - * switched timing printing off - -2007-07-27 sasha - - * some additions to asstorage attempting to improve performance in - XImage reading - unsuccessfull - -2007-07-26 sasha - - * Cleaned up libAfterImage to compile without libAfterBase and - added fiunctions to ger drawable size and window position for a - specific display - -2007-07-25 sasha - - * fixes to libAfterImage to get it compiling without libAfterBase - and to reduce valgrind complaints about uninitiolized memory - -2007-07-20 sasha - - * fixed many valgrind messages related to uninitialized memory in - libAfterImage and libAfterBase; Fixed WinTabs to take into - consideration window's gravity and frame rectangle while - determining where to unswallow the window. - * fixed image reloading to keep relevant flags - that was messing - up wharf's support for look defined folder icon. That should also - speedup repeated changes of look - * adding support in Wharf for look-specific folder pixmap - so far - only works 2 times, then stops changing - weird - -2007-07-19 sasha - - * further safeguarding agains running out of storage slots in - asstorage - -2007-07-17 sasha - - * fixed the way dumb scaling up along Y axist was screwing up - slicing of the small images. - * fixed stupid dumb bug in make_scales introduced in porevious fix - * fixed a long-standing bug with slicing images getting a vertical - stripe tovards the end. Thanks DrCurl for your Patience - * fixed a long-standing bug with slicing images geting a vertical - stripe tovards the end. Thanks DrCurl for your Patience. - -2007-07-12 sasha - - * added fixes for using proper dpy (from ASVisual structure) in - many cases - -2007-07-11 sasha - - * fixed compilation without libPNG; added ability to change default - asstorage block size - * fixed bar rendering to have proper values used for unset - hue/saturation, which eliminates one extra ASImage from being - rendered - -2007-07-10 sasha - - * fixed compilation without X in libAfterImage - * reduced modules memory usage by making fonts loading on demand, - instead of on look change - -2007-07-09 sasha - - * fixed few emory leaks (minor) - -2007-07-06 sasha - - * fixed several critical bugs in causing double free and heap - corruption, based on valgrind traces - -2007-06-22 sasha - - * Improved on location where submenus are opened, to make sure they - don't completely cover parents - -2007-06-06 jeremy - - * add alsa detection to configure - -2007-05-30 sasha - - * Fixed typo causing ttf configure parameteers being ignored - -2007-05-17 sasha - - * updated ChangeLogs for relesae - -2007-05-15 sasha - - * upgraded AS version in anticipation of release - -2007-05-11 sasha - - * made ShowHints more generic option allowing iut to be used in - other modules - started modifying WinList to make use of it - -2007-05-03 sasha - - * fixed window list publishing to use new stacking_order vector - -2007-05-02 sasha - - * minor optimization of the alpha-blending code - * added test container for mmx use - * fixed MMX usage - required _mm_empty() after each mmx intrinsics - use; Optimized window title change to not regenerate icon when - not in iconic mode - -2007-05-01 sasha - - * Implemented support for root window having different color depth - - blacxk background on 16bpp screens should go away; temorarily - disabled mmx - it seems to ruin images sometimes - * fixed color printing on 64 bit system - * replaced mmx code to use gcc intinsics - -2007-04-23 sasha - - * updated ChangeLog for 2.2.5 release - * AfterStep release v. 2.2.5 - -2007-04-20 sasha - - * implemented proper support for window groups where group leader - is an unmapped unmanaged window; Added support for window groups - to move all windows in the group to a proper desktop at the same - time; Added support for restacking window groups so that when - group leader is raised/lowered - all the members follow, but not - when one of the members does the same - -2007-02-22 sasha - - * if we don't reload menu minipixmap - we need to move it over onto - new image manager - * added feature to be able to query filetype and only reload menu - minipixmap if it is ASXML script - -2007-02-20 sasha - - * added functionality to export ASIUmage into mask MS DIB data, - contributed by Valeriy Onuchin of the ROOT project - * implemented fast thumbnailing for SVG images - * work in progress - -2007-02-16 sasha - - * different check for k!=0 added to clip_line() - * check for k!=0 added to clip_line() and small change for - compilation on Apple - -2007-02-14 sasha - - * implemented fast thumbnails loading for jpeg images; added - width/height args to the tag; changed all the picture - minipixmaps accordingly and got rid of redundand .mini jpeg files - -2006-11-17 sasha - - * Updated ChangeLog for 2.2.4 release - * AfterStep release v 2.2.4 - -2006-11-09 sasha - - * fixed clamping code in hsv conversion of greyscale colors - -2006-11-08 sasha - - * finished up SVG support implementation - -2006-11-07 sasha - - * preliminary implementation of svg support in libAI using librsvg - - may need some cleaning up to be done - * added check for librsvg to configure in preparation for support - for SVG image format - -2006-11-03 sasha - - * fixed segfault when locale is not set and added special case - handling to hsv transformation to only adjust value on greyscale - pixels - -2006-10-25 sasha - - * added code to support UTF8 in menu items and comments (using - .desktop entries) - -2006-10-19 sasha - - * fixed memory leaks in libAI on image slicing - -2006-10-12 sasha - - * fixed floating point exception gets thrown by libAI upon having - to scale image up more then 255 times its height - * Added look.Smooth and fixed segfault happening when MyStyle image - needs to be semitransparent, flipped and scaled all at the same - time - -2006-10-11 vae - - * ChangeLog revisions for 2.2.3 - * AfterStep release v 2.2.3 - -2006-10-10 sasha - - * Fixed libAI to fail when subimage does not exist in the image - file - otherwise there is no way to determine how many images are - there - * added support for reading and saving animation repeat counts in - gif images - -2006-10-02 sasha - - * updated NEW and Changelogs - -2006-09-15 sasha - - * fixed infinite loop under win32 in import.c - -2006-09-13 sasha - - * fixed reading and writing animation delay in gif images - -2006-09-11 sasha - - * added ability to obtain animation delay when reading gif images - -2006-08-29 sasha - - * added function Set to AfterStep functions to be able to change - value of xml vars; added default_src param to tag to be - able to fall back on something if none of the sourceid's is - available - -2006-08-28 sasha - - * added example to if tag docs - * added and tags handling - -2006-08-24 sasha - - * fixed GIF graphics control extention's size to be 4 bytes - that - was messing up dumb MS Photo Editor - * updated libAfterImage.mak to reflect changes in libungif - * removed includes for stdint.h - -2006-08-18 sasha - - * added asxml tag to conditionally execute stuff - * added tag to asxml to be able to set variables to evaluated - expressions in xml scripts - -2006-08-16 sasha - - * added LZ compression to builtin libungif, as patent is expired - already - -2006-08-14 sasha - - * fixed ascmap.c to not leak memory in SortedColorHash buckets - -2006-08-08 sasha - - * implemented changes to automate config parsing for modules and - also implementing support for parsing module options from look - and feel - only WinList does that for now. - -2006-07-18 sasha - - * fixed handling of the text rendering where first character has a - large negative lead, such as 'j' - -2006-05-23 sasha - - * fixed Changelog generation script and updated ChangeLogs for the - release - * AfterStep release v 2.2.2 - -2006-05-17 sasha - - * implemented automatic image reloading on colorscheme change in - Wharf - -2006-05-15 sasha - - * made libAI tolerable to negative size for image transformation - functions - not to crash - -2006-05-12 sasha - - * fixed gigantic memory leak causing background images to get lost - on desktop change - -2006-05-04 sasha - - * fixed memory leaks in xml image parsing, wm_wprotocols debugging - code, menu minipixmaps, hints and several other places - -2006-04-21 sasha - - * fixed erroneous pixmap destruction by modules for tbar props; - memory leaks in WinTabs; shaped MyStyles for WinTabs tabs; - UrgencyHint cleared handling when there is no Extended WM state - -2006-04-05 sasha - - * added ability to autoformat text inserting line breaks in order - to fit it into certain width - -2006-03-31 sasha - - * added installation into alternatives list, added Games menu under - Applications - -2006-03-24 sasha - - * cirtain fixes to bugs reported on ML - -2006-03-23 sasha - - * implemented filtering of BackgroundForeign backgrounds to include - only whats supported - -2006-03-22 allanon - - * Fixed bug causing png compression to always be zero for - save_asimage_to_file(). - -2006-03-15 sasha - - * added --have-x-support to afterimage-config to test if it was - built with X display support - -2006-03-07 vae - - * ChangeLog commit for 2.2.1 - -2006-02-28 sasha - - * added check for validity of the text (no negative size) - -2006-02-15 sasha - - * fixed all the errors reported by propriatery source analyser - -2006-01-10 sasha - - * changed titlebar props setting to use different values for - NoBevel and NoAlign being set and for when those values are unset - altogether - -2006-01-09 vae - - * ChangeLog - -2006-01-03 sasha - - * fixed bug in handling of length of UTF8 text while determining - the text size - should translate length in chars into byte length - -2005-12-18 sasha - - * fixed compile bugs - -2005-12-16 sasha - - * implemented KDE config files manipulation using xml structures; - moved xml parsing into libAfterBase - -2005-12-13 sasha - - * rewrote Makefiles abit to make output more readable. Upgraded - version to 2.2.0 - -2005-12-08 sasha - - * added built-in function SignalReloadGTKRCFile to send signal to - gtk apps to refresh rc - -2005-12-04 sasha - - * fixed icons loading for AfterStep categories. Fixed configure to - work without readline available ; some warning fixed too - -2005-11-30 sasha - - * Fixed several deps in libAfterImage which were failing to compile - without libAfterBase - -2005-11-29 sasha - - * implemented better handling of the tag - with honoring of - the alpha component of the fgcolor - -2005-11-16 sasha - - * changed clipping attr in scale tag to src_ to avod collision with - tag attributes - -2005-11-15 sasha - - * fixed SIGFPE in scale_asimage2 on clip_width and clip_height - being 0 - -2005-11-14 sasha - - * added clip_x, clip_y, clip_width and clip_height to scale tag - * added ability to scale the middle of the sliced image - use - scale=1 in the slice tag - still need to add this to MyStyles - -2005-11-04 sasha - - * more file browser stuff - -2005-11-01 sasha - - * implemented faster dir scanning for image list; added time and - size to be displayed on file list; added 3 new members to TermDef - data struicture for future simplier config parsing - -2005-10-18 sasha - - * changed TTF font renderer to use advance.x attribute of the glyph - as the step instead of old way of width + bitmap_left - * implemented horizontal font kerning support for TTF fonts. Most - font's don't have that info in them though - -2005-10-05 sasha - - * fixed potential segfault in gradient parsing where number of - offsets is greater the colors - -2005-09-22 sasha - - * debugging NET_WM_ICON support - mostly works - -2005-09-21 sasha - - * implemented support for 32bit ARGB icons supplied by an app in - _NET_WM_ICON property - -2005-09-19 sasha - - * changed parsing of xml to match docs and use x_start - instead of start_x etc. - -2005-07-19 vae - - * AfterStep Release v 2.1.2 Changelog - * AfterStep Release v 2.1.2 - -2005-06-30 sasha - - * completed implementing Make XML wizard with both minipixmaps and - main wallpaper xml generation - -2005-06-26 fabs - - * removed redundant ";" to allow compilation on FreeBSD 4x - -2005-06-21 sasha - - * improved layout of XML editor - -2005-06-20 sasha - - * began implementing xml editor widget for ASWallpaper - don't - really save anythging yet - -2005-06-15 sasha - - * Implemented safer detection of AfterStep XML image type to - differentiate from XML and HTML docs; Added more controls to - ASImageBrowser - * debugged directory listing in image browser; added new file types - for HTML and XML to stop treating them as image scripts; Added - keycombo to switch windows in WinTabs - Alt +(key to the left - from 1) - -2005-06-13 sasha - - * added widget for image directory list and image browser dialog - -2005-06-10 sasha - - * implemented GTK widget for image viewing , usefull for image - browsers - -2005-06-08 sasha - - * Applyed many fixes based on output of automated analysys tool, - provided by sdague - * updated changelog for release of libAfterImage - * libAfterImage release v.1.07 - * fixed segfault on closing of asview - -2005-06-06 vae - - * AfterStep release v 2.1.1 - * ChangeLog update for 2.1.1 - -2005-06-03 sasha - - * implemented rudimentary Targa files reading - * fixes in libAfterImage for compilation and installation without - libAfterBase - eliminated debug output, type casts, etc. - * Fixed create_visual_pixmap to work with root = None; Fixed - scale_pixmap to scale even in one direction only; Fixed configure - to set path to libAfterBase to more sensible values - -2005-06-02 sasha - - * implementing import of TGA files - -2005-05-25 sasha - - * fixed gc creation code to not create a new window each time gc - needs to be created - * fixed merge function selection code in composite tag handler - -2005-05-24 sasha - - * rewrote xml handling code and broke some stuff - -2005-05-23 sasha - - * implemented slice_asimage function as yet another method of - enlarging images where corners remain unchanged, but middle part - gets tiled - -2005-05-20 sasha - - * Fixed bug in tiling of ARGB32 data in libAI and implemented - dynamic resizing of preview in ASWallpaper - -2005-05-19 sasha - - * Improvements to enable gtk apps to interoperate with libAS - -2005-05-17 vae - - * AfterStep release v 2.1.0 - changelogs - vae - * AfterStep release v 2.1.0 - vae - -2005-05-16 sasha - - * Added prototype of the GTK based tool for selecting AfterStep - backgrounds - -2005-05-04 sasha - - * Updated ChangeLogs for 2.00.05 release - -2005-05-03 sasha - - * Fixed segfault in shared memory cleanup code; Still segfaulting - on restart in FramesList cleanup code - -2005-04-29 sasha - - * added image path to ASImageManager's search path, so that - referensed images could be found from local dir. - * changed asview.c to open display prior to the image so that - display size variables would get set properly - * added image path to ASImageManager's search path, so that - referensed images could be found from local dir. - -2005-04-26 sasha - - * fixed handling of ButtonSize setting - it was ignored - -2005-04-22 sasha - - * Fixed off-by-one bug in ASStorage causing weird artefact and - possibly segfaults, due to occupied slots being reused improperly - -2005-04-21 sasha - - * hopefully fixed Segfault when window changes name at the time of - destruction - -2005-04-11 sasha - - * fixed segfault when wrong op= to composite tag is used - -2005-04-04 sasha - - * removed inline's froom functions all exported functions in - libAfterImage - -2005-03-22 sasha - - * Updated ChangeLogs for 2.0.4 release - * made desktop cover tint to be similar to Base color from selected - colorscheme - * cleaned up stale help files; got rid of sgmltools deps; updated - .spec file; changed version number to 2.0.4 - -2005-03-21 sasha - - * fixed segfault with glx enabled - -2005-03-17 sasha - - * fixed libraries listed by libAfterImage config script to include - X libs to avoid linkage problems - * implemented dynamic linking to several global vars exported from - libAfterStep to prevent compilation and linkage errors - * hopefully cleaned up shared memory usage - -2005-03-16 sasha - - * optimization of shared memory - * some debugging of asstorage code, possibly fixing segfault - -2005-03-14 sasha - - * fixed handling of special sequences in xml source of ASDocGen+ - fixed handling of several term tags within single varlist entry - -2005-03-11 sasha - - * copied DefaultFancy.ttf to libAfterImage/apps/test.ttf to avoid - possible licensing issues. Those are the same anyways, only - DefaultFancy includes Public Domain notice - -2005-03-09 sasha - - * some memory hole plugging and leaks debugging - nothing major so - far - -2005-03-08 sasha - - * debugging memory utilization - * fixed compile warnings for Alpha's cc - * fixed few compile warnings - -2005-03-07 sasha - - * fixed problem with wharf swallowing apps that were mapped on - different desktop - -2005-03-02 sasha - - * updated ChangeLog file to 2.00.03 release - * AfterStep 2.00.03 release - -2005-03-01 sasha - - * added support for IMAGE_PATH env var to all apps in libAfterImage - enabling them to view images installed in different afterstep - directories - * some docs additions - * fixed bugs: segfault and mem corruption in ASStorage when - compressed size exceeds buffer size; Proper encoding usage in - winlist menus - for UTF8 encoded window names; Proper encoding - usage in balloons - it was using ASCII regardless; Proper font in - Pager with support for international chars instead of 5x8; - Handling of $HOME at the beginning of include statements of - .include files - -2005-02-28 sasha - - * added experimental image transfer code using OpenGL API - * more performance testing with OpenGL - * gl timing - -2005-02-25 sasha - - * added prototype of image transfer to X using GLX - to see if its - any faster - * fixed compile warning - * updated configure to exclude Save - -2005-02-23 sasha - - * implemented scratch canvas functionality in draw.c to facilitate - fill operation on some countours; Added draw.h header - -2005-02-22 sasha - - * changed ~ to //home/sasha - * added FONT_PATH and IMAGE_PATH to set of envvars put out by - AfterStep - * compilation warnings and bugs submitted by Valeriy Onuchin - -2005-01-21 sasha - - * added recovery code for malformed gifs not having zero length - block at the end of compressed data - -2005-01-20 sasha - - * updated ChangeLog for 2.00.02 release - -2005-01-18 sasha - - * fixed configure for CYGWIN to build proper lib type. Implemented - Image writing into memory buffer in PNG format - see - ASImage2PNGBuff example in asvector.c - * added ability to bundle included sumenu's items under private - user items - -2005-01-17 sasha - - * configure fix - -2005-01-14 sasha - - * changed everything to make possible libAfter* as a DLLs - Scr - substituted to a pointer and same for MyArgs - -2005-01-13 sasha - - * bunch of fixes to enable shared libs under CYGWIN - but there is - still a problem of linking apps becouse of the Scr variable - -2005-01-12 sasha - - * fixed long standing bug with AS not restarting itself properly. - Upped version to 2.00.02 in preparation to release - * fixed Makefiles and -config scripts - -2005-01-10 sasha - - * ellipses, damn it - -2005-01-07 sasha - - * ellipses - -2005-01-06 sasha - - * more bloody ellips - -2005-01-05 sasha - - * bloody ellips - -2005-01-04 sasha - - * mostly done with ellips implementation using doubles - runs - faster the approximation through beziers - -2005-01-03 sasha - - * mocking about with ellips drawing algorithm - probably should - switch to doubles instead of long longs - -2004-12-29 sasha - - * some funky stuff to try to get alternative ellips algorithm going - - doesn't work yet - -2004-12-27 sasha - - * flood fill and more circle/ellipse code - -2004-12-25 sasha - - * implemented solid fill for circles - -2004-12-23 sasha - - * completed implementation of ellips and circle primitives - -2004-12-22 sasha - - * improved cubic splines to not use recursion and implemented - circle drawing - * Implemented antialiased cubical Bezier curves drawing - * implemented anialiased line rendering - -2004-12-21 sasha - - * implemented anialiased line rendering - -2004-12-20 sasha - - * fixed afterstep-config to include extra X libs; implemented - prototype anialiased drawing code - -2004-12-17 sasha - - * added test code for drawing - * added drawing functionality - * fixed performance hog introduced by data[1] changed to data[0] in - asstorage during round of warnmings fixes - -2004-12-10 sasha - - * More compilation warnings fixed - * ttf always on under win32 and typo fix in mmx initialization code - -2004-12-09 sasha - - * added list of standard X colornames - * numerous fixes from FonsRademaker and Valeriy Onuchin - to make - it compile under win32 - -2004-12-08 sasha - - * fixed bunch of warnings for different compilers - -2004-11-30 sasha - - * AfterStep 2.00.01 release - * added a configure option --disable-data-reinstall just for MG_Tak - - it prevents image, font files from being copied over existing - ones, and prevents HTML catalogue from being generated; - -2004-11-29 sasha - - * Fixed bug in afterstep not sending proper notifications about - which window is currently focused - -2004-11-26 sasha - - * fixed memory leak at add_line_mono - -2004-11-23 sasha - - * updated version to 2.00.01 - * added comments to vectorize_asimage - -2004-11-22 sasha - - * implemented vectorize_asimage and some minor fixes to Wharf - -2004-11-19 sasha - - * Fixed tiling with negative offset - unsigned/signed conversion - problem - * Debugged conversion from alt.argb32 to other stuff, like XImage - etc. using ASImageDecoder - see example in asview.c - * Implemented ASImageDecoder support for alt.argb32 format - -2004-11-16 sasha - - * changes to accomodate new aterm code - * Fixed ascmap to not segfault under MSWin and fixed fill_asimage - to use proper width when x > 0 - reported by Valeriy Onuchin; - -2004-11-15 sasha - - * fixed shading translation into tint - * fixed some code in pixmap handling used in aterm - * changed Pager invocation in start menu to use desktop number - specifyed to configure script - -2004-11-14 born2late - - * typo corrections - -2004-11-10 sasha - - * fixes to afterimage include files to properly install and enable - other apps to use it - -2004-10-27 sasha - - * began implementing XML-RPC interface to ASConfig - -2004-10-15 sasha - - * fixed libAfterImage makefile for win32 to include asstorage.c; - fixed compilation problem and excessive debug output under - windows - -2004-10-14 sasha - - * possibly resolved problem with ASDocGen not being run when - compiled with shared libraries - -2004-10-08 sasha - - * Fixed problem in base loading where there were no sanity checks - for DesktopScale value; Fixed a bug in ASStorage where small - images < 15 pixel widths would come out broken; Implemented - partially property tree printing in ASConfig; Added ASStorage - functionality to be able to query original size of the stored - data - -2004-09-27 sasha - - * changed versions to 2.00 and 1.00 for libraries - * fixed recently intoduced bug in asstorage causing major slowness; - added some logic to prevent costly maintenance operations from - happening too often - -2004-09-24 sasha - - * fixed segfault in asstorage when diff buffer does not gets - reallocated - * fixed button ungrabbing on windows withdrawing that was causing - weird BadAccess errors in Wharf - -2004-09-23 sasha - - * implemented preloading of menu pixmaps - speeding things up - considerable; fixed segfault in asstorage - still unclear how - that could happen - may see some image corruption instead - -2004-09-22 sasha - - * some performance optimization based on gprof stats, as well as - memory leak cleanups - -2004-09-21 sasha - - * added mandatory -O3 in libAfterImage and libAfterBase improving - performance significantly; - * fixed performance hog in asstorage, as well as segfault in the - same place; Implemented shaped image rendering directly into - XImage, added menu shortcuts for Left and Right keys - -2004-09-19 sasha - - * fixed possible data loss in asstorage for the very first block - -2004-09-16 sasha - - * lots of optimizations of focus change handling in WinList and - AfterStep, shape handling optimizations in Pager and other tweaks - -2004-09-15 sasha - - * added NoBorder flag to MyFrames, improved performance and - feedback in data doc generation - -2004-09-14 sasha - - * added code to background handling, to not interrupt the animation - when desktop is switched before it completes - -2004-09-08 sasha - - * changes to feel file for better shortcuts for desktop switching; - Fixes to ASStorage to properly handle reference counting without - leaving leftovers - -2004-09-02 sasha - - * Lots of tweaks to desktop switching, initial placement handling - and move-resizing - -2004-08-30 sasha - - * updated configure scripts - -2004-08-26 sasha - - * fix to Makefile to install man pages and HTML help pages - -2004-08-25 sasha - - * more xft development - * Some changes to DeadPipe to prtevent it from reentering self - -2004-08-24 sasha - - * Implemented memory debugging for buffer underruns with - --enable-audit under win32; Found memory corruption caused by - merging image of size 0, which fixes segmentation Fault in - WinList - -2004-08-23 sasha - - * Fixed make install in libAfterImage; Added missing files to - libAfterImage's project files; Fixed segfault in afterstep when - clicking happens too fast and there is no more window by the time - function is executed - * applied patch for interlaced GIF support from Maxim Nikulin - -2004-08-20 sasha - - * new development to add interface with XRender extention for text - rendering - -2004-08-19 sasha - - * fixed potential segmentation fault in asfont.c at the time of - text rendering - -2004-08-17 sasha - - * fixed compile bug in asstorage.c - * disabled clocking of transformations and text drawing - -2004-08-16 sasha - - * Changed version number to beta5, Changed AfterStep.spec to be - updated automagically with proper version number; Updated - afterstepdoc script to select web browser from mozilla, firefox, - konq, opera, netscape - -2004-08-13 sasha - - * fixed bug in asstorage causing segfaults if block is used - completely; Improved Wharf's handling of animation - should now - be much smoother - -2004-08-12 sasha - - * fixes to docs to format properly into PHP. Fixes to AsDocGen to - have nice indexes and proper references from devel docs to user - and back - -2004-08-11 sasha - - * Implemented new generated doc installation in Makefiles, added - more libAfterImage docs, fixed formatting in asimage.h and - asfont.h - -2004-08-10 sasha - - * Fixed bug in ASStorage causing negative sizes in slots and as the - result garbadge in images - -2004-08-09 sasha - - * fixed segfault bug in transform.c if image creatrion fails - * fixed some docs generation - -2004-08-06 sasha - - * added xml source for documentation into CVS and updated Look in - libAfterConf to be same as in src/afterstep/configure.c - -2004-08-03 sasha - - * Implemented 3 new types of text: OutlineAbove, OutlineBelow, - OutlineFull that does outlining of text, also enabled alpha - tinting of the text at the time of rendering - -2004-08-02 sasha - - * added memory cleanup code to ascompose, and added missing free - calls to storage destruction code - * fixed thresholding code in asstorage needed for rectangular shape - stuff - * Improved reference counting in ASStorage to accomodate to weird - storage states where some blocks have no space left for reference - -2004-07-30 sasha - - * reimplemented image reading using new functionality of ASStorage - using bitmap stuff and grayscale images using reference counters - -2004-07-29 sasha - - * debugging the size of AS menus; added storage printing function - -2004-07-28 sasha - - * disabled debug output - * rewrote ASImage contents storing code to utilize generic - ASStorage - * added 32bit store function - -2004-07-23 sasha - - * completed implementation of ASStorage, including compression - scheme for bitmapped data - -2004-07-21 sasha - - * Completed implementing RLEDIFF compression and ; Completed - debugging of asstorage with RLE DIFF compression - -2004-07-20 sasha - - * implemented decompression - * Implemented RLE diff compression code in ASStorage - -2004-07-16 sasha - - * started implementing compression using zlib - -2004-07-14 sasha - - * completed debugging and implementing asstorage - -2004-07-13 sasha - - * Implemented and debugged storage defragmentation; Moved xml - parser enums back to .h and added missing typedefs - * Fixed guarded memory handlinbg for blocks of whole number of - pages; Debugged some of the aspects of ASStorage memory handling - - must implement defragmentation now - * changed /ML flags to /MD ( based on Bertrand Bellenot suggestion) - * accepted patch from Bertrand Bellenot (Root) for libAfterImage - under Win32; Updated MSVC project files with new files - -2004-07-12 sasha - - * debugged storage storing, started implementing fetching - * added better testing code - -2004-07-09 sasha - - * partially debugged ASStorage implementation - -2004-07-07 sasha - - * storage splitting - -2004-07-06 sasha - - * ASAStorage slot selection code added - * Continued implementation of ASStorage - * implemented test container for asstorage ala XP - -2004-07-05 sasha - - * started implemnting proper storage for ASImage data - -2004-07-03 sasha - - * Updated configure scripts; spilt image decoder/encoder from - asimage - need to rearrange to get it to order - * done most of the coding required for proper handling od static - ASImages - -2004-07-02 sasha - - * implemented crosslinking docs - -2004-07-01 sasha - - * implementing urls for keywords, intellifgent handling of the NAME - section, etc. - -2004-06-30 sasha - - * Added nested subsections, partly debugged quotations, other doc - gen tweaks - -2004-06-29 sasha - - * progress in implementing static ASImages - -2004-06-25 sasha - - * prototyped doc generation for robodoc comments - -2004-06-24 sasha - - * Disabled stripping of binaries when enable-gdb is requested - -2004-06-22 sasha - - * Implemented support for static ASImages where memory is allocated - more efficiently - -2004-06-21 sasha - - * added support for UTF-8 when its requested in LC_LANG setting - -2004-06-13 sasha - - * Introduced new type of image - static to add flexibility in - regards to memory allocation - -2004-06-10 sasha - - * added xml tag so that temporary images could be unload - to free up some memory - -2004-06-08 sasha - - * Fixed race condition with modules using LOCKONSEND and display - being grabbed - * added ability to XML parser to recognize known tags; Added - framework code for converting source xml into html docs to - ASDocGen - -2004-05-24 sasha - - * fixed scaling algorithm to properly scale images with height <= 3 - -2004-05-18 sasha - - * updated dependancies, and completed reimplementing Animate module - - still needs some debugging though - * fixed erroneous uncommented line in shared memory XImages - -2004-05-17 sasha - - * cleaned up C++ comments - -2004-05-13 sasha - - * debugging background changing - * hopefully fixed detection of freetype library on debian sarge - -2004-05-12 sasha - - * updated configure scripts and partly fixed freetype autodetection - for debian - still need ft2build adding to freetype.h detection - code - * implemented fast(er) desktop switching by caching background - pixmaps - there are some quirks that needs to be ironed out still - -2004-05-11 sasha - - * fishing out segfault in get_text_size - * Implemented memory debugging under cygwin and fixed discovered - bug in MyStyle parsing - -2004-05-10 sasha - - * Implemented Transient button functionality in Wharf, missing from - 1.8 - -2004-05-07 sasha - - * minor TODO changes - -2004-04-29 sasha - - * Implemented ability to use tab stops while drawing text, and - cleaned up new api calls; Fixed Wharf Bevel setting - -2004-04-19 sasha - - * Implemented ability to load any font as monospaced using scaling - of glyphs and other techniques, making it possible to use - libAfterImage for text output in applications such as text - editors and terminal emulators - -2004-04-15 sasha - - * Fixed bug in handling of Viewport setting in database when only - one of the x or y is set.It was using X set flag for y value and - wise versa - -2004-03-31 sasha - - * Fixed potential segfault in asfont.c when font is NULL; Fixed - including of afterbase.h in asapp.h to be done only when compiled - as part of AfterStep - -2004-03-19 sasha - - * added includes for xmd.h prior to jpeglib, to prevent multiple - definitions of INT32 - * added missing include for system's zlib.h in png.h - * removed unneeded io.h from libungif - -2004-03-18 sasha - - * Found and fixed very weird heap corruption bug, causing segfault - whenever bevelled rectang is drawn - * Added builtin libungif to libAfterImage, and enabled support for - it by default in configure - -2004-03-17 sasha - - * added MSVC nmake makefiles - * fixed libAfterImage to properly handle path in win32 - -2004-03-16 sasha - - * Incorporated libpng, libjpeg and zlib into libAfterImage, in case - it is not available on the target system, or we are compiling - under win32 - -2004-03-11 sasha - - * Completed implementing conversion from ASImage into DIB and - implemented sample win32 image viewer application as an example - and testbed. - -2004-03-10 sasha - - * started implementing ASImage2DIB converter - * moved some of the bmp functionality into bmp.c/h - * removed 0x0D that came from MSVC porting - * changes to make libAfterImage compile under MSVC in win32 - * began porting libAfterImage into win32 - -2004-03-05 sasha - - * Fixed compilation in Feel.c with --enable-gdb; Fixed local - selection if only the country is specified such as en_US - RedHat - seems to have this; Fixed segfault in spawn_child with locale - specified it was attempting to check if pointer is isspace() - triggering bug in glibc - -2004-03-04 sasha - - * Fixed annoying type-punning warnings; Fixed annoying -rdynamic - warnings on CYGWIN; Changed default compression ratio for - screenshots to give very high quality; Fixed configure.in to - properly work with latest autotools supporting PACKAGE_ stuff; - Fixed configure to remove -g if enable-gdb is not requested; - Fixed root image grabbing using overlay window to not use Backing - Store; Fixed ascompose to set USPosition when geometry is - requested; Fixed Banner to set its title ; Upgraded version to - beta4 - -2004-03-01 sasha - - * better Banner - * removed redundand ifdefs for I18N - * debugged and optimized Banner and ascompose - -2004-02-27 sasha - - * added missing usage text to ascompose and fixed Makefile to - install Banner - * improved ascompose - * debugged mask to rectangles list functionality in asimage.c - -2004-02-26 sasha - - * added support for shaped windows to ascompose; Debugged - channel->rectangle set conversion in libAfterImage - still have - some vertical stripes - * Fixed tag in asxml to properly swap width and height in - case of 90 or 270 degree rotation - -2004-02-21 sasha - - * added code to AfterStep to publish Image and Font path in env - vars; Added feel.ICCCM that has no keyboard bindings; Added - window centering code to ascompose; Added missing cursor - definitions to look.QNX; - -2004-02-20 sasha - - * Added ability to wait for data placed in X clipboard and then - displaying it if its in XML format - -2004-02-19 sasha - - * added ability to use same window for different images - * fixed display closing when running in loop - * added interactive error reporting functionality - * added interactivity functionality to ascompose - -2004-01-27 sasha - - * now hopefully workplace state restoration should work fine - - fixed complex function name parsing, for cases when its nested - within anopther complex function. Also added checks to not - remove -g even if --enable-gdb is not specified ( due to requests - from debian folks) - -2004-01-21 sasha - - * fixed bug where empty locale would be specified while starting a - module causing Pager to have 255 desktops and other weirdness - -2004-01-13 sasha - - * fixed bug in shared image variant of background xfer - * disabled animating for tiled pixmaps as it seems to cause - slowness - -2004-01-12 sasha - - * hopefully optimized ximage transfer by using reusable memory and - added ability to postpone background switching task to be done - later - -2004-01-08 sasha - - * fixed libAfterStep installation procedure and some of the headers - to make it useable in external apps - -2004-01-06 sasha - - * fixed get_font to not crash when X is missing; Fixed ascolor to - not open any connections to AS when -n option is used - -2004-01-02 sasha - - * Fixed keyboard presses handling to not require window selection - when there is a focused window; Updated .spec file to better - handle libraries and stuff ( thanks to Andre Costa ) - -2003-12-23 sasha - - * Fixed README.SOLARIS and libAfterImage's Makefile if's - -2003-12-17 sasha - - * added width/height value "proportional" to tag to keep - image ratio while scaling - -2003-12-09 sasha - - * got rid of Wait3 testing in configure - should speed it up a bit - -2003-12-08 sasha - - * fixed handling of trailing whitespace at the end of the tag in - XML processor - * added support for C control codes in printf format strings in - asxml, added safeguards to check for proper number of parameters - in printf format string - * fixed support for input from stdin and output onto stdout in - ascompose - -2003-12-05 sasha - - * Cleaned up configure to not have ugly -I.. -I../.. and not do any - detection of libAfterImage/Base - we should always use what we - came distributed with - * fixed without-x compile problem in asvisual.c - * fixed stddef.h bug in libAfterBase and without-x compile problem - in asimage.c - * added tag to asimage xml to enable output of internal - variables such as image size - -2003-11-28 sasha - - * added afterimage-config - -2003-11-14 sasha - - * Added cover window to meaningfully show user that AfterStep is - reloading config or starting up or doing anything else that takes - time - -2003-11-07 sasha - - * Added ActiveDeskBevel and InActiveDeskBevel to Pager's options; - Debugged bevel drawing when tbar has different bevels for focus - and unfocus states( should get rid of weird black frame when one - of the states is None) - -2003-09-25 sasha - - * AfterStep 2.00.beta2 Release - * Some minor tweaks to cursor coloring and HSV manipuylation for - grayscale - * Implemented automagic generation of the ChangeLog - -2003-09-22 sasha - - * Fixed locale parsing from LANG variable; Fixed module startup to - pass on current locae specified on command line - -2003-09-09 sasha - - * More fixing Pager's geometry; Added -i cmd line parameter to - ascompose to allow for 'include' files (such as colorschemes, - etc.); Updated configure scripts to properly detect headers when - its run from libAfterBase; Updated version to beta2; Updated TEAM - file - -2003-09-08 sasha - - * Fixed Pager to properly account for label size while sizing - min-desktop windows - -2003-09-03 sasha - - * added new AfterStep log icon; fixed wharf config file - -2003-09-02 sasha - - * added new xml tag : to define symbolic color names - -2003-08-30 sasha - - * debugged workspace state handling code, and improved Wait loop - -2003-08-28 sasha - - * added caching of pixmaps for unfocused bas in window decorations - to speed up fast focus switching - * 64-bit fixes: properties and strlen warnings - -2003-08-27 sasha - - * fixed handling of non-default MyBackgrounds, and proper adding of - DeskConfigs while switching desks - * synching - -2003-08-26 sasha - - * added parameters to import funcions, to allow for sized - image/preview stuff; Removed compression buffer from ASImage - structure to save up some memory; Hopefully fixed hints handling - on 64 bit hw - -2003-08-23 sasha - - * added new 3 icons to complete the set of default icons: switched - AfterStep to use ~/.afterstep instead of ridiculous ~/GNUstel/L/A - stuff - -2003-08-22 sasha - - * fixed autodetection of zipped xpms and added 6 more icons to - default iconset - -2003-08-21 sasha - - * more improvements to asimbrowser - -2003-08-20 sasha - - * implemented html generator for icons list (asimbrowser); TODO: - replace all asimage_decode_line with Image Output thingy, or - implement support for back_color - -2003-08-19 sasha - - * implemented image list loading from dir listing - -2003-08-18 sasha - - * configure regenerated - * changes to configure to properly handle user set LDFLAGS - * configure regenerated - * changes to configure to properly handle user set LDFLAGS - * configure regenerated - * changes to configure to properly handle user set LDFLAGS - * configure regenerated - * changes to configure to properly handle user set LDFLAGS - -2003-08-15 sasha - - * applied 5 patches from Stasinos Konstantopoulos - * updated configure scripts to autoconf 2.57 - * more messing aruound with system headers and compilation - * updated configure scripts - * more messing aruound with system headers and compilation - * updated configure scripts - * more messing aruound with system headers and compilation - * more work on compilation issues, notably fixed errors on old - debian 2.2 - -2003-08-14 sasha - - * disabled gif/ungif by default - * disabled gif/ungif by default - needs to be reenabled manually - * compilation warnings fixed - * updated configure - * hopefully fixed all the strict aliasing breakage errors with - newer gcc - -2003-08-13 sasha - - * bugfixes in Pager and Wharf, and fixed handling of malloc.h - -2003-08-12 sasha - - * removed offending varargs include that was not needed anyways, - but was breaking compile with gcc 3.3.1 - -2003-08-11 allanon - - * fail gracefully if merge is requested and no images can be loaded - -2003-08-11 sasha - - * cleanup in preparation to beta1 release - -2003-08-09 sasha - - * added cleanup code for shared memory - -2003-08-08 sasha - - * added safety check for shared memory utilization - -2003-08-07 sasha - - * fixed bug in ASImage to shape conversion causing disappearing - titlebars in glass look - -2003-08-01 sasha - - * rewrote shaped windows handling to use rectangles everywhere, and - intelligently merge them together, thus greately reducing memory - utilization and avoiding flickering and other nasty artifacts. - That's it, last commit before beta1 release :) - I'm off for - vactaion, coincedentally :) - -2003-07-23 sasha - - * added feature allowing for the menu minipixmaps to come from - files with specified extension, such as .mini - -2003-07-22 sasha - - * fixed error message while trying to load X11 font with part of - the name truncated as the result of size parsing - -2003-07-18 sasha - - * completed implementation and debugging of shared memory - extensions use in afterstep proper; Fixed compression of xml - images - save a bundle or root pixmaps - -2003-07-17 sasha - - * Fixed bug in asimage2ximage where asv->dpy was used instead of - asv; Fixed bug in Pager's handling of folders while checking - availability - * completed implementation of support for shared memory XImages - -2003-07-16 sasha - - * added look.Glass (look-alike of 23 Oz Glass E theme); Fixed - shaped windows bug in mystyle image rendering (alpha channel was - being lost); Added ability to adjust hsv of the color; fixed bug - in window decorations handling - background images - -2003-07-15 sasha - - * mostly completed wharf config - -2003-07-14 sasha - - * added icons for terms and added better availability check to - Wharf and AfterStep - Wharf now allows to choose from one of the - icons - -2003-07-13 sasha - - * fixed configure script to properly compile libAfterImage apps - -2003-07-11 sasha - - * Implemented 3 more functions: TakeScreenShot, TakeWindowShot and - TakeFrameShot, as the side effect of debugging root background - handling. Updated feel.DEFAULT to use those - * fixed bug in inheritance code where back_icon would get destroyed - even if it was inherited, thus causing weird things to happen - when same style is inherited twice; Added code to - mystyle_make_image to ensure that we always produce valid ASImage - -2003-07-01 sasha - - * fixed uninitialized ximage pointer usage in create_visual_ximage - * continued development of the xshmimages - -2003-06-30 sasha - - * fixed shmem autodetection - * added support X Shared Memory Image extensions ( mostly ) ; - -2003-06-27 sasha - - * Fixed handling of xv's crazy WM_HINTS changing and overal;l hints - changing; Fixed out of bounds memory access in make_file_name and - picture_ximage2asimage; completed support in configure for X - Shared Memory images - -2003-06-26 sasha - - * Fixed bug in libAfterImage causing garbadge in gradients 1 pixel - wide - -2003-06-25 sasha - - * Fixed transparent gradient drawing to do alphablending instead of - allanon; Fixed menu to not show underscores; Fixed menu look - update; Added feature to Wharf to verify that Exec command - commands are actually available in PATH; Fixed balloons drawing - to withdraw them as pointer leaves the window - -2003-06-23 sasha - - * made afterstep UTF-8 aware. - -2003-06-21 sasha - - * debugged UTF8 rendering with libAfterImage and Default.ttf font - -2003-06-20 sasha - - * fixed UTF8 char size calculation - * Fixed bug in unicode character drawing causing segfaults - -2003-06-09 sasha - - * Fixed compilation of libAfterImage without libAfterBase - -2003-06-06 sasha - - * Fixed gradient type handling; Fixed PinMenu in feel for button 5; - Added check for what side should be dragged when window is - resized without pressing on the frame - -2003-06-05 sasha - - * gradient rotation code implemented for vertical titlebars - * fixed manual placement so that window's corner is at the mouse - position - -2003-06-04 sasha - - * created pressed buttons for the default look; Fixed bug in - load_file where file would get opened twice - -2003-06-03 sasha - - * redesigning default titlebar buttons - * Implemented NoFocusOnMap database hint; Added opacity setting to - solid tag in xml: - -2003-06-02 sasha - - * minor fixes to xml parser - -2003-05-30 sasha - - * Added several new attributes to composite and text tags for: text - 3d type, align, vailgn ( in asxml handler ); Fixed text - foreground image handling in asimagexml; Designed new default - background as composite of gradient and old texture with text on - top of it. - -2003-05-28 sasha - - * completed debugging colorscheme tools - need to check into way of - calculating saturation and value - -2003-05-22 sasha - - * Makefile fixes to make libAfterImage and libAfterBase packageable - for RedHat - -2003-05-20 sasha - - * Implemented colorscheme parsing/writing (mostly) - -2003-05-19 sasha - - * added handling of button pressing to ascolor; Fixed bug in man - page installation for libAfterImage reported by MG_Tak - -2003-05-09 sasha - - * Fixed image storing in xml scripts using id= attribute; Added - check for minimum text color brightness when whitening it; Added - more bars to ascolor.c; Fixed bug in Makefiles for shared - libraries; - * fixed compile bugs in parse.c and completed hsv/rgb custom color - parsing - -2003-05-07 sasha - - * prototyped FLTK based ascp; Made all the libraries C++ safe - -2003-05-06 sasha - - * added csome code to produce nice colorschemes automagically - -2003-04-25 sasha - - * fixed loading of images inside xml scripts to use same PixmapPath - as everything else - * added .xpm to filenames of old buttons - * Got rid of old MyFont cruft; Got rid of global GCs in MyStyles; - Fixed handling of FontPath and loading of TTF fonts - -2003-04-22 sasha - - * added bunch of xml icons for titlebar buttons; removed fprintf - from transform.c - -2003-04-21 sasha - - * generated bunch of dots icons from buttons - -2003-04-18 sasha - - * improvements and fixes to asimagexml adding new flags to bevel - tag and fixing handling of IMAGE_PATH env var - -2003-04-16 sasha - - * updated configure script - * Fixin Makefiles for new icons etc - -2003-04-08 sasha - - * missing braces in ico import code; Fixed large icons broken by - broken libAfterImage; Added Bookshelf and Package icons - * Fixed scaling Up algorithm to put correct last line ( it was - putting 4th line before last instead); Fixed MS Icon file format - reading to allow for arbitrary size of images ( it was affecting - AndMask not being read correctly; - -2003-04-03 sasha - - * added xpm2png conversion script - -2003-03-28 sasha - - * Fixed bug where while writing bitmap mask we would forget to - unset flag indicating that it is 8 bit mask - -2003-03-26 sasha - - * Fixed segfaulting with 64bit compile due to 32bit values used - instead of pointers in calls to get_hash_item - -2003-03-25 sasha - - * some changes to make code 64-bit safe - -2003-03-21 sasha - - * fixed nasty segfault in image tracing code; addede more - descriptions to NEW; continued work on saving desk/viewport: - -2003-03-19 sasha - - * Fixed text size miscalculation due to starting counting from - second character instead of first - * implemented gaussian blurr for selected channels in ascompose:) - WE can now easily convert icons into png - -2003-03-10 sasha - - * debugged root background handling so that aterms should not crash - now; Scaled/tiled/clipped backgrounds should reload now; There - will be no multiple copies of the image kept in AS memory - anymore; - -2003-03-04 sasha - - * upgraded version, rearranged and renamed libraries to match - as-devel; updated includes in libAfterConf and libAfterStep - -2003-02-24 sasha - - * Hopefully fixed gamma correction issue in PNG images - -2003-01-07 sasha - - * IMplemented shaped windows support in as-proper; Implemented - shaped Wharf; Debugged labels in Wharf; Fixed bug in image - flipping code where color could get lost when original uses - back_color; - -2002-12-19 sasha - - * cleaned up and debugged background image handling; fixed clients - stacking order in Pager; ICCCM ConfigureNotify on frame moves - reenabled; proper config broadcasting at the time of the actuall - ConfigureNotify; stacking order gets sent on WindowList request; - -2002-12-05 sasha - - * Fixed bug in image flipping where back_color would get lost; - Implemented menu style in database as Style ASMenu; began working - on Pager and WinList2 to get them to compile and run with new - as-proper - -2002-12-04 sasha - - * sugnificantly improved speed of menu rendering as well as - loading time; - mostly implemented Pinning of the menus - need to debug - redecoration of the frame window; - -2002-12-02 sasha - - * Fixed root pixmap grabbing using ParentRelative; Fixed label - layout moving label off alittle bit; Began implementing support - for DrawMenuBorders setting - -2002-11-15 sasha - - * Fixed memory leaks in asfont.c,list.c,decor.c and InitLook(); - Implemented proper cleanup to produce clean memory leak output; - Implemented smooth shading animation in both directions - -2002-11-14 sasha - - * Fixed titlebar button contexts;Fixed decoration - focusing/unfocusing; fixed pressing/depressing; Fixed segfaults - in LookInit (pixmaps); Fixed numerous memory leaks in menu - parsing and in font loading; - -2002-11-06 sasha - - * Moved MyStyles to use Hash table, Fixed mystyle_property code to - use wmprops; updated libConfig to use asapp and fixed MyStyle - parsing; cleaned up bits and pieces and at long last got - AfterStep proper to compile cleanly cd as-stable! Now its time - for some debugging - -2002-10-30 sasha - - * making progress to get as to compile - link time errors now - -2002-10-18 sasha - - * started fixing functions.c; fixed bug in event.c reported by - tildouf - -2002-07-24 sasha - - * implemented shaped decoration drawing - see winlist2 with - BackPixmap set to 125 or 126 for any of the styles - -2002-07-23 sasha - - * Fixed afterstep proper to use same functions as mystyles for icon - loading( with shapes and alpha-channel) Fixed bugs in mystyle - text drawing; some ximage.c functions where bitmap parameter was - wrong; Changed titlebar buttoins to use MyIcon and MyButton; - Changed Frames to use MyIcon with shapes and everything; Fixed - menu to properly load and unload icons - -2002-07-22 sasha - - * completed implementation of 8-bit alpha channel pixmaps in - libAfterImage; added function to hopefully determine the most - efficient depth of alpha channel (8 or 1); added 8-bit alpha - support to icon_t and mystyles; fixed bugs in MyStyles cloning of - mask; added twm rubberband; fixed Audio (see AS ML) - -2002-07-20 sasha - - * added some functions for export of alpha channel into 8 bit - pixmap and back - -2002-07-16 sasha - - * Parameter check bugfix in marge_layers in libAfterImage; Rewrote - WinList layout, to do it two steps - -2002-06-24 allanon - - * o re-ordered a bit of code so that the width and height - attributes of - could use variables defined by children of the tag - -2002-05-24 sasha - - * compilation warning - -2002-05-22 allanon - - * o added support for multi-bit-depth displays like those found on - Solaris - boxes: 8bpp root window, with 24bpp possible to afterstep; - note that - asetroot still does not support this situation, so - transparency modes - do not work - o moved around audit.h includes to allow AS to be compiled with - --enable-audit again - -2002-05-18 sasha - - * added configure option to enable reusing loaded font by modules - (old way) - -2002-04-25 sasha - - * cleaned up headers and fixed Makefiles - -2002-04-23 sasha - - * Fixed Pager to use correct color parsing; Added ARGB2PIXEL - converters for pseudo-color modes; Removed GCs from Wharf - -2002-04-21 sasha - - * fixed Wharf to (hopefully) work with libAfterImage. Fixed several - minor bugs in libAfterImage - -2002-04-19 sasha - - * more wharf work. Added xpm_data2ASImage() - -2002-04-17 sasha - - * fixed bug in ASImage->XImage conversion where back_color was not - properly padding scanlines - -2002-04-16 sasha - - * slightly improved logic of gradient drawing to account for - completely messed up offsets - -2002-04-15 sasha - - * synced with as-devel/libAfterImage - -2002-04-13 sasha - - * Reimplemented MyStyles using libAfterImage - include ssome - changes to MyStyle data structure. Tinting now works both ways - - darkens and lightens. all 15 blending methods should work now. - half of the modules needs fixing to compile - -2002-04-09 sasha - - * Syncronized with devel tree - xml vars, stdout image export - -2002-04-03 allanon - - * Added variables to the XML image parsing. - -2002-04-03 sasha - - * Added self diag code. Fixed bug in libAfterImage where Mask was - incorrectly exported into ximage - -2002-03-28 sasha - - * fixed libAfterWidegt to get asclook to compile again - * Completed pixmap manipulation functions port from old - libafterimage - -2002-03-27 sasha - - * compile warnings - * Alpha portability fixes - * portability fixes - -2002-03-26 sasha - - * fixed lousy bug in tiling code where data was coming out - randomly - -2002-03-23 sasha - - * almost done with pixmap.c - -2002-03-19 sasha - - * implemented draw_unicode_text and draw_utf8_text and - get_text_size for those as well - * minor tweaks to asvector.c - -2002-03-17 sasha - - * Locale support for TTF fonts mostly completed - need to add - draw_text_unicode and draw_text_utf8 - -2002-03-15 sasha - - * right smack in the middle of unicode debugging, loosing bloody - glyphs somewhere :( - -2002-03-12 sasha - - * hopefully completed locale string parsing - -2002-03-11 sasha - - * adding decoder for locale names - -2002-03-10 sasha - - * Implemented large portion of locale/unicode support in text - drawing - -2002-03-09 sasha - - * completed implementing char to unicode conversion - -2002-03-08 sasha - - * added test container for vector draving - -2002-03-02 allanon - - * o fixed segfault when no valid image is generated at all - o xml_print() now indents xml so it's more readable - -2002-03-02 sasha - - * fixed missing argument in query_screen_visual macro - -2002-03-01 sasha - - * implemented 8-bit mask output into XImage and reverse mask - decoding into alpha channel from attached mask XImage - -2002-02-26 sasha - - * done with ximage tiling code, now we can use XImages instead of - encoded ARGB data - -2002-02-22 sasha - - * made possible to use XImage data directly for other - transformations - need to complete scanline tiling code and add - trigger disabling DATA_UNUSABLE flag - -2002-02-21 sasha - - * started adding decoding capabilities for ASImages that only has - XImage/ARGB data - * added colormap parameter to create_asvisual_from_id, so that - custom created colormap could be passed for libAfterImage to use - from calling app. - -2002-02-20 sasha - - * minor portability fixes - -2002-02-19 sasha - - * Added xml2ASImage input filter. Changed gradient drawing code to - not assume ascending order of offsets. - -2002-02-18 sasha - - * converted ascompose to use xml code from asimagexml.c and did - some cursory debuggin - -2002-02-16 sasha - - * completed asimagexml - now to convert ascompose to use it and do - some funky debuggin for meory corruption/leaks and other features - :) - -2002-02-12 sasha - - * mostly done with asimagexml refactoring - -2002-02-11 sasha - - * added asimagexml - input filter that allows to perform complex - transformation on image transparently for the app and based on - supplied XML file. - -2002-02-05 sasha - - * fixed vector->RGB generation to treat vector data as if it was - from bottom to top, instead - -2002-01-17 sasha - - * Fixed bug in ascompose where command line argument could be - freed. Fixed bug where wrong destruction function has been used - in image hash in ascompose. - * Fixed segfault when opening XPMs with greater then 256 colors. - Hopefully satisfied stupid gcc 3.0.3 when it stumbles upon - printf() with ifdefs inside. - -2002-01-15 sasha - - * Updated ChangeLogs - * updated docs - * updated deps and configure scripts - * Upped version number for libAfterImage and libAfterBase - -2002-01-14 sasha - - * added missing AS_HASHABLE and show_progress - * added missing show_debug into afterbase.c/.h - * Completed portability fixing of the day - * Removed unneeded debug code - * Fixed embarrasing bug in MAX macro - it really worked the same as - MIN :) *GRRRRR* - * debugging on 64bit big emdian machine - * XParseGeometry requires unsigned int* - * Added mandatory libm , since we now need exp() from gaussian - blurr - * XParseGeometry expects pointers to unsigned int - * DOS format somehow creeped in :( - * datatype portability issues - * __FUNCTION__ macro portability issues - * Hopefully bomb-proof freetype detection - * prototyped ASCommManager - for the generic even/input loop - handling - -2002-01-10 sasha - - * Updated ChnageLogs for libAfterImage and libAfterBase - * Fixed bug in bevel drawing where right solid line would not be - drawn - * added XGCValues to xwrap code - * updated libs configure script with new version and correct - help/options - * Fixed makefile to install ascompose man page into correct - location, since it is an app it should go into man1 - * updated man pages - -2002-01-09 sasha - - * Completed documenting libAfterImage's latest additions. - -2002-01-08 sasha - - * Completed documenting ascompose.c Regenerated .HTML docs - -2002-01-07 sasha - - * done with about 50% of ascompose documentation. - -2001-12-31 sasha - - * Fixed HSV and HLS colorspaces to correctly assign meaningfull HUE - values with straight mapping onto 360 degree colorcircle with red - being 0, green 120 and blue 240 degrees. Fixed - adjust_asimage_hsv to correctly translate degrees. debugged - tag in ascompose. Added ARGB32_RED16 macro and the likes. - * added HSV transformation - -2001-12-28 sasha - - * Fixed alpha handling in allanon and add methods of blender.c - Fixed minor bugs in ascompose related to clip_height handling in - composite tag. - -2001-12-27 sasha - - * greateluy improved ascompose fixed bug when colormap had 128 - entries in gif transparency - -2001-12-26 sasha - - * Added compress, replace and delay attributes to save tag in - ascompose. - -2001-12-25 sasha - - * debugged GIF and XPM transparency - -2001-12-24 sasha - - * Fixed bug in PNG with alpha writing, where alpha channel could - get lost. Fixed bug in Gif reading where extensions where lost. - Updated ascompose to use show_progress/error instead of plain - printf fixed libAfterBase to compile - -2001-12-14 sasha - - * Lots of fixes for session handling, look/feel loading and - non-default-visual handling - * Fixed visual detection code to not create new Colormap when - Default Visual is in use. - * Fixed Visual Autodetection code to correctly create windows for - visuals other then default visual. - -2001-12-12 sasha - - * Added ability to specify preferred Visual ID via env. variable - AFTERIMAGE_VISUAL_ID - -2001-12-07 sasha - - * When scale_asimage is called with quality set to POOR it will not - interpolate pixels, but merely duplicate existing ones. When - scaling down is perfomed it will it will keep averaging pixels - values nevertheless. Added tiling_range to ASImageOutput to - allow filling of portion of the image with the same scanline. - Fixed bug in enlarging algorithm causing corruption of the image - near the right edge. - -2001-12-06 sasha - - * Fixed minor compilation problems reported by Reiner Rohlfs. - * added ARGB2pixel conversion for 16/15bpp; Fixed bug where root - position of window was not updated on move - -2001-12-05 sasha - - * Fixed bugs in merge_asimage and bevel drawing causing segfaults - and wrong images when negative destination is used. - * fixed bug in merge_aslayers that was not traversing layers list - correctly - -2001-12-04 sasha - - * continued debugging of image rendering with varying dest position - in layers - -2001-12-03 sasha - - * Removed unneeded ASVisual arg from clone_asimage. - * Completed rewriting bevel rendering. It should now correctly trim - bevel when requested to do so. - -2001-11-30 sasha - - * More rendering/look debugging. Fixed Titlebuttons handling. - Started rewriting bevel drawing to enable drawing of bevel on - clipped images when some parts of the bevel maybe outside of the - clip rectangle. - -2001-11-29 sasha - - * Extensive debugging of new rendering code. - -2001-11-28 sasha - - * Implemented actiuall dubblebuffered drawing. Fixed all the - compile time bug - need to get asclook to actually draw - something. - -2001-11-25 sasha - - * Added check for correct libPNG - -2001-11-20 sasha - - * Added desktop layout to ornaments - incomplete - * ByteOrder debugging - fixed misaligned green channel in ASImage-> - XImage conversion in MSBFirst != BigEndian configuration - * ByteOrder debugging - * portability and compilation fixes - -2001-11-15 sasha - - * Debugged Vector data drawing code and added optimizations for - repetitive data. - -2001-11-14 sasha - - * Added new fixes from Fons Rademaker Implemented ASImage support - for data in vector of doubles with additional pallette to - translate into real ARGB. - * added automated check for MMX support to libAfterImage - -2001-11-02 sasha - - * Applied next batch of diffs from Fons Rademakers. Fixed several - cuel bugs in libAfterWidget, causing memory corruption. Changed - ASHashableValue to be simply unsigned long - for portability. - -2001-10-26 sasha - - * moved widget event handling into widgetevent.c/.h - * Added patches for compilation into C++ proggrams ( contributed by - Fons Rademakers) Implemented export filter into TIFF. Hopefully - fixed library order when compiling apps from libAfterImage - -2001-10-22 sasha - - * Added viewport changing functionality - -2001-10-12 sasha - - * Moved per-desktop look/feel management into session.c. Made - asclook compile and debugged libAfterImage's use of AS_ASSERT. - -2001-10-10 sasha - - * Added missing string_destroy into afterbase.c - * Added missing remove_hash_item into afterbase.c - * Fixed Makefile to work without libAfterBase - * Updated ChangeLogs - * completed update of the documentation for libAfterImage - * updated documentation and deps - * Fixed configure script to be able to compile libAfterImage and - libAfterBase at once - -2001-10-09 sasha - - * Updated most of the libAfterImage inline documentation. ascmap.h - is left to do. - -2001-10-01 sasha - - * completed updating libAfterImage to work with no X display; - cleaned up in preparation for release - -2001-09-28 sasha - - * Updated e-mail address - -2001-09-26 sasha - - * synchin - -2001-09-14 sasha - - * debugged ascp to the degree that all the panels are shown - correctly - -2001-09-13 sasha - - * Added visibility to newly created basic widgets. Upgraded to - typesafe MIN/MAX using prototype from the LInux kernel. Fixed - libAfterImage to do type-safe MIN/MAX. - -2001-09-05 allanon - - * o (ascompose) fixed segfault when free()'ing xml tree - -2001-09-04 allanon - - * o (libAfterImage) added blur_asimage_gauss() to do a gaussian - blur; this - function currently only supports horizontal blurs - o (ascompose) added as an undocumented feature, for - testing only - -2001-09-01 sasha - - * moved ascp into libAfterConf and begun work on getting it fixed - for recent changes to libAfterSTep/Image. Fixed main.c and lib.c - -2001-08-30 sasha - - * Fixed Transparency in asrender - several bugs in mytexture.c that - was. Added MyBackground and DeskBack to look configuration. - added release_asimage_by_name to asimage.c - * added cvsignore to libAfterImage/apps - * Implemented AS customized geometry parsing function; Added stub - for XParseGeometry; Fixe astile and asscale to compile without X - -2001-08-29 sasha - - * Rewrote window hierarchy handling in asrender, and started - implementing transparency handling - * further configure, Makefile and code cleanup to get it to compile - without X - -2001-08-28 sasha - - * Fixed numerous bugs in libAfterImage of various severity. Got - asclook to render default look correctly. - -2001-08-28 allanon - - * o (ascompose) finalized and documented inherited attributes of - : - crefid, x, y, and tint - o (ascompose) added support for compiling --without-x - o (ascompose) new command-line option --root-window; when given, - the - final result image of ascompose will be drawn to the root - window - instead of a new window - * o (ascompose) started adding support for --without-x - o (ascompose) changed the default text spacing to 3; this needs - to be - an option instead - -2001-08-27 sasha - - * fixed freetype detection - * freetype compilation fixes - * fixed magic number usage in ASImage - -2001-08-26 sasha - - * improved configure scripts for libAfterImage to automagically - mkae/install apps - -2001-08-25 sasha - - * fixed asrender and asclook to actually render default look - properly and not segfault in pad_asimage - * fixed ability to load several TRuyeType fonts with different - point size - * added vert and horizontal spacing for fonts; Added ability to - load several TRuyeType fonts with different point size - -2001-08-25 allanon - - * o (ascompose) fixed x,y handling for ; yes, i know i - still - haven't documented them - they're obviously not ready yet :) - -2001-08-22 sasha - - * completed library configure cleanup - adding aslook subdir - -2001-08-20 sasha - - * fixed nasty bug where if dst_x = 0 - and top image is smaller - then bottom one - merge_layer generates garbadge - -2001-08-20 allanon - - * o (ascompose) added documentation for to README - o (ascompose) added "srcx" and "srcy" to - -2001-08-20 sasha - - * Added image cloning/padding functionality to libAfterImage - -2001-08-18 sasha - - * Implemented layer allowing libAfterBase and libAfterImage to work - even without X - -2001-08-17 sasha - - * Added code for Buttons, Icons and empty items to asrennderer. - Fixed bugs in image referencing using ImageManager. Added - render_pad_align_image. - -2001-08-16 sasha - - * Fixed utterly ugly bug in image decompression code where first - position in channel data get corrupted with the data from - adjusten channels. Fixe mytexture tile generation to simply set - image's background to back_color. Added copy_asimage_channel - * Moved back_color into ASImage to maintain image consistency - between subsequent decodings and encodings. Changed back_color - to solid_color in ASImageLayer, to use it only when image is - NULL. Updated everything accordingly. Changed asimage2ximage to - restore missing scanlines based on image's back_color. - * updated ascompose to use init_image_layer for layer - initialization - it was missing back_color to be set to default. - Updated init_image_layer accordingly - -2001-08-15 sasha - - * [no log message] - -2001-08-15 allanon - - * o (ascompose) made attrib "op" optional - o (ascompose) added "merge" to - o (ascompose) added "keep-transparency" to - o (ascompose) added "refid" to all of the options that support - width - and height options - o (ascompose) made attrib "width" and "height" optional - o (ascompose) added new tag and documentation to README - o (ascompose) added new tag and documentation to README - o (ascompose) added new tag and documentation to README - o (ascompose) now uses refcounts to deallocate images when - possible - -2001-08-14 sasha - - * Fixed corners drawing while drawing the inline of the bevel. - Fixed ImageDecoder to allow for im meber to be NULL, but - back_color - not 0 Improved merge_layers to only merge portions - of scanlines that overlap - without padding top scanline. Updated - all blenders accordingly. - * added bevel with solid inlines; Fixed gradiented bevel drawing on - very large distances; updated deps - -2001-08-13 sasha - - * Implemented create/init_image_layers Implemented AddLabel in - asrenderer Fixed mystyle_draw_text - -2001-08-10 sasha - - * added sanity checks to bevel parameter. Need to fix bevel - increment calculations for inline. - -2001-08-10 allanon - - * o sync commit so sasha can see a problem with - -2001-08-10 sasha - - * Split asimage.c into 3 files - asimage.c, transform.c and - ximage.c, with asimage.h being split up accordingly. Fixed bug - in create_asimage code to check for validity of compression - parameter. Fixed introduced bug in merge_layers where we forgot - to skip first layer in the main loop. - -2001-08-09 sasha - - * Mostly implemented window background rendering and layers merging - in asrender code. - -2001-08-08 sasha - - * Changed license of libAfterBase and libAfterImage to LGPL - -2001-08-08 allanon - - * o (ascompose) reordered usage message to be alphabetical - o (ascompose) upped version to 1.2 - o (ascompose) added automagical output format detection based on - extension - o (ascompose) added id parameters to all xml tags - o (ascompose) added and xml tags, and docs to - README - -2001-08-07 sasha - - * Updated ascompose with ability to save images into any supported - file format(kowalski) Also added ability to write out image - without displaying it first. - * Fixed bug found by k0walski where file export filters would - return False even if save was successful. - * Updated MyTexture, MyLook and MyStyle to use libAfterImage. - Rewrote session management a bit for saner look/feel management. - Added CursorManager code. Added asclook app to libAfterConf to - provide for preview of arbitrary looks. Fixed several bugs in - Image loading code. - -2001-07-26 sasha - - * Finally brought giflib to its knees by implementing lots of - cludges to work around its bugs. Thank god gif's colormap is - stored uncompressed! Now libAfterImage can both read and write - multiimage gif files. HipHip Hooray! - -2001-07-25 sasha - - * playing cat and mouse with giflib bugs - and there are plenty of - those. We'll need to move portions of it into libAfterImage to - ease the pain. - * Minor cleanup in gif writer - -2001-07-24 sasha - - * no message - * fixed several bugs in colormap generation, and implemented gif - output filter ( sort of ) - -2001-07-23 sasha - - * completed colormapping code allowing for different degrees of - dithering - -2001-07-22 sasha - - * polished colormap calculation quite a bit and made it to allocate - just the right amount of colors by adding more passes - -2001-07-20 sasha - - * completed implementation of quantization and colormapping of - images. Debugged, but still can be optimized for speed. - -2001-07-19 sasha - - * Implemented some experimetal code to create colormapped images - and allow for dithering and optimum color selection. - -2001-07-17 sasha - - * Rewrote MyLook from config generation . Updated MyStyles to use - ASImages and ASFonts - -2001-07-16 sasha - - * Added image reference to libAfterImage Fixed font dereferencing ( - see release_font() ). Started implementation of libAfterImage - interface in libAfterStep. - -2001-07-13 sasha - - * Added get_drawable_size to afterbase.c (damn allanon :) Added - define for mystrcmp Added check for libAfterBase presence before - setting output threshold in asmerge - * Fixed clobbered variable in export.c; Fixed missing - SHOW/START_TIME in afterbase.h.in Added MMX notice to README's. - * Updated docs to reflect recent API changes - * Upped library version to 0.81 - * Fixed libAfterImage to compile nicely when libAfterBase is not - available - -2001-07-13 allanon - - * o added xml tag to ascompose, and documentation in - README - -2001-07-13 sasha - - * added mirroring capability to asflip - -2001-07-12 sasha - - * Implemented mirror_asimage() for image mirroring (as you could - have guessed :) - -2001-07-12 allanon - - * o added xml tag to ascompose, and documentation to - README - o added xml tag to ascompose, and documentation to - README - o added test.xml, which contains the xml used during testing - -2001-07-12 sasha - - * fixed compile bug in ASImage2gif - * Added templaites for image export filters. Implemented RGB and - greyscale JPEG image writing. Implemented RGB and greyscale PNG - image writing with or without alpha channel. Added usefull - SHOW_TIME and START_TIME macros to libAfterBase - -2001-07-11 sasha - - * disabled doc.html generation on make install - that was stupid to - try and do that. - * Added final astext tutorial comments. Reupdated documentation. - * final fix to installation and Makefiles - -2001-07-11 allanon - - * added ascompose, an XML-based image composition tool - -2001-07-11 sasha - - * added afterimag.h to incs - * fixed headers locating in /usr/local/include - * fixed installation of afterimage-libs script - * fixed standalon configure run - * fixed doc installation in Makefile - * updated Makefile to install include files as well - * fixed configure in libAfterImage to have separate enablers for - static and shared libs - -2001-07-10 sasha - - * Updated documentation abit to refelect recent code changes and - make it easier to link from main index page. - * fixed bug in xpm parser where spaces would get treated - incorrectlt in colormap; added READMEs; - -2001-07-09 sasha - - * Added functionality to move_asimage_channel to be able to move to - arbitrary channels from arbitrary channels. Added documenting - comments to astext.c and fixed text layout abit. - * Fixed parse_argb_color. Added options to astile and asflip for - easier operation. Fixed asgrad to treat gradient type well, if - gradient is not specified. Added few more points to asgrad - sample gradient to create better illusion of the rainbow. - * Added report of the scale factor to asscale - * Changed astile to tile to twice the size of the image - * Fixed bug in 3D text rendering causing us to skip scanline - inbetween lines of text. Added sample image rose512.jpg, and - TTF font: test.ttf. Added nice defaults to all the sample apps, - so that ppl can see libAfterImage in its full beauty. - * Adde Usage to all the examples. Fixed segfault in asscale. Added - error message on image file not found. Added texturized text - sample images. - -2001-07-08 sasha - - * fixed parse_argb_color to check for dpy not being NULL - to avoid - segfaults, babe - * added usage display to asflip and asgrad and fixed some other - places where parse_argb_color would be called prior to dpy - initialized - * added clocking to draw_text; added usage and more sophisticated - usage to astext - -2001-07-07 sasha - - * fixed 3D drawing and implemented all 6 modes - -2001-07-06 sasha - - * fixed glyph compression again; Started implementing 3D text. - * Fixed bug in asimage.c where fake_im was not initialized; - Corrected glyph compression code - * asfont fixin - * fixed layers merging to correctly draw the background layer when - image is missing; Fixed spacing calculations, while drawing text - -2001-07-05 sasha - - * Temporarily plugged bug in layer merging descovered by allanon, - when bottommost layer does not have any image in it. - * Reimplemented image output to allow for flexible support for many - image formats - right now it could be ASImage itself, XImage, - mask XImage and ARGB32. Surprisingly that simplified code quite - abit. Fixed ugly bug in create_asimage. Completed and debugged - astext tutorial. - * fixed text size calculations; fixed (almost) bevel drawing - - need to think about what to do with clip_width/height in Layer - specs - -2001-07-04 sasha - - * fixed lots of bugs in glyph compressing and rendering, still - something is wrong with size calculation func. Added - move_asimage_channel to swap channels on images - -2001-07-03 sasha - - * implemented astext properly - * implemented asgrad, asflip and astext. Althou astext still needs - some work. - * added prototypes for asflip, asgrad and astext - examples/tutorials/testapps to the libAfterIMage suit - -2001-07-02 sasha - - * Completed ASMerge implementation. Used it to debug all the - merging routines. Everything works perfect now. Added - doc/html/asmerge.html - another tutorial. Added - list_scanline_merging function to blender.c so that we can show - descriptions on different merging methods. - * Added ASMerge example, and added translator from function name to - function for scanline merging/blending. - -2001-06-29 sasha - - * Added ASScale and ASTile examples with documentation and stuff. - Fixed bug in asimage.c causing artifacts when image is tiled with - TOP quality. cleabed up cvsignore in include/ - * fixed and simplified configure script for examples to - libAfterImage. Have a good day :) - -2001-06-28 sasha - - * Added documenting comments to asview.c so it generates nice - little Tutorial as the result. Added lots of X functions to xref - files, so now all the source code is very nicely crossreferenced. - Added references to asview to other headers etc. - -2001-06-27 sasha - - * Completed documenting asfont.h Added afterimage.h with library - overview got rid of old doc files added freetype and X11 xrefs so - that docs are nicely crosslinked with X docs - -2001-06-26 sasha - - * asfont.h documentation 50% done - * added Makefile targets fopr autogeneration of documentation in - man and HTML formats. Added installation procedure for those. - -2001-06-25 sasha - - * Documented blender.h and import.h - asfont.h to go. Also it - sound like a good idea to add afterimage.h with overview notes - about libAfterImage and references to components. - -2001-06-24 sasha - - * completed fixing libraries includes - * rewrote libraries includes generation; fixed freetype checking to - skip old garbadge left over in X11R6 dir - -2001-06-22 sasha - - * Completed documenting asimage.h and asvisual.h. asfont.h and - import.h to go - * fixed libAfterImage include to always use -I gcc flag - -2001-06-21 sasha - - * MOre documentation writing - ASImage.h is almost done. - -2001-06-21 owsla - - * added stop_image_output() to asimage2mask_ximage() - -2001-06-21 sasha - - * got asview to compile cleanly and find all the relevant - libraries - need to think about simplifying configure scripts and - headers there - -2001-06-20 owsla - - * plugged a mem leak, asimage2ximage() wasn't doing - stop_image_output() on it's ASImageOutput struct - -2001-06-20 sasha - - * asimage.html and asimage.man updates - * Implemented proper generation of mask XImage (1bpp) - -2001-06-19 sasha - - * more doc - * Implemented ARGB->pixel conversion for 32 and 24 bit True color - visual Fixed parse_argb_color to correctly treat 12 digit color - value as 48bit RGB. More libAfterImage documenting - * Fixed bug in find_file preventing it from finding files when not - NULL search path is specified. Fixed bug in asimage2pixmap - causing it to use wrong gc variable. Added more documentation to - asimage.h and respectively to asimage.html - -2001-06-18 sasha - - * Added lots of self documenting comments to - libAfterImage/asimage.h to allow for automagic documentation - generation using robodoc package. Seems to be the only package - that works decently. - -2001-06-17 sasha - - * started implementing sample repository of example libAfterImage - apps - -2001-06-15 sasha - - * Added prototypes of the man pages for libAfterImage - -2001-06-14 sasha - - * added MMX enabling switch to libAfterImage configure - * Completed Pseudo-color support with colormap allocation and - ximage handling. Added create_asimage and destroy_asimage for - convinience. Added missing stuff to libAfterImage/afterbase.h to - make it completely independent. libAfterImage thus should be - ready for release - only to write up some docs :) - -2001-06-13 sasha - - * completed flip-flopping code. Added show_debug to show_* series - in libAfterBase/output.c started working on collor allocation on - PseudoColor visuals - -2001-06-12 sasha - - * completed implementation of image alpha beveling. completed - implementation of image flipping - need some cleanup thou to - allow for tiling. - -2001-06-11 sasha - - * fixed configure to produce correct dependencies - * no message - * Hopefully fixed memory allocations audit on libAfterBase. - * Added ASImageBevel to allow for transparent bevelling of images - while merging layers. Hopefully fixed X libs in configure script - - need to rerun autoconf - * added configclean target to the top level makefile; fixed - libraries makefiles to correctly generate .depend files - * fixed configure scripts to not do extra checks when invoked from - one another - -2001-06-10 owsla - - * updated .cvsignore files - -2001-06-10 sasha - - * got rid of old image loading stuff. LoadImageWithMask moved into - resources.h and is now simple shortcut to libAfterImage loader - -2001-06-09 sasha - - * made test to compile; Fixed several bugs in libAfterImage; - optimized 2bpp handling in xpm code; builtin xpm handler is about - 2 times as fast as libXpm on small images and 5 times on larger - ones - -2001-06-08 sasha - - * configure fixes - * updated configure scripts - * further progress - src/test compiles now, but need to redo - libAfterImage/configure - * fixed compilation bug in import.c - * rebuilt configure scripts - * updated configure scripts to reflect addition of the xpm parsing - code - * Completed custom xpm implementation. Needs to be debugged thou. - * hopefully fixed main configure script to gracefully handle - libraries configuration as well. MOved configure.h and some other - headers into include dir, so it could be used by modules - -2001-06-07 sasha - - * Fixed MyName requests in selfdiag.c; Added xpm.c to implement - custom xpm handling code - appears to be rather simple and - effective. Most of the things are implemented, except for top - level routine. - * cleaned configure script for libafterimage. added afterimage-libs - script to print list of LD_FLAGS for linking with libafterimage - -2001-06-06 sasha - - * fixed bug found by allanon when asimage2ximage would produce - black ximage due to unset flags in scanline - -2001-06-04 owsla - - * updated configure - * updated the .cvsignore files - -2001-06-04 sasha - - * fixed bug in configure --with-jpeg - * added missing .depend - * sorted out compilation problems, and test now builds with new - libAfterImage - -2001-06-03 sasha - - * got libAfterImage to compile - -2001-06-02 sasha - - * hopefully resolved libAfterImage dependancy on libAfterBase - -2001-06-01 sasha - - * separated libAfterImage files from the rest of the crowd - * started up libAfterImage - -2001-05-30 sasha - - * Prototyped ASRenderer interface - * completed fixing old lib files to compensate for file relocation. - There needs to be something done to Mkaefiles and configure to - correctly set up include paths and libraries. - -2001-05-28 sasha - - * Split ASVisual from ScreenInfo and rearranged ARGB32. Added - ASGradient to asimage.h and made gradient_t to be a synonym to - it. That should allow for better library independancy - visual - will go with libAfterImage while ScreenInfo will move into - libAfterStep , or, possibly will split up even more. Goal is to - make libAfterImage completely independent from everything else. - -2001-05-23 allanon - - * Updated FSF snail mail address. - -2001-05-12 sasha - - * added code to check for valid channels while flipping - -2001-05-10 sasha - - * Completed gradients drawing code. Started on flipping code. - Added direction reverse to output method. - -2001-05-09 sasha - - * Implemented vertical gradient drawing. sorted out relationship - between channel numbering and ARGB32 component order - its the - same now. - * fixed mono line encoding to add zero terminator at the end; fixed - scanline back_color initialization to have alpha at 0xFF; fixed - decoration layouting to not use stack memory in linked list; - fixed property event handler to initialize variable to NULL; - Afterstep now starts , althou does not do anything usefull - -2001-05-08 sasha - - * coded gradients drawing using ASImages with smoothing and - dithering - works very blasted fast. Fixed numerous include's - issues - -2001-05-07 sasha - - * fixed create_screen_window for InputOnly windows fixed bug in - screen initialization where Colormap ID would get lost fixed bug - in desktop creation code where desktop->scr would never get - initialized. Added show_progress function to work similarly to - show_warning/error Rearranged thresholds for output verbosity - Added stdargs.h to import.c - suggested by Sean Dague - -2001-05-04 sasha - - * completed ASFont implementation as needed at the moment - there - will need to be some work done in order to adapt it to locale - support.( as well as in several other places). changed glyph - compression algorithm once again to run length encode only 0s and - FFs, and store rest in raw format. That allows to cut down on - memory since we don't use 2 bytes anymore. 3 step antialiasing - works now. Off to image rotation and gradient drawing. - -2001-05-03 sasha - - * Improved glyph compression algorithm so now it actually reduces - size, even on ery small fonts. Tryed to implement additional - glyph smoothing, but something is wrong - disabled for now. - -2001-05-02 sasha - - * fixed font drawing to group glyphs as close together as possible - - make for much nicer effect. - * debugged X11 fonts loading and drawing. Still need to do - something about negative left bearings - ought to really offset a - pen to overlap charcters - -2001-05-01 sasha - - * Implemented antialiasing for native X fonts - still needs some - debuggin. - -2001-04-30 sasha - - * added RLE compression to the font glyph cache. added character - range specification for the font. added right-to-left writing - order on per font basis. - -2001-04-27 sasha - - * implemented text drawing using precached TTF fonts -- needs - addition of locale support in future. Fixed image merging to do - clipping correctly. Added image background color - * fixed freetype headers problems and a bug in font hashing - -2001-04-26 sasha - - * started implementing font manager and freetype support - -2001-04-25 sasha - - * moved scanline merging functions into separate file - * fixed most blending function so not to tresspass alpha channel - boundaries. Added tint_scanlines and implemented dissipation - * fixed bug in image loading where piexls would get shifted by one - to the right. added 14 image blending functions - almost - matching that of the GIMP's capabilities, except for multiply and - divide modes, which I don't see much sense in. Added - RGB->HSV->RGB and RGB->HLS->RGB conversion functions. - -2001-04-24 sasha - - * cleaned up output/encoding functionality. Added quality - parameters to dynamically adjust quality on per image basis. - Implemented alpha blending and generic layer merging framework. - -2001-04-23 sasha - - * debugged tiling functionality and optimized it so not to do - repeated compression on the same data. Added compression ratio - specification on per image basis. OPtimized buffer copy to use - 32bit data transfer. Implemented tinting( as a part of tiling - process ). - * debugging tiler - -2001-04-22 sasha - - * added tile_image() - needs debugging - * ASImageDecoder - -2001-04-20 sasha - - * added TIFF import and implemented generic image loading function - with search capabilities and subimage loading. Fixed two more - bugs in image scaling. - * added GIF import filter; added configure code to detect gif and - tiff libraries - -2001-04-19 sasha - - * .CUR is the same as .ICO only type = 2 - * Added support for .PNM, .PPM, .ICO, .BMP image file formats - - TIFF and GIF to go - -2001-04-18 sasha - - * xcf image loading now works, but only gets you first layer with - the same size as whole image. Need to implement layers merging - for ASImages to get complete support for GIMP's xcf files - * fixed bug in xcf channel loading - theer are no such thing as - channel type - -2001-04-17 sasha - - * most of the preparation work for xcf reading is done - now off to - actually create ASImage from it. added code to poupulate - ASScanline with 0's where data is not available; - -2001-04-16 sasha - - * minor quality tweaks in rations 1-2 scaling up. Started - implementing ASImageDecoder for automatic tinting/tiling - * IMplemented JPEG input filter for ASImage. Fixed long standing - bug in image scaling causing weirdness in scaling UP with small - ratios. Started implemntation of XCF file reader. - -2001-04-15 sasha - - * implemented png file reader and fixed blatant bug in scale image - up where first line got garbadge in it - -2001-04-13 sasha - - * compilation fixes - * Implemented xpm loading into asimage. Updated asimage to - correctly use ScreenInfo. implemented create_screen_pixmap and - create_screen_ximage - * fixed test abit to not spit lots of warnings - -2001-04-08 sasha - - * fixed bugs in scaling down code with ratio > 2; It appears that - you can create windows with different visual only if you create - new colormap and allocate border color from it as well. Fixed - screen.c accordingly. We keep black and white pixels and colormap - in ScreenInfo now - should use it instead of X macros - -2001-04-06 sasha - - * implemented workaround for some stupid X servers that denys you - your constitutional right to use whatever Visual you like. - * couple bugfixes for new visual handling code. moved - ximage->scanline->ximage code from asimage.c to screen.c still - need to implement PseudoClor handling - * hopefully fixed bug in 2x scaling up code - -2001-04-05 sasha - - * no message - * reworked ScreenInfo abit to include visual info. Added screen.c - to libafterstep to collect together all the Screen/display - related stuff - ConnectX, MyXErrorHandle, and several new things - : init_screen and destroy_screen. nolock_mods has been moved - outside of the ScreenInfo as it is per-display and not per-screen - stuff. all_screens global variable holds pointers to all - ScreenInfo structrures for available screens. Added - query_visual_info to try and obtain best possible visual for - AfterStep to use. Need to move ximage->as->ximage conversion - stuff into screen.c. ConnectX now takes only one parameter - - pointer to ScreenInfo is discontinued - * same old Ximage cleanup - -2001-04-04 sasha - - * asimage->ximage debugging again - this time about 50% performance - increase. - * more optimization to ximage output algorithm - that was the last - of it I'm sick and tired from this stuff - -2001-04-03 sasha - - * Some tweaks to XImage writing code to speed things up - we were - spending upto 30% of time writing XImages - unacceptable. - * fixed bug in line interpolation causing stripy artifacts in - scaling up - * mmx debugged - -2001-04-02 sasha - - * Added some MMX inline assembly to image scaling code to hopefully - make it faster - need to verify if that indeed is the case. - * aaa - -2001-04-01 sasha - - * scaling speed optimizations - -2001-03-31 sasha - - * debugged new scaling code - scale up is rather nice even with - huge ratio - check out src/test - -2001-03-30 sasha - - * Implemented complete scaling Up procedure for arbitrary ratio - - if it'll work then similar stuff will go for 1-2 and 2-3 ratios. - Added reshape_winlist to WinList to actually generate layout of - titlebars based on WinList data and store pointers to them in - appropriate place in WMDecor structures. It now needs to be - debugged as a prototype for other modules. - * debugged scaling down algorithm - it now works and scale things - down rather nicely. Thus we have a proof of concept and can - proceed on to scaling up - which is mopstly implemented already - -2001-03-29 sasha - - * completed implementation of scaling down of ASImages. Added - dithering capabilities to ASImage->XImage conversion to hopefully - produce better results on 16bpp and 15bpp Fixed bug in ASWinLIst - message processing to create WinList if it did not exist. Fixed - Bug in afterstep to initialize handlers in main window list to - correct functions. - * defined structure of high level scaling API - -2001-03-28 sasha - - * Added AS message reading/partiall handling to new WinList. Moved - get_window_* functions into aswinlist.c Changed the way - process_message is called - it now takes ASMessage * as a param. - Made everything compiling. - * some theory investigation into up scaling algorithms with - smoothing - -2001-03-27 sasha - - * the best variant of compression algorithm - average compression - ratio is about 75for highly random images(nature) and 30for - regular images (naked body, etc.); no off to more exciting things - -2001-03-26 sasha - - * no message - * fixed compression code - -2001-03-24 owsla - - * removed static keyword from libasimage_decode_line, this was - preventing it from being exported in the lib, which made the test - program fail - -2001-03-23 sasha - - * optimized asimage decompression algorithm scaling down algorithm - implemented/. - * extensive asimage debugging - compression now seems to work fine - -2001-03-22 sasha - - * Completed implementation of Pixmap->ASImage->Pixmap cycle Now off - to debugging and implementing of scaling/alpha-blending/etc. - -2000-12-12 sasha - - * libasimage has been renamed to libasGUI - -2000-09-17 sasha - - * make_indent - -2000-05-15 sasha - - * asImageFromXImageTest diff --git a/graf2d/asimage/src/libAfterImage/Makefile.in b/graf2d/asimage/src/libAfterImage/Makefile.in deleted file mode 100644 index 81588f200a407..0000000000000 --- a/graf2d/asimage/src/libAfterImage/Makefile.in +++ /dev/null @@ -1,406 +0,0 @@ -# -# Copyright (c) 2001, Sasha Vasko -# Copyright (c) 1998, Guylhem AZNAR -# - -subdirs = libjpeg libpng libungif zlib - -LIBJPEG_OBJS = libjpeg/jaricom.o libjpeg/jcarith.o libjpeg/jdarith.o \ - libjpeg/jcapimin.o libjpeg/jcapistd.o libjpeg/jccoefct.o \ - libjpeg/jccolor.o libjpeg/jcdctmgr.o libjpeg/jchuff.o \ - libjpeg/jcinit.o libjpeg/jcmainct.o libjpeg/jcmarker.o \ - libjpeg/jcmaster.o libjpeg/jcomapi.o libjpeg/jcparam.o \ - libjpeg/jcphuff.o libjpeg/jcprepct.o libjpeg/jcsample.o \ - libjpeg/jctrans.o libjpeg/jdapimin.o libjpeg/jdapistd.o \ - libjpeg/jdatadst.o libjpeg/jdatasrc.o libjpeg/jdcoefct.o \ - libjpeg/jdcolor.o libjpeg/jddctmgr.o libjpeg/jdhuff.o \ - libjpeg/jdinput.o libjpeg/jdmainct.o libjpeg/jdmarker.o \ - libjpeg/jdmaster.o libjpeg/jdmerge.o \ - libjpeg/jdpostct.o libjpeg/jdsample.o libjpeg/jdtrans.o \ - libjpeg/jerror.o libjpeg/jfdctflt.o libjpeg/jfdctfst.o \ - libjpeg/jfdctint.o libjpeg/jidctflt.o libjpeg/jidctfst.o \ - libjpeg/jidctint.o libjpeg/jquant1.o \ - libjpeg/jquant2.o libjpeg/jutils.o libjpeg/jmemmgr.o libjpeg/jmemnobs.o \ - libjpeg/transupp.o - -LIBPNG_OBJS = libpng/png.o libpng/pngset.o libpng/pngget.o libpng/pngrutil.o \ - libpng/pngtrans.o libpng/pngwutil.o libpng/pngread.o libpng/pngrio.o \ - libpng/pngwio.o libpng/pngwrite.o libpng/pngrtran.o \ - libpng/pngwtran.o libpng/pngmem.o libpng/pngerror.o \ - libpng/pngpread.o - -ZLIB_OBJS = zlib/adler32.o zlib/compress.o zlib/crc32.o \ - zlib/gzio.o zlib/uncompr.o zlib/deflate.o \ - zlib/trees.o zlib/zutil.o zlib/inflate.o \ - zlib/infback.o zlib/inftrees.o zlib/inffast.o - -LIBUNGIF_OBJS = libungif/dgif_lib.o libungif/egif_lib.o libungif/gifalloc.o \ - libungif/gif_err.o libungif/gif_hash.o - -AFTERIMAGE_OBJS= @AFTERBASE_C@ asimage.o ascmap.o asfont.o asstorage.o \ - asvisual.o blender.o bmp.o char2uni.o draw.o export.o imencdec.o import.o \ - scanline.o transform.o ungif.o xcf.o ximage.o xpm.o \ - afterrootpngwrite.o - -################################################################ -# library specifics : - -LIB_INCS= afterimage.h afterbase.h ascmap.h asfont.h asim_afterbase.h \ - asimage.h asstorage.h asvisual.h blender.h bmp.h char2uni.h \ - draw.h export.h imencdec.h import.h scanline.h transform.h ungif.h \ - xcf.h ximage.h xpm.h xwrap.h \ - afterrootpngwrite.h - -LIB_OBJS= @JPEG_OBJS@ @ZLIB_OBJS@ @PNG_OBJS@ @UNGIF_OBJS@ $(AFTERIMAGE_OBJS) - -APPS_SRCS=apps/common.c apps/ascompose.c apps/asview.c \ - apps/asscale.c apps/astile.c apps/asmerge.c \ - apps/asgrad.c apps/asflip.c apps/astext.c - -APPS_INCS=apps/common.h - -APPS_DEPS=@LIBPROG@ $(LIB_OBJS) $(LIB_INCS) $(APPS_SRCS) $(APPS_INCS) config.h - -# end specifics -################################################################ -# generic makefile stuff : - -LIB_DIR_NAME = libAfterImage -LIB_NAME = LIBAFTERIMAGE -LIB_STATIC = libAfterImage.a -LIB_SHARED = libAfterImage.so -LIB_SHARED_CYG = cygAfterImage.dll -LIB_SHARED_CYG_AR = libAfterImage.dll.a -LIBVER = 0.99 -LIBVERMAJOR = 0 - -CC = @CC@ -CCFLAGS = @CFLAGS@ @MMX_CFLAGS@ -# -march=pentiumpro -mcpu=pentiumpro -EXTRA_DEFINES = @DEFINE_XLOCALE@ - -RANLIB = @RANLIB@ -AR = ar cq -CP = @CP@ -MV = @MV@ -RM = @RM@ -RMF = @RM@ -f -MKDIR = @MKDIR@ -p -FIND = @FIND@ -XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ -ROBODOC = robodoc -LN_S = @LN_S@ - -YACC = @YACC@ -LEX = @LEX@ -YACCFLAGS = -d -LEXFLAGS = - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL@ -s -m 755 -INSTALL_DATA = @INSTALL@ -m 644 -INSTALL_HEADER = @INSTALL@ -m 644 -INSTALL_LIB = @INSTALL@ -m 755 -INSTALL_SCRIPT = @INSTALL@ -m 755 - -INCS_EXTRA = @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_CFLAGS@ @SVG_CFLAGS@ @TTF_INCLUDES@ -INCS_X = @X_CFLAGS@ -INCS_PRIVATE = -INCLUDES = $(INCS_EXTRA) $(INCS_PRIVATE) $(INCS_X) - -USER_LD_FLAGS = @user_ldflags@ -LIBS_X = @x_libs@ -LIBS_XEXTS = -LIBS_TEST = @AFTERIMAGE_TEST_LIBS@ -LIBS_AFTERIMAGE = @AFTERIMAGE_LIB_LIBS@ -LIBRARIES = $(LIBS_AFTERIMAGE) $(LIBS_X) $(LIBS_XEXTS) -LIBRARIES_TEST = $(LIBS_TEST) $(LIBS_X) $(LIBS_XEXTS) - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -LIBDIR = $(DESTDIR)@libdir@ -INCLUDEDIR = $(DESTDIR)@includedir@ -AFTER_INC_DIR = $(DESTDIR)@includedir@/$(LIB_DIR_NAME) -AFTER_BIN_DIR = $(DESTDIR)@bindir@ -AFTER_MAN_DIR = $(DESTDIR)@mandir@/man3 -AFTER_APP_MAN_DIR = $(DESTDIR)@mandir@/man1 -AFTER_SHAREDIR = $(DESTDIR)@datadir@/$(LIB_DIR_NAME) -AFTER_DOC_DIR = $(AFTER_SHAREDIR)/doc - -# We want to build both static and dynamic libs, as some service apps may need -# static library as they gets run at compile time (ASDocGen for example) -# but we only install whats selected -all: $(LIB_STATIC) @LIBPROG@ $(INSTALLONBUILD) apps - -install.bin: - -install.lib: @LIBPROG@ @LIBINSTALL@ install.inc - -mkdir: - @(if [ ! -d $(AFTER_BIN_DIR) ] ; then $(MKDIR) -p $(AFTER_BIN_DIR); fi; \ - if [ ! -d $(LIBDIR) ] ; then $(MKDIR) -p $(LIBDIR); fi \ - ) - -install.static: mkdir - $(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR) - @(if [ -d $(LIBDIR) ] && [ -w $(LIBDIR) ]; then \ - echo "$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR)"; \ - $(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR); \ - fi \ - ) - -install.script: - -install.dyn: mkdir - @( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \ - $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \ - $(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR); \ - $(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \ - $(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ - ) - -install.cyg: mkdir - @( echo "$(INSTALL_LIB) $(LIB_SHARED_CYG) $(AFTER_BIN_DIR)"; \ - $(INSTALL_LIB) $(LIB_SHARED_CYG) $(AFTER_BIN_DIR); \ - echo "$(INSTALL_LIB) $(LIB_SHARED_CYG) $(LIBDIR)"; \ - $(INSTALL_LIB) $(LIB_SHARED_CYG) $(LIBDIR); \ - echo "$(INSTALL_LIB) $(LIB_SHARED_CYG_AR) $(LIBDIR)"; \ - $(INSTALL_LIB) $(LIB_SHARED_CYG_AR) $(LIBDIR); \ - echo "$(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR)"; \ - $(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR); \ - ) - -install.inc: - @(if [ -d $(AFTER_INC_DIR) ]; then \ - echo "$(RM) $(AFTER_INC_DIR)/*"; \ - $(RM) $(AFTER_INC_DIR)/*; \ - else \ - if [ -d $(INCLUDEDIR) ]; then \ - echo "$(MKDIR) $(AFTER_INC_DIR)"; \ - if $(MKDIR) $(AFTER_INC_DIR); then \ - echo " ">/dev/null; \ - else \ - echo "failed to create include directory: $(AFTER_INC_DIR)"; \ - fi; \ - else \ - echo "$(MKDIR) $(INCLUDEDIR)"; \ - if $(MKDIR) $(INCLUDEDIR); then \ - echo "$(MKDIR) $(AFTER_INC_DIR)"; \ - if $(MKDIR) $(AFTER_INC_DIR) >/dev/null; then \ - echo " ">/dev/null; \ - else \ - echo "failed to create include directory: $(AFTER_INC_DIR)"; \ - fi; \ - else \ - echo "failed to create include directory: $(INCLUDEDIR)"; \ - fi; \ - fi; \ - fi; \ - if [ -d $(AFTER_INC_DIR) ]; then \ - echo "installing libAfterImage headers using command - "; \ - echo " \"$(INSTALL_HEADER)
$(AFTER_INC_DIR)\" :"; \ - for file in $(LIB_INCS) ; do \ - echo -n "$$file "; \ - $(INSTALL_HEADER) $$file $(AFTER_INC_DIR); \ - done; \ - echo ""; echo "Done."; \ - fi \ - ) - -install.apps: install.lib - @(if test -d apps; then cd apps; $(MAKE) install || exit 1; fi) - -# uninstallation targets : -# -STATIC_LIB_FILES=$(LIBDIR)/$(LIB_STATIC) -DYN_LIB_FILES=$(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) $(LIBDIR)/$(LIB_SHARED).$(LIBVER) -CYGWIN_LIB_FILES=$(AFTER_BIN_DIR)/$(LIB_SHARED_CYG) $(LIBDIR)/$(LIB_SHARED_CYG) $(LIBDIR)/$(LIB_SHARED_CYG_AR) - -uninstall.static: - @for i in $(STATIC_LIB_FILES); do \ - if [ -f $$i ] ; then echo $(RMF) $$i; $(RMF) $$i; fi; \ - done - -uninstall.dyn: - @for i in $(DYN_LIB_FILES); do \ - if [ -f $$i ] ; then echo $(RMF) $$i; $(RMF) $$i; fi; \ - done - -uninstall.cyg: - @for i in $(CYGWIN_LIB_FILES); do \ - if [ -f $$i ] ; then echo $(RMF) $$i; $(RMF) $$i; fi; \ - done - - -uninstall.inc: - @if [ -f $(AFTER_BIN_DIR)\$(CONFIG_SCRIPT) ] ; then \ - echo "$(RMF) $(AFTER_BIN_DIR)\$(CONFIG_SCRIPT)"; \ - $(RMF) $(AFTER_BIN_DIR)\$(CONFIG_SCRIPT); \ - fi; \ - if [ -d $(AFTER_INC_DIR) ]; then \ - echo "$(RMF) $(AFTER_INC_DIR)/*"; \ - $(RMF) $(AFTER_INC_DIR)/*; \ - fi; \ - if [ -d $(INCLUDEDIR)/$(LIB_DIR_NAME) ]; then \ - echo "$(RMF) $(INCLUDEDIR)/$(LIB_DIR_NAME)"; \ - $(RMF) $(INCLUDEDIR)/$(LIB_DIR_NAME); \ - fi - -uninstall.bin: - @for i in $(LIB_APPS); do \ - if [ -f $(AFTER_BIN_DIR)\$$i ] ; then echo $(RMF) $(AFTER_BIN_DIR)\$$i; $(RMF) $(AFTER_BIN_DIR)\$$i; fi; \ - done - -uninstall.apps: - @(if test -d apps; then cd apps; $(MAKE) uninstall || exit 1; fi) - -uninstall.lib: @LIBUNINSTALL@ uninstall.inc uninstall.apps - -uninstall.man: - -uninstall.script: - -clean: - $(RMF) $(LIB_SHARED) $(LIB_SHARED_CYG) $(LIB_SHARED_CYG_AR) $(LIB_STATIC) *.so.* *.so *.o *~ *% *.bak \#* core ; \ - for I in ${subdirs}; do $(RMF) $$I/*.o $$I/*.obj $$I/*.bak; done - @(if test -d apps; then cd apps; $(MAKE) clean || exit 1; fi) - -distclean: clean - $(RMF) $(LIB_SHARED) $(LIB_SHARED_CYG) $(LIB_SHARED_CYG_AR) $(LIB_STATIC) *.o *.so.* *~ *% *.bak \#* *.orig core Makefile - @(if test -d apps; then cd apps; $(MAKE) distclean || exit 1; fi) - -indent: - @SRCS=`echo "$(AFTERIMAGE_OBJS) " | sed "s/.o /.c /g"`; \ - if test "x$$SRCS" == "x"; then exit; fi; \ - for i in $$SRCS; do \ - if (indent -di14 -ts4 -i4 -l120 -lc80 -bad -nbbb -bli0 -c48 -cd48 -ce -cli1 -ncs -nbs -nbbo -hnl < $$i > /tmp/$$i); then \ - echo "indent $$i"; \ - mv /tmp/$$i $$i; \ - fi; \ - done ; \ - (if test -d apps; then cd apps; $(MAKE) indent || exit 1; fi ) - -deps: - @echo -n > .depend ; \ - buf="" ; \ - SRCS=`echo "$(AFTERIMAGE_OBJS) " | sed "s/.o /.c /g"`; \ - echo -n $(LIB_NAME)_OBJS = > .shared ; \ - for file in $$SRCS; do \ - echo " \\" >> .shared ; \ - echo -n ' $$('$(LIB_NAME)_PATH')'/$$file >> .shared ; \ - if test "x$$buf" != "x"; then \ - echo $$buf >>.depend ; \ - echo >>.depend ; \ - fi; \ - buf="./"`echo "$$file " | sed "s/.c /.o /g"`: ; \ - for d in `grep "#include \"" < $$file | awk -F \" '{print $$2}'`; do \ - if test "x$$buf" != "x"; then \ - echo $$buf \\ >>.depend ; \ - fi; \ - echo -n " " >>.depend ; \ - buf="$$d "; \ - done; \ - done; \ - if test "x$$buf" != "x"; then \ - echo $$buf >>.depend ; \ - fi; \ - echo "">> .shared ; \ - echo "">> .shared ; \ - echo -n $(LIB_NAME)_INCS = >> .shared ; \ - for f in $(LIB_INCS) config.h; do \ - echo " \\" >> .shared ; \ - echo -n ' $$('$(LIB_NAME)_PATH')'/$$f >> .shared ; \ - done; \ - echo "" >> .shared ; \ - (if test -d apps; then cd apps; $(MAKE) deps || exit 1; fi) - -apps: @APPSDEPS@ - @(if test -d apps; then cd apps; $(MAKE); fi ) - - -$(LIB_STATIC): $(LIB_OBJS) $(LIB_INCS) config.h - $(RMF) $(LIB_STATIC) - $(AR) $(LIB_STATIC) $(LIB_OBJS) - $(RANLIB) $(LIB_STATIC) - -test_asstorage.o: asstorage.c - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) -DTEST_ASSTORAGE $(INCLUDES) $(EXTRA_INCLUDES) -c asstorage.c -o test_asstorage.o - -test_asstorage: test_asstorage.o - $(CC) test_asstorage.o $(USER_LD_FLAGS) $(LIBRARIES_TEST) $(EXTRA_LIBRARIES) -o test_asstorage - -test_asdraw.o: draw.c - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) -DTEST_ASDRAW $(INCLUDES) $(EXTRA_INCLUDES) -c draw.c -o test_asdraw.o - -test_asdraw: test_asdraw.o - $(CC) test_asdraw.o $(USER_LD_FLAGS) $(LIBRARIES_TEST) $(EXTRA_LIBRARIES) -o test_asdraw - -test_mmx.o: test_mmx.c - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) -DTEST_ASDRAW $(INCLUDES) $(EXTRA_INCLUDES) -c test_mmx.c -o test_mmx.o - -test_mmx: test_mmx.o - $(CC) test_mmx.o $(USER_LD_FLAGS) $(LIBRARIES_TEST) $(EXTRA_LIBRARIES) -o test_mmx - - -.c.o: - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -o $@ - -.c.s: - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c - -# -# include dependency files if they exist -# -# this is merely a precaution, but as it does not work with ansi make -# we took it out -#ifneq ($(wildcard .depend),) -include .depend -#endif - -$(LIB_SHARED_CYG): $(LIB_OBJS) $(LIB_INCS) config.h - $(CC) -shared -o $(LIB_SHARED_CYG) \ - -Wl,--out-implib=$(LIB_SHARED_CYG_AR) \ - -Wl,--export-all-symbols -Wl,--enable-auto-import \ - -Wl,--whole-archive ${LIB_OBJS} \ - $(USER_LD_FLAGS) -Wl,--no-whole-archive $(LIBRARIES) - -$(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR) - $(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED) - -$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER) - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - -$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h - $(CC) -shared $(USER_LD_FLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(LIB_OBJS) $(LIBRARIES) - -install.man: - @if [ -d doc/man ] ; then \ - if [ ! -d $(AFTER_MAN_DIR) ] ; then $(MKDIR) -p $(AFTER_MAN_DIR); fi; \ - cd doc/man; \ - for f in `ls *.man`; do \ - page_name=`echo $$f| awk -F . '{print $$1}'`; \ - echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.3x; \ - $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.3x; \ - done; cd ../..; \ - fi - - -install.doc: - @if [ -d doc/html ] ; then \ - if [ ! -d $(AFTER_DOC_DIR)/html ] ; then $(MKDIR) -p $(AFTER_DOC_DIR)/html; fi; \ - cd doc/html; \ - for f in `ls *.html`; do \ - echo $(INSTALL_DATA) $$f $(AFTER_DOC_DIR)/html/$$f; \ - $(INSTALL_DATA) $$f $(AFTER_DOC_DIR)/html/$$f; \ - done; \ - cd ../..; \ - fi - -install: install.lib install.man install.doc install.apps - - -uninstall: uninstall.lib - diff --git a/graf2d/asimage/src/libAfterImage/README b/graf2d/asimage/src/libAfterImage/README deleted file mode 100644 index 65b144d4d749a..0000000000000 --- a/graf2d/asimage/src/libAfterImage/README +++ /dev/null @@ -1,30 +0,0 @@ -This directory contains libAfterImage core code. - -Here is how to build and install it : - -libAfterImage may utilize libAfterBase, for some of the low level -tasks, or it may run standalone, using its own subset of -libAfterBase. It is recommended to use libAfterBase whenever -possible, as it provides more functionality, and you may -actually utilize it in your programs for various tasks, such as -hash tables, file searching, etc. - -Both libraries can be built and installed by simply executing : - - ./configure ; make ; make install - -in respective directory. - -libAfterImage will install itself into /usr/local/lib on most -systems. In addition it will install afterimage-libs script to -/usr/local/bin. This script can be used to query what libraries -libAfterImage is dependant on. All of this libraries has to be -linked to, while building an application utilizing libAfterImage. -Header files for the library will be installed into -/usr/local/include/libAfterImage on most systems. - -Check out API documentation and example apps. - -Thanks for using libAfterImage. Contributions and bug reports are -always welcome. Please e-mail yours to , -or any of the AfterStep mailing lists. diff --git a/graf2d/asimage/src/libAfterImage/aclocal.m4 b/graf2d/asimage/src/libAfterImage/aclocal.m4 deleted file mode 100644 index aef4c8b18c1aa..0000000000000 --- a/graf2d/asimage/src/libAfterImage/aclocal.m4 +++ /dev/null @@ -1,988 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 - -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -# lib-prefix.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages they previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -# lib-link.m4 serial 6 (gettext-0.14.3) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ(2.50) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, they want to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [$4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES - diff --git a/graf2d/asimage/src/libAfterImage/afterbase.c b/graf2d/asimage/src/libAfterImage/afterbase.c index 3f21a0e332ef5..106c6be4f709a 100644 --- a/graf2d/asimage/src/libAfterImage/afterbase.c +++ b/graf2d/asimage/src/libAfterImage/afterbase.c @@ -15,11 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif #include #include @@ -66,11 +61,9 @@ #ifdef _WIN32 #include #include -#include "win32/afterbase.h" #define access _access -#else -#include "afterbase.h" #endif +#include "afterbase.h" #include "asimage.h" #ifdef X_DISPLAY_MISSING diff --git a/graf2d/asimage/src/libAfterImage/afterbase.h b/graf2d/asimage/src/libAfterImage/afterbase.h index 37a2314dc9ab9..9f6fe282f2ccf 100644 --- a/graf2d/asimage/src/libAfterImage/afterbase.h +++ b/graf2d/asimage/src/libAfterImage/afterbase.h @@ -1,41 +1,11 @@ #ifndef AFTERBASE_H_HEADER_INCLUDED #define AFTERBASE_H_HEADER_INCLUDED -#define HAVE_AFTERBASE_FLAG 0 +#include "asim_afterbase.h" -#if 0 -# if 0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -# else -#include "libAfterBase/astypes.h" -#include "libAfterBase/audit.h" -#include "libAfterBase/output.h" -#include "libAfterBase/safemalloc.h" -#include "libAfterBase/mystring.h" -#include "libAfterBase/fs.h" -#include "libAfterBase/parse.h" -#include "libAfterBase/selfdiag.h" -#include "libAfterBase/sleep.h" -#include "libAfterBase/socket.h" -#include "libAfterBase/trace.h" -#include "libAfterBase/xml.h" -# endif -#else - -# include "asim_afterbase.h" - -#endif /* HAVE_AFTERBASE */ +#ifdef _WIN32 +#define R_OK 04 +#endif #endif /* AFTERBASE_H_HEADER_INCLUDED */ diff --git a/graf2d/asimage/src/libAfterImage/afterbase.h.in b/graf2d/asimage/src/libAfterImage/afterbase.h.in deleted file mode 100644 index 2333f79170c9a..0000000000000 --- a/graf2d/asimage/src/libAfterImage/afterbase.h.in +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef AFTERBASE_H_HEADER_INCLUDED -#define AFTERBASE_H_HEADER_INCLUDED - -#define HAVE_AFTERBASE_FLAG @HAVE_AFTERBASE_FLAG@ - -#if @HAVE_AFTERBASE_FLAG@ -# if @USE_DEFAULT_AFTERBASE@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -# else -#include "@AFTERBASE_INCS_PATH@libAfterBase/astypes.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/audit.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/output.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/safemalloc.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/mystring.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/fs.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/parse.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/selfdiag.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/sleep.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/socket.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/trace.h" -#include "@AFTERBASE_INCS_PATH@libAfterBase/xml.h" -# endif -#else - -# include "asim_afterbase.h" - -#endif /* HAVE_AFTERBASE */ - -#endif /* AFTERBASE_H_HEADER_INCLUDED */ - diff --git a/graf2d/asimage/src/libAfterImage/afterimage-config.in b/graf2d/asimage/src/libAfterImage/afterimage-config.in deleted file mode 100644 index 00c4e5ea2f854..0000000000000 --- a/graf2d/asimage/src/libAfterImage/afterimage-config.in +++ /dev/null @@ -1,141 +0,0 @@ -#! /bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -AFTERIMAGE_LIBS="@AFTERIMAGE_LIBS@" -AFTERIMAGE_LIBS_EXTERNAL="@AFTERIMAGE_LIBS_EXTERNAL@" -HAVE_AFTERBASE="@have_afterbase@" -AFTERIMAGE_PREF_FORMAT="@image_format@" -AFTERIMAGE_X_SUPPORT="@afterimage_x_support@" - - -usage() -{ - cat <&2 -fi - -while test $# -gt 0 ; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - local_prefix=yes - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - local_prefix=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo @version@ - exit 0 - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - --libtool) - echo_libtool=yes - ;; - --have-afterbase) - echo_have_afterbase=yes - ;; - --have-x-support) - echo_have_x_support=yes - ;; - --preferred-image-format) - echo_preferred_image_format=yes - ;; - --external-only) - echo_external_only=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$local_prefix" = "yes" ; then - if test "$exec_prefix_set" != "yes" ; then - exec_prefix=$prefix - fi -fi - -if test "$echo_prefix" = "yes" ; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes" ; then - echo $exec_prefix -fi - -if test "$echo_cflags" = "yes" ; then - cflags="-I@includedir@/libAfterImage" - if test "@includedir@" != "/usr/include" ; then - echo $cflags -I@includedir@ - else - echo $cflags - fi -fi - -if test "$echo_libs" = "yes" ; then - libs="$AFTERIMAGE_LIBS_EXTERNAL" - if test "$echo_external_only" != "yes"; then - if test "@have_afterbase@" = "yes" ; then - libs="-lAfterBase $libs" - fi - libs="-lAfterImage $libs" - echo $libs - else - echo $libs - fi -fi - -if test "$echo_libtool" = "yes" ; then - convlib="libAfterImage.la" - echo @libdir@/$convlib -fi - -if test "$echo_have_afterbase" = "yes" ; then - echo "@have_afterbase@" -fi - -if test "$echo_have_x_support" = "yes" ; then - echo "@afterimage_x_support@" -fi - -if test "$echo_preferred_image_format" = "yes" ; then - echo "@image_format@" -fi - -# EOF diff --git a/graf2d/asimage/src/libAfterImage/afterimage-libs.in b/graf2d/asimage/src/libAfterImage/afterimage-libs.in deleted file mode 100644 index 20f7851f04277..0000000000000 --- a/graf2d/asimage/src/libAfterImage/afterimage-libs.in +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -# - -AFTERIMAGE_LIBS="@AFTERIMAGE_LIBS@" -AFTERIMAGE_LIBS_EXTERNAL="@AFTERIMAGE_LIBS_EXTERNAL@" -HAVE_AFTERBASE="@have_afterbase@" -AFTERIMAGE_PREF_FORMAT="@image_format@" - -export AFTERIMAGE_LIBS -export AFTERIMAGE_LIBS_EXTERNAL -export HAVE_AFTERBASE -export AFTERIMAGE_PREF_FORMAT - -if test "x$1" = "x--external-only" ; then - echo $AFTERIMAGE_LIBS_EXTERNAL -else - if test "x$1" = "x--have-afterbase" ; then - echo $HAVE_AFTERBASE - else - if test "x$1" = "x--preferred-image-format" ; then - echo $AFTERIMAGE_PREF_FORMAT - else - echo $AFTERIMAGE_LIBS - fi - fi -fi -exit 0 diff --git a/graf2d/asimage/src/libAfterImage/afterimage.h b/graf2d/asimage/src/libAfterImage/afterimage.h index 25c6e137000fa..b8b849509a041 100644 --- a/graf2d/asimage/src/libAfterImage/afterimage.h +++ b/graf2d/asimage/src/libAfterImage/afterimage.h @@ -150,20 +150,6 @@ * AUTHOR * Sasha Vasko *********/ -/****h* libAfterImage/Examples - * EXAMPLE - * ASView - image loading from the file and displaying in window. - * ASScale - image loading from file and scaling to arbitrary size. - * ASTile - image loading from file, tiling and tinting to arbitrary - * size and color. - * ASMerge - imgae loading and merging with another image. - * ASGrad - mutlipoint gradient drawing. - * ASFlip - image loading from file and rotation. - * ASText - trexturized semitransparent antialised text drawing. - * - * SEE ALSO - * API Reference - ******/ /****h* libAfterImage/API Reference * CHILDREN * Headers : diff --git a/graf2d/asimage/src/libAfterImage/afterrootpngwrite.c b/graf2d/asimage/src/libAfterImage/afterrootpngwrite.c index 0ed1ed96f5f54..530acde5feb44 100644 --- a/graf2d/asimage/src/libAfterImage/afterrootpngwrite.c +++ b/graf2d/asimage/src/libAfterImage/afterrootpngwrite.c @@ -1,9 +1,3 @@ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #include "afterrootpngwrite.h" # ifdef HAVE_BUILTIN_PNG diff --git a/graf2d/asimage/src/libAfterImage/ascmap.c b/graf2d/asimage/src/libAfterImage/ascmap.c index de993b59c5e95..9fd83e1dc6bb3 100644 --- a/graf2d/asimage/src/libAfterImage/ascmap.c +++ b/graf2d/asimage/src/libAfterImage/ascmap.c @@ -22,12 +22,6 @@ #undef LOCAL_DEBUG #undef DO_CLOCKING -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #include #if TIME_WITH_SYS_TIME # include @@ -50,11 +44,7 @@ #endif #include -#ifdef _WIN32 -# include "win32/afterbase.h" -#else # include "afterbase.h" -#endif #include "asimage.h" #include "import.h" diff --git a/graf2d/asimage/src/libAfterImage/asfont.c b/graf2d/asimage/src/libAfterImage/asfont.c index 415bf6147686b..89a679d6c2fd9 100644 --- a/graf2d/asimage/src/libAfterImage/asfont.c +++ b/graf2d/asimage/src/libAfterImage/asfont.c @@ -18,13 +18,6 @@ #undef LOCAL_DEBUG #undef DO_CLOCKING -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - - #define DO_X11_ANTIALIASING #define DO_2STEP_X11_ANTIALIASING #define DO_3STEP_X11_ANTIALIASING @@ -75,11 +68,7 @@ #define INCLUDE_ASFONT_PRIVATE -#ifdef _WIN32 -# include "win32/afterbase.h" -#else # include "afterbase.h" -#endif #include "asfont.h" #include "asimage.h" #include "asvisual.h" diff --git a/graf2d/asimage/src/libAfterImage/asim_afterbase.h b/graf2d/asimage/src/libAfterImage/asim_afterbase.h index 2b3cdbf1bfcec..986ba417b000c 100644 --- a/graf2d/asimage/src/libAfterImage/asim_afterbase.h +++ b/graf2d/asimage/src/libAfterImage/asim_afterbase.h @@ -17,7 +17,28 @@ # include # endif #endif - + +/* Define to 1 if type `char' is unsigned and you are not using gcc. */ +#ifndef __CHAR_UNSIGNED__ +/* # undef __CHAR_UNSIGNED__ */ +#endif + +#ifdef _WIN32 +typedef unsigned char boolean; +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#define inline +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const +#else +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ +#endif /* our own version of X Wrapper : */ #include "xwrap.h" diff --git a/graf2d/asimage/src/libAfterImage/asimage.c b/graf2d/asimage/src/libAfterImage/asimage.c index d4097c4d23bd7..7188e49905c0e 100644 --- a/graf2d/asimage/src/libAfterImage/asimage.c +++ b/graf2d/asimage/src/libAfterImage/asimage.c @@ -24,13 +24,6 @@ #undef DEBUG_RECTS2 #endif -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - - #define USE_64BIT_FPU #include @@ -56,11 +49,7 @@ #include #endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else # include "afterbase.h" -#endif #include "asvisual.h" #include "scanline.h" #include "blender.h" diff --git a/graf2d/asimage/src/libAfterImage/asimage.h b/graf2d/asimage/src/libAfterImage/asimage.h index 962c16603b881..4423a6fc43eed 100644 --- a/graf2d/asimage/src/libAfterImage/asimage.h +++ b/graf2d/asimage/src/libAfterImage/asimage.h @@ -534,8 +534,6 @@ extern Bool asimage_use_mmx ; * im - pointer to valid ASImage structure. * NOTES * If there was XImage attached to it - it will be deallocated as well. - * EXAMPLE - * asview.c: ASView.5 *********/ /****f* libAfterImage/asimage/asimage_replace() * NAME diff --git a/graf2d/asimage/src/libAfterImage/asstorage.c b/graf2d/asimage/src/libAfterImage/asstorage.c index 6fd14bc581d3a..7d97f6faf00f9 100644 --- a/graf2d/asimage/src/libAfterImage/asstorage.c +++ b/graf2d/asimage/src/libAfterImage/asstorage.c @@ -27,12 +27,6 @@ #endif #define DO_CLOCKING -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #if TIME_WITH_SYS_TIME # include # include @@ -51,18 +45,9 @@ #endif #include -#ifndef HAVE_ZLIB_H -#include "zlib/zlib.h" -#else #include -#endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else # include "afterbase.h" -#endif - #include "asstorage.h" /* default storage : */ diff --git a/graf2d/asimage/src/libAfterImage/asvisual.c b/graf2d/asimage/src/libAfterImage/asvisual.c index 4cdeb7c3117b8..d341b076189f3 100644 --- a/graf2d/asimage/src/libAfterImage/asvisual.c +++ b/graf2d/asimage/src/libAfterImage/asvisual.c @@ -16,12 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #define LOCAL_DEBUG #undef DEBUG_SL2XIMAGE #include @@ -34,12 +28,8 @@ #ifdef HAVE_STDARG_H #include #endif - -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif + +#include "afterbase.h" #include "asvisual.h" #include "scanline.h" diff --git a/graf2d/asimage/src/libAfterImage/asvisual.h b/graf2d/asimage/src/libAfterImage/asvisual.h index 0f80ab5ea4ae1..e2c41fee8b7b1 100644 --- a/graf2d/asimage/src/libAfterImage/asvisual.h +++ b/graf2d/asimage/src/libAfterImage/asvisual.h @@ -1,6 +1,12 @@ #ifndef _ASVISUAL_H_HEADER_INCLUDED #define _ASVISUAL_H_HEADER_INCLUDED +#if !defined(X_DISPLAY_MISSING) +#include +#include +#endif +#include "asim_afterbase.h" + #ifdef __cplusplus extern "C" { #endif @@ -200,8 +206,6 @@ long ARGB32_manhattan_distance (long a, long b); * create_visual_ximage() - to create XImage * ASVisual could be dealolocated and its resources freed with : * destroy_asvisual() - * EXAMPLE - * asview.c: ASView * SOURCE */ typedef struct ASVisual @@ -480,8 +484,6 @@ void setup_as_colormap( ASVisual *asv ); * Cleanup function. Frees all the memory and deallocates all the * resources. If reusable is False it will also free the object, pointed * to by asv. - * EXAMPLE - * asview.c: ASView.2 *********/ ASVisual *create_asvisual_for_id( Display *dpy, int screen, int default_depth, VisualID visual_id, Colormap cmap, diff --git a/graf2d/asimage/src/libAfterImage/blender.c b/graf2d/asimage/src/libAfterImage/blender.c index e18ec60949b03..922328f0bd7dc 100644 --- a/graf2d/asimage/src/libAfterImage/blender.c +++ b/graf2d/asimage/src/libAfterImage/blender.c @@ -16,12 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - /*#define LOCAL_DEBUG*/ /*#define DO_CLOCKING*/ @@ -30,11 +24,7 @@ #endif #include -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #include "asvisual.h" #include "scanline.h" #include "blender.h" diff --git a/graf2d/asimage/src/libAfterImage/bmp.c b/graf2d/asimage/src/libAfterImage/bmp.c index ea7e0a1e90f65..667ff2490025b 100644 --- a/graf2d/asimage/src/libAfterImage/bmp.c +++ b/graf2d/asimage/src/libAfterImage/bmp.c @@ -23,15 +23,12 @@ #undef DEBUG_TRANSP_GIF #ifdef _WIN32 -# include "win32/config.h" # include -# include "win32/afterbase.h" #else -# include "config.h" # include -# include "afterbase.h" #endif +#include "afterbase.h" #include "asimage.h" #include "imencdec.h" #include "import.h" diff --git a/graf2d/asimage/src/libAfterImage/char2uni.c b/graf2d/asimage/src/libAfterImage/char2uni.c index 63ced1d479540..0cb2ad59367fe 100644 --- a/graf2d/asimage/src/libAfterImage/char2uni.c +++ b/graf2d/asimage/src/libAfterImage/char2uni.c @@ -27,21 +27,11 @@ * Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #define LOCAL_DEBUG /*#define DO_CLOCKING*/ #include -#ifdef _WIN32 -# include "win32/afterbase.h" -#else # include "afterbase.h" -#endif #include "char2uni.h" diff --git a/graf2d/asimage/src/libAfterImage/config.guess b/graf2d/asimage/src/libAfterImage/config.guess deleted file mode 100755 index 48a684601bd23..0000000000000 --- a/graf2d/asimage/src/libAfterImage/config.guess +++ /dev/null @@ -1,1815 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2024 Free Software Foundation, Inc. - -# shellcheck disable=SC2006,SC2268 # see below for rationale - -timestamp='2024-07-27' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. -# -# You can get the latest version of this script from: -# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess -# -# Please send patches to . - - -# The "shellcheck disable" line above the timestamp inhibits complaints -# about features and limitations of the classic Bourne shell that were -# superseded or lifted in POSIX. However, this script identifies a wide -# variety of pre-POSIX systems that do not have POSIX shells at all, and -# even some reasonably current systems (Solaris 10 as case-in-point) still -# have a pre-POSIX /bin/sh. - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system '$me' is run on. - -Options: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-2024 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try '$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -# Just in case it came from the environment. -GUESS= - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still -# use 'HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 - -set_cc_for_build() { - # prevent multiple calls if $tmp is already set - test "$tmp" && return 0 - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039,SC3028 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c17 c99 c89 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD=$driver - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case $UNAME_SYSTEM in -Linux|GNU|GNU/*) - LIBC=unknown - - set_cc_for_build - cat <<-EOF > "$dummy.c" - #if defined(__ANDROID__) - LIBC=android - #else - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #elif defined(__GLIBC__) - LIBC=gnu - #elif defined(__LLVM_LIBC__) - LIBC=llvm - #else - #include - /* First heuristic to detect musl libc. */ - #ifdef __DEFINED_va_list - LIBC=musl - #endif - #endif - #endif - EOF - cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - eval "$cc_set_libc" - - # Second heuristic to detect musl libc. - if [ "$LIBC" = unknown ] && - command -v ldd >/dev/null && - ldd --version 2>&1 | grep -q ^musl; then - LIBC=musl - fi - - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - if [ "$LIBC" = unknown ]; then - LIBC=gnu - fi - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ - /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ - echo unknown)` - case $UNAME_MACHINE_ARCH in - aarch64eb) machine=aarch64_be-unknown ;; - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown - ;; - *) machine=$UNAME_MACHINE_ARCH-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently (or will in the future) and ABI. - case $UNAME_MACHINE_ARCH in - earm*) - os=netbsdelf - ;; - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # Determine ABI tags. - case $UNAME_MACHINE_ARCH in - earm*) - expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case $UNAME_VERSION in - Debian*) - release='-gnu' - ;; - *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - GUESS=$machine-${os}${release}${abi-} - ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE - ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE - ;; - *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE - ;; - *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE - ;; - *:MidnightBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE - ;; - *:ekkoBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE - ;; - *:SolidBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE - ;; - *:OS108:*:*) - GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE - ;; - macppc:MirBSD:*:*) - GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE - ;; - *:MirBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE - ;; - *:Sortix:*:*) - GUESS=$UNAME_MACHINE-unknown-sortix - ;; - *:Twizzler:*:*) - GUESS=$UNAME_MACHINE-unknown-twizzler - ;; - *:Redox:*:*) - GUESS=$UNAME_MACHINE-unknown-redox - ;; - mips:OSF1:*.*) - GUESS=mips-dec-osf1 - ;; - alpha:OSF1:*:*) - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - trap '' 0 - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case $ALPHA_CPU_TYPE in - "EV4 (21064)") - UNAME_MACHINE=alpha ;; - "EV4.5 (21064)") - UNAME_MACHINE=alpha ;; - "LCA4 (21066/21068)") - UNAME_MACHINE=alpha ;; - "EV5 (21164)") - UNAME_MACHINE=alphaev5 ;; - "EV5.6 (21164A)") - UNAME_MACHINE=alphaev56 ;; - "EV5.6 (21164PC)") - UNAME_MACHINE=alphapca56 ;; - "EV5.7 (21164PC)") - UNAME_MACHINE=alphapca57 ;; - "EV6 (21264)") - UNAME_MACHINE=alphaev6 ;; - "EV6.7 (21264A)") - UNAME_MACHINE=alphaev67 ;; - "EV6.8CB (21264C)") - UNAME_MACHINE=alphaev68 ;; - "EV6.8AL (21264B)") - UNAME_MACHINE=alphaev68 ;; - "EV6.8CX (21264D)") - UNAME_MACHINE=alphaev68 ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE=alphaev69 ;; - "EV7 (21364)") - UNAME_MACHINE=alphaev7 ;; - "EV7.9 (21364A)") - UNAME_MACHINE=alphaev79 ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - GUESS=$UNAME_MACHINE-dec-osf$OSF_REL - ;; - Amiga*:UNIX_System_V:4.0:*) - GUESS=m68k-unknown-sysv4 - ;; - *:[Aa]miga[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-amigaos - ;; - *:[Mm]orph[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-morphos - ;; - *:OS/390:*:*) - GUESS=i370-ibm-openedition - ;; - *:z/VM:*:*) - GUESS=s390-ibm-zvmoe - ;; - *:OS400:*:*) - GUESS=powerpc-ibm-os400 - ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - GUESS=arm-acorn-riscix$UNAME_RELEASE - ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - GUESS=arm-unknown-riscos - ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - GUESS=hppa1.1-hitachi-hiuxmpp - ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - case `(/bin/universe) 2>/dev/null` in - att) GUESS=pyramid-pyramid-sysv3 ;; - *) GUESS=pyramid-pyramid-bsd ;; - esac - ;; - NILE*:*:*:dcosx) - GUESS=pyramid-pyramid-svr4 - ;; - DRS?6000:unix:4.0:6*) - GUESS=sparc-icl-nx6 - ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) GUESS=sparc-icl-nx7 ;; - esac - ;; - s390x:SunOS:*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL - ;; - sun4H:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-hal-solaris2$SUN_REL - ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris2$SUN_REL - ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - GUESS=i386-pc-auroraux$UNAME_RELEASE - ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - set_cc_for_build - SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 - fi - fi - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$SUN_ARCH-pc-solaris2$SUN_REL - ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris3$SUN_REL - ;; - sun4*:SunOS:*:*) - case `/usr/bin/arch -k` in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like '4.1.3-JL'. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` - GUESS=sparc-sun-sunos$SUN_REL - ;; - sun3*:SunOS:*:*) - GUESS=m68k-sun-sunos$UNAME_RELEASE - ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case `/bin/arch` in - sun3) - GUESS=m68k-sun-sunos$UNAME_RELEASE - ;; - sun4) - GUESS=sparc-sun-sunos$UNAME_RELEASE - ;; - esac - ;; - aushp:SunOS:*:*) - GUESS=sparc-auspex-sunos$UNAME_RELEASE - ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - GUESS=m68k-milan-mint$UNAME_RELEASE - ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - GUESS=m68k-hades-mint$UNAME_RELEASE - ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - GUESS=m68k-unknown-mint$UNAME_RELEASE - ;; - m68k:machten:*:*) - GUESS=m68k-apple-machten$UNAME_RELEASE - ;; - powerpc:machten:*:*) - GUESS=powerpc-apple-machten$UNAME_RELEASE - ;; - RISC*:Mach:*:*) - GUESS=mips-dec-mach_bsd4.3 - ;; - RISC*:ULTRIX:*:*) - GUESS=mips-dec-ultrix$UNAME_RELEASE - ;; - VAX*:ULTRIX*:*:*) - GUESS=vax-dec-ultrix$UNAME_RELEASE - ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - GUESS=clipper-intergraph-clix$UNAME_RELEASE - ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && - { echo "$SYSTEM_NAME"; exit; } - GUESS=mips-mips-riscos$UNAME_RELEASE - ;; - Motorola:PowerMAX_OS:*:*) - GUESS=powerpc-motorola-powermax - ;; - Motorola:*:4.3:PL8-*) - GUESS=powerpc-harris-powermax - ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - GUESS=powerpc-harris-powermax - ;; - Night_Hawk:Power_UNIX:*:*) - GUESS=powerpc-harris-powerunix - ;; - m88k:CX/UX:7*:*) - GUESS=m88k-harris-cxux7 - ;; - m88k:*:4*:R4*) - GUESS=m88k-motorola-sysv4 - ;; - m88k:*:3*:R3*) - GUESS=m88k-motorola-sysv3 - ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 - then - if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ - test "$TARGET_BINARY_INTERFACE"x = x - then - GUESS=m88k-dg-dgux$UNAME_RELEASE - else - GUESS=m88k-dg-dguxbcs$UNAME_RELEASE - fi - else - GUESS=i586-dg-dgux$UNAME_RELEASE - fi - ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - GUESS=m88k-dolphin-sysv3 - ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - GUESS=m88k-motorola-sysv3 - ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - GUESS=m88k-tektronix-sysv3 - ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - GUESS=m68k-tektronix-bsd - ;; - *:IRIX*:*:*) - IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` - GUESS=mips-sgi-irix$IRIX_REL - ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id - ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - GUESS=i386-ibm-aix - ;; - ia64:AIX:*:*) - if test -x /usr/bin/oslevel ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE - fi - GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV - ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" - #include - - int - main () - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` - then - GUESS=$SYSTEM_NAME - else - GUESS=rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - GUESS=rs6000-ibm-aix3.2.4 - else - GUESS=rs6000-ibm-aix3.2 - fi - ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` - else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE - fi - GUESS=$IBM_ARCH-ibm-aix$IBM_REV - ;; - *:AIX:*:*) - GUESS=rs6000-ibm-aix - ;; - ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - GUESS=romp-ibm-bsd4.4 - ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to - ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - GUESS=rs6000-bull-bosx - ;; - DPX/2?00:B.O.S.:*:*) - GUESS=m68k-bull-sysv3 - ;; - 9000/[34]??:4.3bsd:1.*:*) - GUESS=m68k-hp-bsd - ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - GUESS=m68k-hp-bsd4.4 - ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - case $UNAME_MACHINE in - 9000/31?) HP_ARCH=m68000 ;; - 9000/[34]??) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if test -x /usr/bin/getconf; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case $sc_cpu_version in - 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 - 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case $sc_kernel_bits in - 32) HP_ARCH=hppa2.0n ;; - 64) HP_ARCH=hppa2.0w ;; - '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 - esac ;; - esac - fi - if test "$HP_ARCH" = ""; then - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" - - #define _HPUX_SOURCE - #include - #include - - int - main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if test "$HP_ARCH" = hppa2.0w - then - set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH=hppa2.0w - else - HP_ARCH=hppa64 - fi - fi - GUESS=$HP_ARCH-hp-hpux$HPUX_REV - ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - GUESS=ia64-hp-hpux$HPUX_REV - ;; - 3050*:HI-UX:*:*) - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - GUESS=unknown-hitachi-hiuxwe2 - ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - GUESS=hppa1.1-hp-bsd - ;; - 9000/8??:4.3bsd:*:*) - GUESS=hppa1.0-hp-bsd - ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - GUESS=hppa1.0-hp-mpeix - ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - GUESS=hppa1.1-hp-osf - ;; - hp8??:OSF1:*:*) - GUESS=hppa1.0-hp-osf - ;; - i*86:OSF1:*:*) - if test -x /usr/sbin/sysversion ; then - GUESS=$UNAME_MACHINE-unknown-osf1mk - else - GUESS=$UNAME_MACHINE-unknown-osf1 - fi - ;; - parisc*:Lites*:*:*) - GUESS=hppa1.1-hp-lites - ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - GUESS=c1-convex-bsd - ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - GUESS=c34-convex-bsd - ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - GUESS=c38-convex-bsd - ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - GUESS=c4-convex-bsd - ;; - CRAY*Y-MP:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=ymp-cray-unicos$CRAY_REL - ;; - CRAY*[A-Z]90:*:*:*) - echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=t90-cray-unicos$CRAY_REL - ;; - CRAY*T3E:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=alphaev5-cray-unicosmk$CRAY_REL - ;; - CRAY*SV1:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=sv1-cray-unicos$CRAY_REL - ;; - *:UNICOS/mp:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=craynv-cray-unicosmp$CRAY_REL - ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE - ;; - sparc*:BSD/OS:*:*) - GUESS=sparc-unknown-bsdi$UNAME_RELEASE - ;; - *:BSD/OS:*:*) - GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE - ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi - else - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf - fi - ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - case $UNAME_PROCESSOR in - amd64) - UNAME_PROCESSOR=x86_64 ;; - i386) - UNAME_PROCESSOR=i586 ;; - esac - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL - ;; - i*:CYGWIN*:*) - GUESS=$UNAME_MACHINE-pc-cygwin - ;; - *:MINGW64*:*) - GUESS=$UNAME_MACHINE-pc-mingw64 - ;; - *:MINGW*:*) - GUESS=$UNAME_MACHINE-pc-mingw32 - ;; - *:MSYS*:*) - GUESS=$UNAME_MACHINE-pc-msys - ;; - i*:PW*:*) - GUESS=$UNAME_MACHINE-pc-pw32 - ;; - *:SerenityOS:*:*) - GUESS=$UNAME_MACHINE-pc-serenity - ;; - *:Interix*:*) - case $UNAME_MACHINE in - x86) - GUESS=i586-pc-interix$UNAME_RELEASE - ;; - authenticamd | genuineintel | EM64T) - GUESS=x86_64-unknown-interix$UNAME_RELEASE - ;; - IA64) - GUESS=ia64-unknown-interix$UNAME_RELEASE - ;; - esac ;; - i*:UWIN*:*) - GUESS=$UNAME_MACHINE-pc-uwin - ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - GUESS=x86_64-pc-cygwin - ;; - prep*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=powerpcle-unknown-solaris2$SUN_REL - ;; - *:GNU:*:*) - # the GNU system - GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` - GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL - ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC - ;; - x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-pc-managarm-mlibc" - ;; - *:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" - ;; - *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix - ;; - aarch64:Linux:*:*) - set_cc_for_build - CPU=$UNAME_MACHINE - LIBCABI=$LIBC - if test "$CC_FOR_BUILD" != no_compiler_found; then - ABI=64 - sed 's/^ //' << EOF > "$dummy.c" - #ifdef __ARM_EABI__ - #ifdef __ARM_PCS_VFP - ABI=eabihf - #else - ABI=eabi - #endif - #endif -EOF - cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` - eval "$cc_set_abi" - case $ABI in - eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; - esac - fi - GUESS=$CPU-unknown-linux-$LIBCABI - ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - arm*:Linux:*:*) - set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi - else - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf - fi - fi - ;; - avr32*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - cris:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; - crisv32:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; - e2k:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - frv:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - hexagon:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - i*86:Linux:*:*) - GUESS=$UNAME_MACHINE-pc-linux-$LIBC - ;; - ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - k1om:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - kvx:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - kvx:cos:*:*) - GUESS=$UNAME_MACHINE-unknown-cos - ;; - kvx:mbr:*:*) - GUESS=$UNAME_MACHINE-unknown-mbr - ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - m32r*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - m68*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build - IS_GLIBC=0 - test x"${LIBC}" = xgnu && IS_GLIBC=1 - sed 's/^ //' << EOF > "$dummy.c" - #undef CPU - #undef mips - #undef mipsel - #undef mips64 - #undef mips64el - #if ${IS_GLIBC} && defined(_ABI64) - LIBCABI=gnuabi64 - #else - #if ${IS_GLIBC} && defined(_ABIN32) - LIBCABI=gnuabin32 - #else - LIBCABI=${LIBC} - #endif - #endif - - #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa64r6 - #else - #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa32r6 - #else - #if defined(__mips64) - CPU=mips64 - #else - CPU=mips - #endif - #endif - #endif - - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - MIPS_ENDIAN=el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - MIPS_ENDIAN= - #else - MIPS_ENDIAN= - #endif - #endif -EOF - cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` - eval "$cc_set_vars" - test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } - ;; - mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - openrisc*:Linux:*:*) - GUESS=or1k-unknown-linux-$LIBC - ;; - or32:Linux:*:* | or1k*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - padre:Linux:*:*) - GUESS=sparc-unknown-linux-$LIBC - ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - GUESS=hppa64-unknown-linux-$LIBC - ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; - PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; - *) GUESS=hppa-unknown-linux-$LIBC ;; - esac - ;; - ppc64:Linux:*:*) - GUESS=powerpc64-unknown-linux-$LIBC - ;; - ppc:Linux:*:*) - GUESS=powerpc-unknown-linux-$LIBC - ;; - ppc64le:Linux:*:*) - GUESS=powerpc64le-unknown-linux-$LIBC - ;; - ppcle:Linux:*:*) - GUESS=powerpcle-unknown-linux-$LIBC - ;; - riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - s390:Linux:*:* | s390x:Linux:*:*) - GUESS=$UNAME_MACHINE-ibm-linux-$LIBC - ;; - sh64*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - sh*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - tile*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - vax:Linux:*:*) - GUESS=$UNAME_MACHINE-dec-linux-$LIBC - ;; - x86_64:Linux:*:*) - set_cc_for_build - CPU=$UNAME_MACHINE - LIBCABI=$LIBC - if test "$CC_FOR_BUILD" != no_compiler_found; then - ABI=64 - sed 's/^ //' << EOF > "$dummy.c" - #ifdef __i386__ - ABI=x86 - #else - #ifdef __ILP32__ - ABI=x32 - #endif - #endif -EOF - cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` - eval "$cc_set_abi" - case $ABI in - x86) CPU=i686 ;; - x32) LIBCABI=${LIBC}x32 ;; - esac - fi - GUESS=$CPU-pc-linux-$LIBCABI - ;; - xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - GUESS=i386-sequent-sysv4 - ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION - ;; - i*86:OS/2:*:*) - # If we were able to find 'uname', then EMX Unix compatibility - # is probably installed. - GUESS=$UNAME_MACHINE-pc-os2-emx - ;; - i*86:XTS-300:*:STOP) - GUESS=$UNAME_MACHINE-unknown-stop - ;; - i*86:atheos:*:*) - GUESS=$UNAME_MACHINE-unknown-atheos - ;; - i*86:syllable:*:*) - GUESS=$UNAME_MACHINE-pc-syllable - ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - GUESS=i386-unknown-lynxos$UNAME_RELEASE - ;; - i*86:*DOS:*:*) - GUESS=$UNAME_MACHINE-pc-msdosdjgpp - ;; - i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL - else - GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL - fi - ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL - else - GUESS=$UNAME_MACHINE-pc-sysv32 - fi - ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configure will decide that - # this is a cross-build. - GUESS=i586-pc-msdosdjgpp - ;; - Intel:Mach:3*:*) - GUESS=i386-pc-mach3 - ;; - paragon:*:*:*) - GUESS=i860-intel-osf1 - ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 - fi - ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - GUESS=m68010-convergent-sysv - ;; - mc68k:UNIX:SYSTEM5:3.51m) - GUESS=m68k-convergent-sysv - ;; - M680?0:D-NIX:5.3:*) - GUESS=m68k-diab-dnix - ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - GUESS=m68k-unknown-lynxos$UNAME_RELEASE - ;; - mc68030:UNIX_System_V:4.*:*) - GUESS=m68k-atari-sysv4 - ;; - TSUNAMI:LynxOS:2.*:*) - GUESS=sparc-unknown-lynxos$UNAME_RELEASE - ;; - rs6000:LynxOS:2.*:*) - GUESS=rs6000-unknown-lynxos$UNAME_RELEASE - ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - GUESS=powerpc-unknown-lynxos$UNAME_RELEASE - ;; - SM[BE]S:UNIX_SV:*:*) - GUESS=mips-dde-sysv$UNAME_RELEASE - ;; - RM*:ReliantUNIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; - RM*:SINIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - GUESS=$UNAME_MACHINE-sni-sysv4 - else - GUESS=ns32k-sni-sysv - fi - ;; - PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort - # says - GUESS=i586-unisys-sysv4 - ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - GUESS=hppa1.1-stratus-sysv4 - ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - GUESS=i860-stratus-sysv4 - ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - GUESS=$UNAME_MACHINE-stratus-vos - ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - GUESS=hppa1.1-stratus-vos - ;; - mc68*:A/UX:*:*) - GUESS=m68k-apple-aux$UNAME_RELEASE - ;; - news*:NEWS-OS:6*:*) - GUESS=mips-sony-newsos6 - ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if test -d /usr/nec; then - GUESS=mips-nec-sysv$UNAME_RELEASE - else - GUESS=mips-unknown-sysv$UNAME_RELEASE - fi - ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - GUESS=powerpc-be-beos - ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - GUESS=powerpc-apple-beos - ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - GUESS=i586-pc-beos - ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - GUESS=i586-pc-haiku - ;; - ppc:Haiku:*:*) # Haiku running on Apple PowerPC - GUESS=powerpc-apple-haiku - ;; - *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) - GUESS=$UNAME_MACHINE-unknown-haiku - ;; - SX-4:SUPER-UX:*:*) - GUESS=sx4-nec-superux$UNAME_RELEASE - ;; - SX-5:SUPER-UX:*:*) - GUESS=sx5-nec-superux$UNAME_RELEASE - ;; - SX-6:SUPER-UX:*:*) - GUESS=sx6-nec-superux$UNAME_RELEASE - ;; - SX-7:SUPER-UX:*:*) - GUESS=sx7-nec-superux$UNAME_RELEASE - ;; - SX-8:SUPER-UX:*:*) - GUESS=sx8-nec-superux$UNAME_RELEASE - ;; - SX-8R:SUPER-UX:*:*) - GUESS=sx8r-nec-superux$UNAME_RELEASE - ;; - SX-ACE:SUPER-UX:*:*) - GUESS=sxace-nec-superux$UNAME_RELEASE - ;; - Power*:Rhapsody:*:*) - GUESS=powerpc-apple-rhapsody$UNAME_RELEASE - ;; - *:Rhapsody:*:*) - GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE - ;; - arm64:Darwin:*:*) - GUESS=aarch64-apple-darwin$UNAME_RELEASE - ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - if command -v xcode-select > /dev/null 2> /dev/null && \ - ! xcode-select --print-path > /dev/null 2> /dev/null ; then - # Avoid executing cc if there is no toolchain installed as - # cc will be a stub that puts up a graphical alert - # prompting the user to install developer tools. - CC_FOR_BUILD=no_compiler_found - else - set_cc_for_build - fi - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # uname -m returns i386 or x86_64 - UNAME_PROCESSOR=$UNAME_MACHINE - fi - GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE - ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = x86; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE - ;; - *:QNX:*:4*) - GUESS=i386-pc-qnx - ;; - NEO-*:NONSTOP_KERNEL:*:*) - GUESS=neo-tandem-nsk$UNAME_RELEASE - ;; - NSE-*:NONSTOP_KERNEL:*:*) - GUESS=nse-tandem-nsk$UNAME_RELEASE - ;; - NSR-*:NONSTOP_KERNEL:*:*) - GUESS=nsr-tandem-nsk$UNAME_RELEASE - ;; - NSV-*:NONSTOP_KERNEL:*:*) - GUESS=nsv-tandem-nsk$UNAME_RELEASE - ;; - NSX-*:NONSTOP_KERNEL:*:*) - GUESS=nsx-tandem-nsk$UNAME_RELEASE - ;; - *:NonStop-UX:*:*) - GUESS=mips-compaq-nonstopux - ;; - BS2000:POSIX*:*:*) - GUESS=bs2000-siemens-sysv - ;; - DS/*:UNIX_System_V:*:*) - GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE - ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "${cputype-}" = 386; then - UNAME_MACHINE=i386 - elif test "x${cputype-}" != x; then - UNAME_MACHINE=$cputype - fi - GUESS=$UNAME_MACHINE-unknown-plan9 - ;; - *:TOPS-10:*:*) - GUESS=pdp10-unknown-tops10 - ;; - *:TENEX:*:*) - GUESS=pdp10-unknown-tenex - ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - GUESS=pdp10-dec-tops20 - ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - GUESS=pdp10-xkl-tops20 - ;; - *:TOPS-20:*:*) - GUESS=pdp10-unknown-tops20 - ;; - *:ITS:*:*) - GUESS=pdp10-unknown-its - ;; - SEI:*:*:SEIUX) - GUESS=mips-sei-seiux$UNAME_RELEASE - ;; - *:DragonFly:*:*) - DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL - ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case $UNAME_MACHINE in - A*) GUESS=alpha-dec-vms ;; - I*) GUESS=ia64-dec-vms ;; - V*) GUESS=vax-dec-vms ;; - esac ;; - *:XENIX:*:SysV) - GUESS=i386-pc-xenix - ;; - i*86:skyos:*:*) - SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` - GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL - ;; - i*86:rdos:*:*) - GUESS=$UNAME_MACHINE-pc-rdos - ;; - i*86:Fiwix:*:*) - GUESS=$UNAME_MACHINE-pc-fiwix - ;; - *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros - ;; - x86_64:VMkernel:*:*) - GUESS=$UNAME_MACHINE-unknown-esx - ;; - amd64:Isilon\ OneFS:*:*) - GUESS=x86_64-unknown-onefs - ;; - *:Unleashed:*:*) - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE - ;; - *:Ironclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad - ;; -esac - -# Do we have a guess based on uname results? -if test "x$GUESS" != x; then - echo "$GUESS" - exit -fi - -# No uname command or uname output not recognized. -set_cc_for_build -cat > "$dummy.c" < -#include -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#include -#if defined(_SIZE_T_) || defined(SIGLOST) -#include -#endif -#endif -#endif -int -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); -#endif - -#if defined (vax) -#if !defined (ultrix) -#include -#if defined (BSD) -#if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -#else -#if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#endif -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#else -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname un; - uname (&un); - printf ("vax-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif -#endif -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname *un; - uname (&un); - printf ("mips-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("mips-dec-ultrix\n"); exit (0); -#endif -#endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. -test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } - -echo "$0: unable to guess system type" >&2 - -case $UNAME_MACHINE:$UNAME_SYSTEM in - mips:Linux | mips64:Linux) - # If we got here on MIPS GNU/Linux, output extra information. - cat >&2 <&2 <&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = "$UNAME_MACHINE" -UNAME_RELEASE = "$UNAME_RELEASE" -UNAME_SYSTEM = "$UNAME_SYSTEM" -UNAME_VERSION = "$UNAME_VERSION" -EOF -fi - -exit 1 - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/graf2d/asimage/src/libAfterImage/config.h.in b/graf2d/asimage/src/libAfterImage/config.h.in deleted file mode 100644 index 6b376e9e697c7..0000000000000 --- a/graf2d/asimage/src/libAfterImage/config.h.in +++ /dev/null @@ -1,179 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define if memory allocation logging and debugging is desired */ -#undef DEBUG_ALLOCS - -/* Define if libAfterBase is available */ -#undef HAVE_AFTERBASE - -/* Define if using builtin libjpeg */ -#undef HAVE_BUILTIN_JPEG - -/* Define if using builtin libpng */ -#undef HAVE_BUILTIN_PNG - -/* Define if using builtin libungif */ -#undef HAVE_BUILTIN_UNGIF - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERRNO_H - -/* Define if libFreeType is available */ -#undef HAVE_FREETYPE - -/* Define if libFreeType has freetype.h in freetype/ */ -#undef HAVE_FREETYPE_FREETYPE - -/* Define to 1 if you have the header file. */ -#define HAVE_FT2BUILD_H - -/* Define if libgif/ungif is available */ -#undef HAVE_GIF - -/* Support for OpenGL extention */ -#undef HAVE_GLX - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define if libjpeg is available */ -#undef HAVE_JPEG - -/* Define if support for XPM images should be through libXpm */ -#undef HAVE_LIBXPM - -/* Define if support for XPM images should be through libXpm library in Xlib - */ -#undef HAVE_LIBXPM_X11 - -/* Define to 1 if the system has the type `long long'. */ -#undef HAVE_LONG_LONG - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define if CPU supports MMX instructions */ -#undef HAVE_MMX - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define if libpng is available */ -#undef HAVE_PNG - -/* We always use function prototypes - not supporting old compilers */ -#undef HAVE_PROTOTYPES - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* librsvg v.2.0 or higher is available */ -#undef HAVE_SVG - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_DIRENT_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define if libtiff is available */ -#undef HAVE_TIFF - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if support for XPM images is desired */ -#undef HAVE_XPM - -/* Define to 1 if you have the header file. */ -#undef HAVE_ZLIB_H - -/* Define if locale support in X is needed */ -#undef I18N - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Support for shaped windows */ -#undef SHAPE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* Define if support for shared memory XImages is available */ -#undef XSHMIMAGE - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define to 1 if type `char' is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -# undef __CHAR_UNSIGNED__ -#endif - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif diff --git a/graf2d/asimage/src/libAfterImage/config.sub b/graf2d/asimage/src/libAfterImage/config.sub deleted file mode 100755 index 6d2e94c8bf9ea..0000000000000 --- a/graf2d/asimage/src/libAfterImage/config.sub +++ /dev/null @@ -1,1807 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. - -timestamp='2015-01-01' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches to . -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-2015 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/graf2d/asimage/src/libAfterImage/configure b/graf2d/asimage/src/libAfterImage/configure deleted file mode 100755 index a3d67ddc9a1e6..0000000000000 --- a/graf2d/asimage/src/libAfterImage/configure +++ /dev/null @@ -1,10614 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for libAfterImage 1.20. -# -# Report bugs to . -# -# Copyright (C) 2003 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_config_libobj_dir=. -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Identity of this package. -PACKAGE_NAME='libAfterImage' -PACKAGE_TARNAME='libAfterImage.tar' -PACKAGE_VERSION='1.20' -PACKAGE_STRING='libAfterImage 1.20' -PACKAGE_BUGREPORT='as-bugs@afterstep.org' - -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_STAT_H -# include -#endif -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#endif -#if HAVE_STRINGS_H -# include -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL INSTALL_PROGRAM INSTALL_DATA INSTALL_LIB RANLIB RM MV CP MKDIR PERL FIND XARGS LDCONFIG LEX LEXLIB YACC INSTALL_SCRIPT ac_ct_RANLIB MMX_CFLAGS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP XPM_CFLAGS JPEG_CFLAGS PNG_CFLAGS GIF_CFLAGS TIFF_CFLAGS PKG_CONFIG ac_pt_PKG_CONFIG SVG_CFLAGS SVG_LIBS TTF_INCLUDES JPEG_OBJS ZLIB_OBJS PNG_OBJS UNGIF_OBJS AFTERIMAGE_LIBS_EXTERNAL AFTERBASE_INCS_PATH USE_DEFAULT_AFTERBASE HAVE_AFTERBASE_FLAG AFTERBASE_C have_afterbase AFTERIMAGE_APPS_LIBS AFTERIMAGE_TEST_LIBS AFTERIMAGE_LIB_LIBS afterimage_x_support AFTERIMAGE_LIBS image_format version version_major lib_name lib_file_name with_locale user_ldflags x_libs LIBPROG LIBINSTALL DEFINE_XLOCALE APPSDEPS LIBOBJS LTLIBOBJS' -ac_subst_files='LIBAFTERIMAGEFILES' - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -ac_prev= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_option in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_env_PKG_CONFIG_value=$PKG_CONFIG -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG -ac_env_SVG_CFLAGS_set=${SVG_CFLAGS+set} -ac_env_SVG_CFLAGS_value=$SVG_CFLAGS -ac_cv_env_SVG_CFLAGS_set=${SVG_CFLAGS+set} -ac_cv_env_SVG_CFLAGS_value=$SVG_CFLAGS -ac_env_SVG_LIBS_set=${SVG_LIBS+set} -ac_env_SVG_LIBS_value=$SVG_LIBS -ac_cv_env_SVG_LIBS_set=${SVG_LIBS+set} -ac_cv_env_SVG_LIBS_value=$SVG_LIBS - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures libAfterImage 1.20 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -_ACEOF - - cat <<_ACEOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -_ACEOF - - cat <<\_ACEOF - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of libAfterImage 1.20:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-i18n support I18N no - --enable-xlocale using X_LOCALE no - --enable-staticlibs enable linking to libAfterImage statically yes - --enable-sharedlibs enable linking to libAfterImage dynamically no - --enable-gdb add gdb symbols (-g) (for debugging) no - --enable-warn turn on more compiler warnings (for debugging) no - --enable-gprof add gprof symbols (-pg) (for debugging) no - --enable-audit memory usage audit (for debugging) no - --enable-shmimage enable usage of MIT shared memory extention for image transfer no - --enable-shaping enable usage of MIT shaped windows extention yes - --enable-glx enable usage of GLX extention no - --enable-mmx-optimization enable utilization of MMX instruction set to speed up imaging operations yes - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-locale=LOCALE locale name you want to use - --with-jpeg support JPEG image format yes - --with-jpeg-includes=DIR use JPEG includes in DIR - --with-builtin-jpeg use included JPEG library no - --with-png support PNG image format yes - --with-png-includes=DIR use PNG includes in DIR - --with-builtin-png use included PNG library no - --with-builtin-zlib use included libZ library (needed for PNG) no - --with-tiff support TIFF image format yes - --with-tiff-includes=DIR use TIFF includes in DIR - --with-svg support SVG image format via librsvg yes - --with-xpm support XPM image format yes - --with-ungif support Uncompressed GIF image format using libungif no - --with-gif support GIF image format using libgif no - --with-gif-includes=DIR use GIF includes in DIR - --with-builtin-gif support Uncompressed GIF image format using builtin libgif yes - --with-ttf support True Type Fonts via FreeType library yes - --with-ttf-includes=DIR use FreeType includes in DIR - --with-afterbase use libAfterBase library of basic functionality yes - --with-afterbase-includes=DIR use libAfterBase includes in DIR - --with-x use the X Window System - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CPP C preprocessor - PKG_CONFIG path to pkg-config utility - SVG_CFLAGS C compiler flags for SVG, overriding pkg-config - SVG_LIBS linker flags for SVG, overriding pkg-config - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd "$ac_popdir" - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\_ACEOF -libAfterImage configure 1.20 -generated by GNU Autoconf 2.59 - -Copyright (C) 2003 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit 0 -fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by libAfterImage $as_me 1.20, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -_ACEOF -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ac_config_headers="$ac_config_headers config.h:config.h.in" - - -version=$PACKAGE_VERSION -version_major="1" -lib_name="LIBAFTERIMAGE" -lib_file_name=$PACKAGE_NAME - - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix="$prefix" -eval "mandir=$mandir" -eval "libdir=$libdir" -eval "includedir=$includedir" - -# Check whether --enable-i18n or --disable-i18n was given. -if test "${enable_i18n+set}" = set; then - enableval="$enable_i18n" - enable_i18n=$enableval -else - enable_i18n="no" -fi; -# Check whether --enable-xlocale or --disable-xlocale was given. -if test "${enable_xlocale+set}" = set; then - enableval="$enable_xlocale" - enable_xlocale=$enableval -else - enable_xlocale="no" -fi; - -# Check whether --with-locale or --without-locale was given. -if test "${with_locale+set}" = set; then - withval="$with_locale" - with_locale=$withval -else - with_locale="" -fi; -# Check whether --enable-staticlibs or --disable-staticlibs was given. -if test "${enable_staticlibs+set}" = set; then - enableval="$enable_staticlibs" - enable_staticlibs=$enableval -else - enable_staticlibs="yes" -fi; -# Check whether --enable-sharedlibs or --disable-sharedlibs was given. -if test "${enable_sharedlibs+set}" = set; then - enableval="$enable_sharedlibs" - enable_sharedlibs=$enableval -else - enable_sharedlibs="no" -fi; - -# Check whether --enable-gdb or --disable-gdb was given. -if test "${enable_gdb+set}" = set; then - enableval="$enable_gdb" - enable_gdb=$enableval -else - enable_gdb="no" -fi; -# Check whether --enable-warn or --disable-warn was given. -if test "${enable_warn+set}" = set; then - enableval="$enable_warn" - enable_warn=$enableval -else - enable_warn="no" -fi; -# Check whether --enable-gprof or --disable-gprof was given. -if test "${enable_gprof+set}" = set; then - enableval="$enable_gprof" - enable_gprof=$enableval -else - enable_gprof="no" -fi; -# Check whether --enable-audit or --disable-audit was given. -if test "${enable_audit+set}" = set; then - enableval="$enable_audit" - enable_audit=$enableval -else - enable_audit="no" -fi; -# Check whether --enable-shmimage or --disable-shmimage was given. -if test "${enable_shmimage+set}" = set; then - enableval="$enable_shmimage" - enable_shmimage=$enableval -else - enable_shmimage="no" -fi; -# Check whether --enable-shaping or --disable-shaping was given. -if test "${enable_shaping+set}" = set; then - enableval="$enable_shaping" - enable_shaping=$enableval -else - enable_shaping="yes" -fi; -# Check whether --enable-glx or --disable-glx was given. -if test "${enable_glx+set}" = set; then - enableval="$enable_glx" - enable_glx=$enableval -else - enable_glx="no" -fi; - -# Check whether --enable-mmx_optimization or --disable-mmx_optimization was given. -if test "${enable_mmx_optimization+set}" = set; then - enableval="$enable_mmx_optimization" - enable_mmx_optimization=$enableval -else - enable_mmx_optimization="yes" -fi; - - -# Check whether --with-jpeg or --without-jpeg was given. -if test "${with_jpeg+set}" = set; then - withval="$with_jpeg" - -fi; - -# Check whether --with-jpeg_includes or --without-jpeg_includes was given. -if test "${with_jpeg_includes+set}" = set; then - withval="$with_jpeg_includes" - jpeg_includes="$withval" -else - jpeg_includes=no -fi; - -# Check whether --with-builtin_jpeg or --without-builtin_jpeg was given. -if test "${with_builtin_jpeg+set}" = set; then - withval="$with_builtin_jpeg" - with_builtin_jpeg="$withval" -else - with_builtin_jpeg=no -fi; - -# Check whether --with-png or --without-png was given. -if test "${with_png+set}" = set; then - withval="$with_png" - -fi; - -# Check whether --with-png_includes or --without-png_includes was given. -if test "${with_png_includes+set}" = set; then - withval="$with_png_includes" - png_includes="$withval" -else - png_includes=no -fi; - -# Check whether --with-builtin_png or --without-builtin_png was given. -if test "${with_builtin_png+set}" = set; then - withval="$with_builtin_png" - with_builtin_png="$withval" -else - with_builtin_png=no -fi; - -# Check whether --with-builtin_zlib or --without-builtin_zlib was given. -if test "${with_builtin_zlib+set}" = set; then - withval="$with_builtin_zlib" - with_builtin_zlib="$withval" -else - with_builtin_zlib=no -fi; - -# Check whether --with-tiff or --without-tiff was given. -if test "${with_tiff+set}" = set; then - withval="$with_tiff" - -fi; - -# Check whether --with-tiff_includes or --without-tiff_includes was given. -if test "${with_tiff_includes+set}" = set; then - withval="$with_tiff_includes" - tiff_includes="$withval" -else - tiff_includes=no -fi; - -# Check whether --with-svg or --without-svg was given. -if test "${with_svg+set}" = set; then - withval="$with_svg" - -fi; - - -# Check whether --with-xpm or --without-xpm was given. -if test "${with_xpm+set}" = set; then - withval="$with_xpm" - -fi; -with_builtin_xpm=$with_xpm - -# Check whether --with-ungif or --without-ungif was given. -if test "${with_ungif+set}" = set; then - withval="$with_ungif" - with_ungif="$withval" -else - with_ungif=no -fi; - -# Check whether --with-gif or --without-gif was given. -if test "${with_gif+set}" = set; then - withval="$with_gif" - with_gif="$withval" -else - with_gif=no -fi; - -# Check whether --with-gif_includes or --without-gif_includes was given. -if test "${with_gif_includes+set}" = set; then - withval="$with_gif_includes" - gif_includes="$withval" -else - gif_includes=no -fi; - -# Check whether --with-builtin_gif or --without-builtin_gif was given. -if test "${with_builtin_gif+set}" = set; then - withval="$with_builtin_gif" - with_builtin_gif="$withval" -else - with_builtin_gif=yes -fi; - - - -# Check whether --with-ttf or --without-ttf was given. -if test "${with_ttf+set}" = set; then - withval="$with_ttf" - -fi; - -# Check whether --with-ttf_includes or --without-ttf_includes was given. -if test "${with_ttf_includes+set}" = set; then - withval="$with_ttf_includes" - ttf_includes="$withval" -else - ttf_includes=no -fi; - - -# Check whether --with-afterbase or --without-afterbase was given. -if test "${with_afterbase+set}" = set; then - withval="$with_afterbase" - with_afterbase="$withval" -else - with_afterbase=yes -fi; - -# Check whether --with-afterbase_includes or --without-afterbase_includes was given. -if test "${with_afterbase_includes+set}" = set; then - withval="$with_afterbase_includes" - afterbase_includes="$withval" -else - afterbase_includes=no -fi; - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 -fi - - - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -case $host_os in - *cygwin* ) CYGWIN=yes;; - * ) CYGWIN=no;; -esac - -echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 -target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - -RDYNAMIC="-rdynamic" - -case "$target" in - *i?86*OpenUNIX*) - RDYNAMIC="-Wl,-Bexport" - ;; - *i?86*sco*) - RDYNAMIC="-Wl,-Bexport" - ;; - *aix*) - RDYNAMIC="-Wl,-bexpall" - ;; - *i?86*freebsd*) - RDYNAMIC="" - ;; - hppa*) - RDYNAMIC="-Wl,-E" - ;; - i?86*solaris*) - RDYNAMIC="" - ;; - sparc*solaris*) - RDYNAMIC="-Wl,-export-dynamic" - ;; - *-apple-darwin*) - RDYNAMIC="-Wl,-Sn" - ;; - *ppc* | *powerpc*) - RDYNAMIC="" - ;; - *) -esac - -if test "x$CYGWIN" = "xno" -a "x$GCC" = "xyes" ; then - if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then - CFLAGS="$CFLAGS -fPIC" - fi -fi - - -if test "x$FROM_AFTERSTEP_CONFIGURE" = "xyes"; then - - aaa=bbb - - - - - - - - - - - - - - - - - if test "x$have_shmimage" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define XSHMIMAGE 1 -_ACEOF - - fi - if test "x$have_shaping" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define SHAPE 1 -_ACEOF - - fi - -else - - if test "x$GCC" = "xyes"; then - if test -z "`echo $CFLAGS | grep '\-Wall' 2> /dev/null`" ; then - #CFLAGS="$CFLAGS -Wall" - #rdm No -Wall to silence unused warnings on Ubuntu. - CFLAGS="$CFLAGS" - fi - fi - - - if test "x$enable_gdb" = "xyes"; then - if ! test -n "`echo $CFLAGS' ' | grep '\-g ' 2> /dev/null`" ; then - CFLAGS="$CFLAGS -g" - fi - else - DIRTY_CFLAGS="$CFLAGS" - CFLAGS="-DNO_DEBUG_OUTPUT" - for f in $DIRTY_CFLAGS; do - if test "x$f" != "x-g"; then - CFLAGS="$CFLAGS $f" - fi - done - fi - if test "x$enable_gprof" = "xyes"; then - CFLAGS="$CFLAGS -pg" - LDFLAGS="$LDFLAGS -pg" - fi - if test "x$enable_warn" = "xyes"; then - CFLAGS="$CFLAGS -Wuninitialized -Wwrite-strings -Wcast-qual -Wbad-function-cast -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wconversion -Wcomment -Wcast-align -Wshadow -Wredundant-decls" - fi - # Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - currdir=`pwd` - INSTALL=`echo $INSTALL|sed -e "s|\^\.\.|${currdir}|" -e "s|^autoconf|${currdir}/autoconf|"` - INSTALL_PROGRAM=`echo $INSTALL_PROGRAM|sed -e "s|\^\.\.|${currdir}|" -e "s|^autoconf|${currdir}/autoconf|"` - INSTALL_DATA=`echo $INSTALL_DATA|sed -e "s|\^\.\.|${currdir}|" -e "s|^autoconf|${currdir}/autoconf|"` - INSTALL_LIB=`echo $INSTALL_LIB|sed -e "s|\^\.\.|${currdir}|" -e "s|^autoconf|${currdir}/autoconf|"` - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - - # Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $RM in - [\\/]* | ?:[\\/]*) - ac_cv_path_RM="$RM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm" - ;; -esac -fi -RM=$ac_cv_path_RM - -if test -n "$RM"; then - echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "mv", so it can be a program name with args. -set dummy mv; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MV+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MV in - [\\/]* | ?:[\\/]*) - ac_cv_path_MV="$MV" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv" - ;; -esac -fi -MV=$ac_cv_path_MV - -if test -n "$MV"; then - echo "$as_me:$LINENO: result: $MV" >&5 -echo "${ECHO_T}$MV" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "cp", so it can be a program name with args. -set dummy cp; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_CP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $CP in - [\\/]* | ?:[\\/]*) - ac_cv_path_CP="$CP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_CP" && ac_cv_path_CP="cp" - ;; -esac -fi -CP=$ac_cv_path_CP - -if test -n "$CP"; then - echo "$as_me:$LINENO: result: $CP" >&5 -echo "${ECHO_T}$CP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "mkdir", so it can be a program name with args. -set dummy mkdir; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MKDIR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MKDIR in - [\\/]* | ?:[\\/]*) - ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_MKDIR" && ac_cv_path_MKDIR="mkdir" - ;; -esac -fi -MKDIR=$ac_cv_path_MKDIR - -if test -n "$MKDIR"; then - echo "$as_me:$LINENO: result: $MKDIR" >&5 -echo "${ECHO_T}$MKDIR" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl" - ;; -esac -fi -PERL=$ac_cv_path_PERL - -if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "find", so it can be a program name with args. -set dummy find; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_FIND+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $FIND in - [\\/]* | ?:[\\/]*) - ac_cv_path_FIND="$FIND" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_FIND" && ac_cv_path_FIND="find" - ;; -esac -fi -FIND=$ac_cv_path_FIND - -if test -n "$FIND"; then - echo "$as_me:$LINENO: result: $FIND" >&5 -echo "${ECHO_T}$FIND" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "xargs", so it can be a program name with args. -set dummy xargs; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XARGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $XARGS in - [\\/]* | ?:[\\/]*) - ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_XARGS" && ac_cv_path_XARGS="xargs" - ;; -esac -fi -XARGS=$ac_cv_path_XARGS - -if test -n "$XARGS"; then - echo "$as_me:$LINENO: result: $XARGS" >&5 -echo "${ECHO_T}$XARGS" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "ldconfig", so it can be a program name with args. -set dummy ldconfig; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_LDCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $LDCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/sbin:/usr/local/sbin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG="ldconfig" - ;; -esac -fi -LDCONFIG=$ac_cv_path_LDCONFIG - -if test -n "$LDCONFIG"; then - echo "$as_me:$LINENO: result: $LDCONFIG" >&5 -echo "${ECHO_T}$LDCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi - -if test "x$enable_gdb" = "xno"; then - DIRTY_CFLAGS="$CFLAGS" - CFLAGS="-O3" - for f in $DIRTY_CFLAGS; do - if test "x$f" != "x-O2" -a "x$f" != "x-O3" -a "x$f" != "x-O"; then - CFLAGS="$CFLAGS $f" - fi - done -fi - - -MMX_CFLAGS="-mmmx" -have_mmx_intrinsics=no - -if test "x$enable_mmx_optimization" = "xyes"; then - echo "$as_me:$LINENO: checking for MMX support" >&5 -echo $ECHO_N "checking for MMX support... $ECHO_C" >&6 - - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MMX_CFLAGS" - -cat >conftest.$ac_ext <<_ACEOF - -#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) -#error "Need GCC >= 3.4 for MMX intrinsics" -#endif -#include -int main () { - __m64 v = _mm_cvtsi32_si64 (1); - __m64 w = _mm_slli_si64 (v, 1); - v = _mm_add_pi32 (v, w); /* paddd */ - v = _mm_srl_pi32 (v, w); /* psrld */ - return _mm_cvtsi64_si32 (v); -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - have_mmx_intrinsics=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - echo "$as_me:$LINENO: result: $have_mmx_intrinsics" >&5 -echo "${ECHO_T}$have_mmx_intrinsics" >&6 - CFLAGS=$save_CFLAGS -fi - -if test $have_mmx_intrinsics = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMX 1 -_ACEOF - -else - MMX_CFLAGS= -fi - - -afterimage_x_support=yes -if test "x$PATH_XTRA_CHECKED" != "xyes"; then - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -if test "x$ac_path_x_has_been_run" != xyes; then - echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - -ac_path_x_has_been_run=yes - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib; do - if test -r $ac_dir/libX11.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 -fi - -fi -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main () -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main () -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - -else - if test "x$have_x" != "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - afterimage_x_support=no - fi - -fi - -user_ldflags=$LDFLAGS - -if test "x$have_x" = "xyes"; then - x_libs="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" - if test "x$user_ldflags" = "x"; then - full_x_libs=$x_libs - else - full_x_libs="$user_ldflags $x_libs" - fi - echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 -echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 -if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $full_x_libs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_X11_XOpenDisplay=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_X11_XOpenDisplay=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 -if test $ac_cv_lib_X11_XOpenDisplay = yes; then - x_libs="-lX11 $x_libs" -fi - -fi - - - -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_bigendian=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_bigendian=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -# It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -int -main () -{ - _ascii (); _ebcdic (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long l; - char c[sizeof (long)]; - } u; - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_bigendian=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_bigendian=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -case $ac_cv_c_bigendian in - yes) - -cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac - -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 - - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 -if test "${ac_cv_type_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((long long *) 0) - return 0; -if (sizeof (long long)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long_long=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_long_long=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&6 -if test $ac_cv_type_long_long = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_LONG_LONG 1 -_ACEOF - - -fi - - -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_time=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - - - - - - - - - -for ac_header in sys/wait.h sys/time.h malloc.h stdlib.h unistd.h stddef.h stdarg.h errno.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -have_shmimage=no -have_xext_lib=no -if test "x$enable_shmimage" = "xyes"; then - echo "$as_me:$LINENO: checking for XShmCreateImage in -lXext" >&5 -echo $ECHO_N "checking for XShmCreateImage in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XShmCreateImage+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $full_x_libs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XShmCreateImage (); -int -main () -{ -XShmCreateImage (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_Xext_XShmCreateImage=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xext_XShmCreateImage=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmCreateImage" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShmCreateImage" >&6 -if test $ac_cv_lib_Xext_XShmCreateImage = yes; then - have_shmimage=yes -fi - - if test "x$have_shmimage" = "xyes"; then - if test "${ac_cv_header_sys_ipc_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_ipc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 -echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 -echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_ipc_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_ipc_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6 - -fi -if test $ac_cv_header_sys_ipc_h = yes; then - : -else - have_shmimage=no -fi - - - fi - if test "x$have_shmimage" = "xyes"; then - if test "${ac_cv_header_sys_shm_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_shm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 -echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 -echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_shm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sys_shm_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6 - -fi -if test $ac_cv_header_sys_shm_h = yes; then - : -else - have_shmimage=no -fi - - - fi - if test "x$have_shmimage" = "xyes"; then - have_xext_lib=yes - -cat >>confdefs.h <<\_ACEOF -#define XSHMIMAGE 1 -_ACEOF - - fi -fi - -HAVESHAPE="NOSHAPE" -if test "x$enable_shaping" = "xyes"; then - echo "$as_me:$LINENO: checking for XShapeCombineMask in -lXext" >&5 -echo $ECHO_N "checking for XShapeCombineMask in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XShapeCombineMask+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $full_x_libs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XShapeCombineMask (); -int -main () -{ -XShapeCombineMask (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_Xext_XShapeCombineMask=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xext_XShapeCombineMask=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeCombineMask" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShapeCombineMask" >&6 -if test $ac_cv_lib_Xext_XShapeCombineMask = yes; then - have_xext_lib=yes; -cat >>confdefs.h <<\_ACEOF -#define SHAPE 1 -_ACEOF - -fi - -fi - -if test "x$enable_glx" = "xyes"; then - echo "$as_me:$LINENO: checking for glDrawPixels in -lGL" >&5 -echo $ECHO_N "checking for glDrawPixels in -lGL... $ECHO_C" >&6 -if test "${ac_cv_lib_GL_glDrawPixels+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGL $full_x_libs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glDrawPixels (); -int -main () -{ -glDrawPixels (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_GL_glDrawPixels=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_GL_glDrawPixels=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glDrawPixels" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_glDrawPixels" >&6 -if test $ac_cv_lib_GL_glDrawPixels = yes; then - x_libs="$x_libs -lGL"; -cat >>confdefs.h <<\_ACEOF -#define HAVE_GLX 1 -_ACEOF - -fi - -fi - - -if test "x$have_xext_lib" = "xyes"; then - x_libs="$x_libs -lXext" -fi - - -image_format="xpm" - -AFTERIMAGE_LIBS=$x_libs - -if test "$with_xpm" = no; then - have_xpm=disabled -else - if test "$with_builtin_xpm" = no; then - SAVED_CFLAGS=$CPPFLAGS - if test "x$xpm_includes" != "xno"; then - XPM_CFLAGS="-I$xpm_includes" - CPPFLAGS="$CPPFLAGS $XPM_CFLAGS" - fi - have_libxpm=no - if test "${ac_cv_header_xpm_h+set}" = set; then - echo "$as_me:$LINENO: checking for xpm.h" >&5 -echo $ECHO_N "checking for xpm.h... $ECHO_C" >&6 -if test "${ac_cv_header_xpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_xpm_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking xpm.h usability" >&5 -echo $ECHO_N "checking xpm.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking xpm.h presence" >&5 -echo $ECHO_N "checking xpm.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: xpm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: xpm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: xpm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: xpm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: xpm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: xpm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: xpm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: xpm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: xpm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: xpm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: xpm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: xpm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: xpm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: xpm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for xpm.h" >&5 -echo $ECHO_N "checking for xpm.h... $ECHO_C" >&6 -if test "${ac_cv_header_xpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_xpm_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_xpm_h" >&6 - -fi -if test $ac_cv_header_xpm_h = yes; then - have_libxpm=yes -fi - - - if test "x$have_libxpm" = "xno"; then - if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 -echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 -echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/xpm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/xpm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/xpm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_xpm_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 - -fi -if test $ac_cv_header_X11_xpm_h = yes; then - have_libxpm_x11="yes" -fi - - - if test "x$have_libxpm_x11" = "xyes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXPM_X11 1 -_ACEOF - - have_libxpm=yes - fi - fi - if test "x$have_libxpm" = "xyes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XPM 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXPM 1 -_ACEOF - - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lXpm" - fi - CPPFLAGS=$SAVED_CFLAGS - else - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XPM 1 -_ACEOF - - XPM_CFLAGS= - fi -fi - - -JPEG_OBJS= -ZLIB_OBJS= -PNG_OBJS= - -have_jpeg= - -if test "$with_jpeg" = no; then - have_jpeg=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "x$jpeg_includes" != "xno"; then - JPEG_CFLAGS="-I$jpeg_includes" - CPPFLAGS="$CPPFLAGS $JPEG_CFLAGS" - fi - if test "with_builtin_jpeg" = yes -a ! -f libjpeg/jpeglib.h; then - with_builtin_jpeg=no - fi - if test "$with_builtin_jpeg" = no; then - if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jpeglib_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 - -fi -if test $ac_cv_header_jpeglib_h = yes; then - have_jpeg=yes -fi - - - fi - if test "$have_jpeg" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_JPEG 1 -_ACEOF - - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -ljpeg" - else - echo "$as_me:$LINENO: checking built-in JPEG library" >&5 -echo $ECHO_N "checking built-in JPEG library... $ECHO_C" >&6 - if test -f libjpeg/jpeglib.h; then - JPEG_OBJS='$(LIBJPEG_OBJS)' - -cat >>confdefs.h <<\_ACEOF -#define HAVE_JPEG 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BUILTIN_JPEG 1 -_ACEOF - - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - fi - CPPFLAGS=$SAVED_CFLAGS -fi - - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PROTOTYPES 1 -_ACEOF - -echo "$as_me:$LINENO: checking for unsigned char" >&5 -echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6 -if test "${ac_cv_type_unsigned_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((unsigned char *) 0) - return 0; -if (sizeof (unsigned char)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_unsigned_char=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_unsigned_char=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_char" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_char" >&6 - -echo "$as_me:$LINENO: checking for unsigned short" >&5 -echo $ECHO_N "checking for unsigned short... $ECHO_C" >&6 -if test "${ac_cv_type_unsigned_short+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((unsigned short *) 0) - return 0; -if (sizeof (unsigned short)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_unsigned_short=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_unsigned_short=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_short" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6 - -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* 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"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 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 saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_const=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - - -echo "$as_me:$LINENO: checking whether char is unsigned" >&5 -echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6 -if test "${ac_cv_c_char_unsigned+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((char) -1) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_char_unsigned=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_char_unsigned=yes -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5 -echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6 -if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then - cat >>confdefs.h <<\_ACEOF -#define __CHAR_UNSIGNED__ 1 -_ACEOF - -fi - - -have_png=no -have_zlib=no - -if test "$with_png" = no; then - have_png=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "$png_includes" != no; then - PNG_CFLAGS="-I$png_includes" - CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" - fi - if test "$with_builtin_png" = yes -a ! -f libpng/png.h; then - with_builtin_png=no - fi - if test "$with_builtin_zlib" = yes -a ! -f zlib/zlib.h; then - with_builtin_zlib=no - fi - - if test "$with_builtin_png" = no; then - if test "${ac_cv_header_png_h+set}" = set; then - echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_png_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 - -fi -if test $ac_cv_header_png_h = yes; then - have_png=yes with_builtin_zlib=no -fi - - - fi - if test "$with_builtin_zlib" = no; then - -for ac_header in zlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - have_zlib=yes -else - have_zlib=no -fi - -done - - fi - if test "$have_png" = yes; then - echo "$as_me:$LINENO: checking for png_get_sRGB in png.h" >&5 -echo $ECHO_N "checking for png_get_sRGB in png.h... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "png_get_sRGB" >/dev/null 2>&1; then - : -else - have_png=no -fi -rm -f conftest* - - echo "$as_me:$LINENO: result: $have_png" >&5 -echo "${ECHO_T}$have_png" >&6 - fi - if test "$have_png" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PNG 1 -_ACEOF - - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lpng" - image_format="png" - else - echo "$as_me:$LINENO: checking built-in PNG library" >&5 -echo $ECHO_N "checking built-in PNG library... $ECHO_C" >&6 - if test -f libpng/png.h; then - PNG_OBJS='$(LIBPNG_OBJS)' - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PNG 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BUILTIN_PNG 1 -_ACEOF - - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - if test "$have_zlib" = no; then - echo "$as_me:$LINENO: checking built-in ZLIB library" >&5 -echo $ECHO_N "checking built-in ZLIB library... $ECHO_C" >&6 - if test -f zlib/zlib.h; then - ZLIB_OBJS='$(ZLIB_OBJS)' - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - fi - image_format="png" - have_png=yes - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - fi - CPPFLAGS=$SAVED_CFLAGS -fi - - -have_gif=no -if test "$with_gif$with_ungif" = nono; then - have_gif=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "$gif_includes" != no; then - GIF_CFLAGS="-I$gif_includes" - CPPFLAGS="$CPPFLAGS $GIF_CFLAGS" - fi - if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo "$as_me:$LINENO: checking for gif_lib.h" >&5 -echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6 -if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking gif_lib.h usability" >&5 -echo $ECHO_N "checking gif_lib.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking gif_lib.h presence" >&5 -echo $ECHO_N "checking gif_lib.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gif_lib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gif_lib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gif_lib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gif_lib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gif_lib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for gif_lib.h" >&5 -echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6 -if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_gif_lib_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6 - -fi -if test $ac_cv_header_gif_lib_h = yes; then - have_gif=yes -fi - - - CPPFLAGS=$SAVED_CFLAGS - if test "x$have_gif" = "xyes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GIF 1 -_ACEOF - - if test "$with_gif" = no; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lungif" - else - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lgif" - fi - fi -fi - -if test "x$have_gif" != "xyes"; then - if test "x$with_builtin_gif" = "xyes"; then - echo "$as_me:$LINENO: checking using built-in UNGIF library" >&5 -echo $ECHO_N "checking using built-in UNGIF library... $ECHO_C" >&6 - if test -f libungif/gif_lib.h; then - UNGIF_OBJS='$(LIBUNGIF_OBJS)' - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GIF 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BUILTIN_UNGIF 1 -_ACEOF - - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - have_gif=yes - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - fi -fi - - - - -if test "$with_tiff" = no; then - have_tiff=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "$tiff_includes" != no; then - TIFF_CFLAGS="-I$tiff_includes" - CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS" - fi - if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tiffio_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 - -fi -if test $ac_cv_header_tiffio_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIFF 1 -_ACEOF - AFTERIMAGE_LIBS="-ltiff $AFTERIMAGE_LIBS" have_tiff=yes -fi - - - CPPFLAGS=$SAVED_CFLAGS -fi - - -if test "$have_tiff" = yes -o "$have_png" = yes ; then - if test "x$ZLIB_OBJS" = "x" -a "$have_zlib" = yes; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lz" - fi -fi - -have_svg= -if test "$with_svg" = no; then - have_svg=disabled -else - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "$PKG_CONFIG" = "no" ; then - echo "$as_me:$LINENO: checking if librsvg 2.0 is available" >&5 -echo $ECHO_N "checking if librsvg 2.0 is available... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: pkg-config is not found. Cannot check for librsvg 2.0." >&5 -echo "${ECHO_T}pkg-config is not found. Cannot check for librsvg 2.0." >&6 - have_svg=no - else - have_svg=yes - pkg_modules="librsvg-2.0 >= 2.0.0" - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - -if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - PKG_CONFIG=$ac_pt_PKG_CONFIG -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - PKG_CONFIG="" - fi - -fi - -pkg_failed=no -echo "$as_me:$LINENO: checking for SVG" >&5 -echo $ECHO_N "checking for SVG... $ECHO_C" >&6 - -if test -n "$PKG_CONFIG"; then - if test -n "$SVG_CFLAGS"; then - pkg_cv_SVG_CFLAGS="$SVG_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SVG_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$SVG_LIBS"; then - pkg_cv_SVG_LIBS="$SVG_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_SVG_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"` - else - SVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"` - fi - # Put the nasty error message in config.log where it belongs - echo "$SVG_PKG_ERRORS" >&5 - - have_svg=no -elif test $pkg_failed = untried; then - have_svg=no -else - SVG_CFLAGS=$pkg_cv_SVG_CFLAGS - SVG_LIBS=$pkg_cv_SVG_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - : -fi - - if test "x$have_svg" = "xyes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SVG 1 -_ACEOF - - AFTERIMAGE_LIBS="$SVG_LIBS $AFTERIMAGE_LIBS" - fi - fi -fi - - - -AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lm" - - -TTF_INCLUDES= - -if test "x$with_ttf" = "xno"; then - have_ttf=disabled -else - if test "x$ttf_includes" = "xno"; then - echo "$as_me:$LINENO: checking headers required by TTF support" >&5 -echo $ECHO_N "checking headers required by TTF support... $ECHO_C" >&6 - if freetype-config --cflags >/dev/null ;then - present_incs="$CCFLAGS $x_includes"; - for l in `freetype-config --cflags` ; do - inc_found=no - for p in `echo "$present_incs"` ; do - if test "x$l" = "x$p" ; then - inc_found=yes; - fi; - if test "x$l" = "x-I$p" ; then - inc_found=yes; - fi; - done; - if test "x$inc_found" != "xyes" ; then - TTF_INCLUDES="$TTF_INCLUDES $l" ; - fi; - done; - echo "$as_me:$LINENO: result: $TTF_INCLUDES" >&5 -echo "${ECHO_T}$TTF_INCLUDES" >&6 - saved_CPPFLAGS=$CPPFLAGS - saved_CFLAGS=$CFLAGS - CPPFLAGS="$TTF_INCLUDES $CPPFLAGS" - CFLAGS="$CFLAGS $TTF_INCLUDES $XPM_CFLAGS $JPEG_CFLAGS $PNG_CFLAGS $GIF_CFLAGS $TIFF_CFLAGS $SVG_CFLAGS $X_CFLAGS" - have_ft2build=no - -for ac_header in ft2build.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - have_ft2build=yes -fi - -done - - echo "$as_me:$LINENO: checking freetype/freetype.h " >&5 -echo $ECHO_N "checking freetype/freetype.h ... $ECHO_C" >&6 - have_ttf=no - have_freetype_freetype=no - have_freetype=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "FT_Face" >/dev/null 2>&1; then - have_freetype_freetype=yes -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6;echo "$as_me:$LINENO: checking freetype.h" >&5 -echo $ECHO_N "checking freetype.h... $ECHO_C" >&6; \ - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "FT_Face" >/dev/null 2>&1; then - have_freetype=yes -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest* - - -fi -rm -f conftest* - - if test "x$have_ft2build" = "xno" ; then - if test "x$have_freetype_freetype" = "xyes" ; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - int main(){FT_Face f; return 0;} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - have_ttf=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - elif test "x$have_freetype" = "xyes" ; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - int main(){FT_Face f; return 0;} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - have_ttf=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - fi; - elif test "x$have_freetype_freetype" = "xyes" ; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include - int main(){FT_Face f; return 0;} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - have_ttf=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - elif test "x$have_freetype" = "xyes" ; then - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include - int main(){FT_Face f; return 0;} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - have_ttf=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - fi; - if test "x$have_ttf" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FREETYPE 1 -_ACEOF - - if test "x$have_freetype_freetype" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FREETYPE_FREETYPE 1 -_ACEOF - - fi; - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - fi; - CPPFLAGS=$saved_CPPFLAGS - CFLAGS=$saved_CFLAGS - else - enable_ttf=no ; - echo "$as_me:$LINENO: result: none found" >&5 -echo "${ECHO_T}none found" >&6 - echo "You have to install FreeType libary in order to be able to use TTF fonts." - have_ttf=no - fi; - else - TTF_INCLUDES=$ttf_includes - -cat >>confdefs.h <<\_ACEOF -#define HAVE_FREETYPE 1 -_ACEOF - - have_ttf=yes - fi - if test "$have_ttf" = yes; then - if test "x$ttf_includes" = "xno"; then - AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS" - fi - fi -fi; - - - - - - - -AFTERIMAGE_LIBS_EXTERNAL=$AFTERIMAGE_LIBS - - -USE_DEFAULT_AFTERBASE=0 -AFTERBASE_INCS_PATH= -if test "x$with_afterbase" != "xno"; then - echo "$as_me:$LINENO: checking libAfterBase headers in ../libAfterBase" >&5 -echo $ECHO_N "checking libAfterBase headers in ../libAfterBase... $ECHO_C" >&6 - have_afterbase=yes - if test "x$afterbase_includes" = "xno"; then - if test -r "../libAfterBase/astypes.h"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - AFTERBASE_INCS_PATH="../" - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - if test "${ac_cv_header_libAfterBase_astypes_h+set}" = set; then - echo "$as_me:$LINENO: checking for libAfterBase/astypes.h" >&5 -echo $ECHO_N "checking for libAfterBase/astypes.h... $ECHO_C" >&6 -if test "${ac_cv_header_libAfterBase_astypes_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libAfterBase_astypes_h" >&5 -echo "${ECHO_T}$ac_cv_header_libAfterBase_astypes_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking libAfterBase/astypes.h usability" >&5 -echo $ECHO_N "checking libAfterBase/astypes.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking libAfterBase/astypes.h presence" >&5 -echo $ECHO_N "checking libAfterBase/astypes.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libAfterBase/astypes.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libAfterBase/astypes.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for libAfterBase/astypes.h" >&5 -echo $ECHO_N "checking for libAfterBase/astypes.h... $ECHO_C" >&6 -if test "${ac_cv_header_libAfterBase_astypes_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libAfterBase_astypes_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libAfterBase_astypes_h" >&5 -echo "${ECHO_T}$ac_cv_header_libAfterBase_astypes_h" >&6 - -fi -if test $ac_cv_header_libAfterBase_astypes_h = yes; then - USE_DEFAULT_AFTERBASE=1 -else - have_afterbase=no -fi - - - fi - else - AFTERBASE_INCS_PATH="$afterbase_includes/" - echo "$as_me:$LINENO: result: $AFTERBASE_INCS_PATH" >&5 -echo "${ECHO_T}$AFTERBASE_INCS_PATH" >&6 - fi -else - echo "$as_me:$LINENO: checking libAfterBase" >&5 -echo $ECHO_N "checking libAfterBase... $ECHO_C" >&6 -fi - -AFTERBASE_C=afterbase.o -HAVE_AFTERBASE_FLAG=0 -if test "x$have_afterbase" = "xyes"; then - HAVE_AFTERBASE_FLAG=1 - AFTERBASE_C= - if test "x$CYGWIN" = "xno" -a "x$GCC" = "xyes" ; then - user_ldflags="$user_ldflags $RDYNAMIC" - fi - if test "x$have_x" != "xyes" -a "x$have_gif" = "xyes"; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase" - else - AFTERIMAGE_LIBS="-lAfterBase $AFTERIMAGE_LIBS" - fi - if test -r "../libAfterBase/astypes.h"; then - AFTERIMAGE_APPS_LIBS="-L../ -L../../libAfterBase -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_TEST_LIBS="-L./ -L../libAfterBase -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_LIB_LIBS="-L./ -L../libAfterBase $AFTERIMAGE_LIBS" - else - AFTERIMAGE_APPS_LIBS="-L../ -L$libdir -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_TEST_LIBS="-L./ -L$libdir -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_LIB_LIBS="-L./ -L$libdir $AFTERIMAGE_LIBS" - fi - -cat >>confdefs.h <<\_ACEOF -#define HAVE_AFTERBASE 1 -_ACEOF - -else - AFTERIMAGE_APPS_LIBS="-L../ -lAfterImage $AFTERIMAGE_LIBS_EXTERNAL" - AFTERIMAGE_TEST_LIBS="-L./ -lAfterImage $AFTERIMAGE_LIBS_EXTERNAL" - AFTERIMAGE_LIB_LIBS="-L./ $AFTERIMAGE_LIBS_EXTERNAL" - if test "$with_afterbase" = "no"; then - echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6 - fi - - - - - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include <$ac_hdr> - -int -main () -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -_ACEOF - -ac_header_dirent=$ac_hdr; break -fi - -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" - -fi - -else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 -if test "${ac_cv_search_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" - -fi - -fi - - -for ac_header in sys/dirent.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to as-bugs@afterstep.org ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -fi - - - - - - - - - - - -CLEAN_AFTERIMAGE_LIBS= -for L in $AFTERIMAGE_LIBS; do - if test "$L" != "-L$libdir"; then - CLEAN_AFTERIMAGE_LIBS="$CLEAN_AFTERIMAGE_LIBS $L" - fi -done -AFTERIMAGE_LIBS="-L$libdir -lAfterImage $CLEAN_AFTERIMAGE_LIBS" - - -if test "x$enable_staticlibs" = "xyes"; then - LIBPROG='$(LIB_STATIC)' - LIBINSTALL="install.static" - LIBUNINSTALL="install.static" -else - enable_sharedlibs="yes" -fi -if test "x$enable_sharedlibs" = "xyes"; then - if test "x$CYGWIN" = "xyes" ; then - tmp='$(LIB_SHARED_CYG)' - tmp2='install.cyg' - else - tmp='$(LIB_SHARED)' - tmp2='install.dyn' - fi - LIBPROG="$LIBPROG $tmp" - LIBINSTALL="$LIBINSTALL $tmp2" - LIBUNINSTALL="uninstall.static un$tmp2" -fi - -if test "x$enable_xlocale" = "xyes"; then - DEFINE_XLOCALE="-DX_LOCALE" -fi - - -if test "x$enable_i18n" = "xyes"; then -cat >>confdefs.h <<\_ACEOF -#define I18N 1 -_ACEOF - fi -if test "x$enable_audit" = "xyes"; then -cat >>confdefs.h <<\_ACEOF -#define DEBUG_ALLOCS 1 -_ACEOF - fi - - - - - - - - - - - - - - - - - - - -LIBAFTERIMAGEFILES=.shared - - -APPSDEPS= -if test -d apps ; then - APPSDEPS='$(APPS_DEPS)' - ac_config_files="$ac_config_files apps/Makefile" - -fi - -if test -d aftershow ; then - ac_config_files="$ac_config_files aftershow/Makefile" - -fi - - - - ac_config_files="$ac_config_files Makefile afterbase.h afterimage-libs afterimage-config" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by libAfterImage $as_me 1.20, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -libAfterImage config.status 1.20 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2003 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - - - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; - "aftershow/Makefile" ) CONFIG_FILES="$CONFIG_FILES aftershow/Makefile" ;; - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "afterbase.h" ) CONFIG_FILES="$CONFIG_FILES afterbase.h" ;; - "afterimage-libs" ) CONFIG_FILES="$CONFIG_FILES afterimage-libs" ;; - "afterimage-config" ) CONFIG_FILES="$CONFIG_FILES afterimage-config" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.h.in" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@LN_S@,$LN_S,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t -s,@INSTALL@,$INSTALL,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@INSTALL_LIB@,$INSTALL_LIB,;t t -s,@RANLIB@,$RANLIB,;t t -s,@RM@,$RM,;t t -s,@MV@,$MV,;t t -s,@CP@,$CP,;t t -s,@MKDIR@,$MKDIR,;t t -s,@PERL@,$PERL,;t t -s,@FIND@,$FIND,;t t -s,@XARGS@,$XARGS,;t t -s,@LDCONFIG@,$LDCONFIG,;t t -s,@LEX@,$LEX,;t t -s,@LEXLIB@,$LEXLIB,;t t -s,@YACC@,$YACC,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@MMX_CFLAGS@,$MMX_CFLAGS,;t t -s,@CPP@,$CPP,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@EGREP@,$EGREP,;t t -s,@XPM_CFLAGS@,$XPM_CFLAGS,;t t -s,@JPEG_CFLAGS@,$JPEG_CFLAGS,;t t -s,@PNG_CFLAGS@,$PNG_CFLAGS,;t t -s,@GIF_CFLAGS@,$GIF_CFLAGS,;t t -s,@TIFF_CFLAGS@,$TIFF_CFLAGS,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t -s,@SVG_CFLAGS@,$SVG_CFLAGS,;t t -s,@SVG_LIBS@,$SVG_LIBS,;t t -s,@TTF_INCLUDES@,$TTF_INCLUDES,;t t -s,@JPEG_OBJS@,$JPEG_OBJS,;t t -s,@ZLIB_OBJS@,$ZLIB_OBJS,;t t -s,@PNG_OBJS@,$PNG_OBJS,;t t -s,@UNGIF_OBJS@,$UNGIF_OBJS,;t t -s,@AFTERIMAGE_LIBS_EXTERNAL@,$AFTERIMAGE_LIBS_EXTERNAL,;t t -s,@AFTERBASE_INCS_PATH@,$AFTERBASE_INCS_PATH,;t t -s,@USE_DEFAULT_AFTERBASE@,$USE_DEFAULT_AFTERBASE,;t t -s,@HAVE_AFTERBASE_FLAG@,$HAVE_AFTERBASE_FLAG,;t t -s,@AFTERBASE_C@,$AFTERBASE_C,;t t -s,@have_afterbase@,$have_afterbase,;t t -s,@AFTERIMAGE_APPS_LIBS@,$AFTERIMAGE_APPS_LIBS,;t t -s,@AFTERIMAGE_TEST_LIBS@,$AFTERIMAGE_TEST_LIBS,;t t -s,@AFTERIMAGE_LIB_LIBS@,$AFTERIMAGE_LIB_LIBS,;t t -s,@afterimage_x_support@,$afterimage_x_support,;t t -s,@AFTERIMAGE_LIBS@,$AFTERIMAGE_LIBS,;t t -s,@image_format@,$image_format,;t t -s,@version@,$version,;t t -s,@version_major@,$version_major,;t t -s,@lib_name@,$lib_name,;t t -s,@lib_file_name@,$lib_file_name,;t t -s,@with_locale@,$with_locale,;t t -s,@user_ldflags@,$user_ldflags,;t t -s,@x_libs@,$x_libs,;t t -s,@LIBPROG@,$LIBPROG,;t t -s,@LIBINSTALL@,$LIBINSTALL,;t t -s,@DEFINE_XLOCALE@,$DEFINE_XLOCALE,;t t -s,@APPSDEPS@,$APPSDEPS,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -/@LIBAFTERIMAGEFILES@/r $LIBAFTERIMAGEFILES -s,@LIBAFTERIMAGEFILES@,,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file - fi - else - cat $tmp/config.h - rm -f $tmp/config.h - fi -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - - -chmod 755 afterimage-libs diff --git a/graf2d/asimage/src/libAfterImage/configure.in b/graf2d/asimage/src/libAfterImage/configure.in deleted file mode 100644 index 2a479be9e122a..0000000000000 --- a/graf2d/asimage/src/libAfterImage/configure.in +++ /dev/null @@ -1,796 +0,0 @@ -dnl# -*- sh -*- -dnl# Process this file with autoconf to produce a configure script. -dnl# -dnl#Copyright (c) 1998 Michal Vitecek -dnl#Copyright (c) 2001,1998 Sasha Vasko -dnl#Copyright (c) 1998 Juergen Sawinski -dnl#Copyright (c) 1997 1998 Guylhem AZNAR - -AC_INIT(libAfterImage,1.20,as-bugs@afterstep.org,libAfterImage.tar) - -AC_CONFIG_HEADER(config.h:config.h.in) - -version=$PACKAGE_VERSION -version_major="1" -lib_name="LIBAFTERIMAGE" -lib_file_name=$PACKAGE_NAME - -dnl# Setup command-line options - -dnl# we need the standard prefixes defined early -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix="$prefix" -eval "mandir=$mandir" -eval "libdir=$libdir" -eval "includedir=$includedir" - -dnl# compile-time switches -AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [no] ],enable_i18n=$enableval,enable_i18n="no") -AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [no] ],enable_xlocale=$enableval,enable_xlocale="no") -AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ],with_locale=$withval,with_locale="") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterImage statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterImage dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") - -AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [no] ],enable_gdb=$enableval,enable_gdb="no") -AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [no] ],enable_warn=$enableval,enable_warn="no") -AC_ARG_ENABLE(gprof, [ --enable-gprof add gprof symbols (-pg) (for debugging) [no] ],enable_gprof=$enableval,enable_gprof="no") -AC_ARG_ENABLE(audit, [ --enable-audit memory usage audit (for debugging) [no] ],enable_audit=$enableval,enable_audit="no") -AC_ARG_ENABLE(shmimage, [ --enable-shmimage enable usage of MIT shared memory extention for image transfer [no] ],enable_shmimage=$enableval,enable_shmimage="no") -AC_ARG_ENABLE(shaping, [ --enable-shaping enable usage of MIT shaped windows extention [yes] ],enable_shaping=$enableval,enable_shaping="yes") -AC_ARG_ENABLE(glx, [ --enable-glx enable usage of GLX extention [no] ],enable_glx=$enableval,enable_glx="no") - -AC_ARG_ENABLE(mmx_optimization, - [ --enable-mmx-optimization enable utilization of MMX instruction set to speed up imaging operations [yes] ],enable_mmx_optimization=$enableval,enable_mmx_optimization="yes") - -AC_ARG_WITH(jpeg, [ --with-jpeg support JPEG image format [yes]]) -AC_ARG_WITH(jpeg_includes, [ --with-jpeg-includes=DIR use JPEG includes in DIR], jpeg_includes="$withval", jpeg_includes=no) -AC_ARG_WITH(builtin_jpeg, [ --with-builtin-jpeg use included JPEG library [no]],with_builtin_jpeg="$withval",with_builtin_jpeg=no) -AC_ARG_WITH(png, [ --with-png support PNG image format [yes]]) -AC_ARG_WITH(png_includes, [ --with-png-includes=DIR use PNG includes in DIR], png_includes="$withval", png_includes=no) -AC_ARG_WITH(builtin_png, [ --with-builtin-png use included PNG library [no]],with_builtin_png="$withval",with_builtin_png=no) -AC_ARG_WITH(builtin_zlib, [ --with-builtin-zlib use included libZ library (needed for PNG) [no]],with_builtin_zlib="$withval",with_builtin_zlib=no) -AC_ARG_WITH(tiff, [ --with-tiff support TIFF image format [yes]]) -AC_ARG_WITH(tiff_includes, [ --with-tiff-includes=DIR use TIFF includes in DIR], tiff_includes="$withval", tiff_includes=no) -AC_ARG_WITH(svg, [ --with-svg support SVG image format via librsvg [yes]]) - -AC_ARG_WITH(xpm, [ --with-xpm support XPM image format [yes]]) -dnl# libXPM should not be used as an obsolete software ! -with_builtin_xpm=$with_xpm -dnl# AC_ARG_WITH(builtin_xpm, [ --with-builtin-xpm use builtin XPM parsing/handling instead of libXpm [yes]]) -dnl# AC_ARG_WITH(xpm_includes, [ --with-xpm-includes=DIR use libXpm includes in DIR( when builtin XPM handling is disabled )], xpm_includes="$withval", xpm_includes=no) - -dnl# standard libgif/ungif should not be used and considered obsolete! -AC_ARG_WITH(ungif, [ --with-ungif support Uncompressed GIF image format using libungif [no]],with_ungif="$withval",with_ungif=no) -AC_ARG_WITH(gif, [ --with-gif support GIF image format using libgif [no]],with_gif="$withval",with_gif=no) -AC_ARG_WITH(gif_includes, [ --with-gif-includes=DIR use GIF includes in DIR], gif_includes="$withval", gif_includes=no) -AC_ARG_WITH(builtin_gif, [ --with-builtin-gif support Uncompressed GIF image format using builtin libgif [yes]],with_builtin_gif="$withval",with_builtin_gif=yes) - - -AC_ARG_WITH(ttf, [ --with-ttf support True Type Fonts via FreeType library [yes]]) -AC_ARG_WITH(ttf_includes, [ --with-ttf-includes=DIR use FreeType includes in DIR], ttf_includes="$withval", ttf_includes=no) - -AC_ARG_WITH(afterbase, [ --with-afterbase use libAfterBase library of basic functionality [yes]],with_afterbase="$withval",with_afterbase=yes) -AC_ARG_WITH(afterbase_includes, [ --with-afterbase-includes=DIR use libAfterBase includes in DIR],afterbase_includes="$withval",afterbase_includes=no) - -dnl# Check for compiler tools - -AC_PROG_CC -AC_PROG_LN_S -dnl# AC_SUBST(CC) -dnl# AC_SUBST(GCC) - - -AC_CYGWIN -AC_CANONICAL_TARGET - -RDYNAMIC="-rdynamic" - -case "$target" in - *i?86*OpenUNIX*) - RDYNAMIC="-Wl,-Bexport" - ;; - *i?86*sco*) - RDYNAMIC="-Wl,-Bexport" - ;; - *aix*) - RDYNAMIC="-Wl,-bexpall" - ;; - *i?86*freebsd*) - RDYNAMIC="" - ;; - hppa*) - RDYNAMIC="-Wl,-E" - ;; - i?86*solaris*) - RDYNAMIC="" - ;; - sparc*solaris*) - RDYNAMIC="-Wl,-export-dynamic" - ;; - *-apple-darwin*) - RDYNAMIC="-Wl,-Sn" - ;; - *ppc* | *powerpc*) - RDYNAMIC="" - ;; - *) -esac - -if test "x$CYGWIN" = "xno" -a "x$GCC" = "xyes" ; then - if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then - CFLAGS="$CFLAGS -fPIC" - fi -fi - - -if test "x$FROM_AFTERSTEP_CONFIGURE" = "xyes"; then - -dnl# AfterSTep already checked everything for us - aaa=bbb - dnl# AC_PROG_INSTALL - AC_SUBST(INSTALL) - AC_SUBST(INSTALL_PROGRAM) - AC_SUBST(INSTALL_DATA) - AC_SUBST(INSTALL_LIB) - AC_SUBST(RANLIB) - AC_SUBST(RM) - AC_SUBST(MV) - AC_SUBST(CP) - AC_SUBST(MKDIR) - AC_SUBST(PERL) - AC_SUBST(FIND) - AC_SUBST(XARGS) - AC_SUBST(LDCONFIG) - AC_SUBST(LEX) - AC_SUBST(LEXLIB) - AC_SUBST(YACC) - if test "x$have_shmimage" = "xyes"; then - AC_DEFINE(XSHMIMAGE) - fi - if test "x$have_shaping" = "xyes"; then - AC_DEFINE(SHAPE) - fi - -else - -dnl# we are alone - have to do all the checks ourselves : - dnl# Add -Wall - if test "x$GCC" = "xyes"; then - if test -z "`echo $CFLAGS | grep '\-Wall' 2> /dev/null`" ; then - CFLAGS="$CFLAGS -Wall" - fi - fi - - dnl# Add -fPIC for IA64 compilation - - dnl# Add -g - if test "x$enable_gdb" = "xyes"; then - if ! test -n "`echo $CFLAGS' ' | grep '\-g ' 2> /dev/null`" ; then - CFLAGS="$CFLAGS -g" - fi - else - DIRTY_CFLAGS="$CFLAGS" - CFLAGS="-DNO_DEBUG_OUTPUT" - for f in $DIRTY_CFLAGS; do - if test "x$f" != "x-g"; then - CFLAGS="$CFLAGS $f" - fi - done - fi - dnl# Add -pg - if test "x$enable_gprof" = "xyes"; then - CFLAGS="$CFLAGS -pg" - LDFLAGS="$LDFLAGS -pg" - fi - dnl# Add lots more warnings - if test "x$enable_warn" = "xyes"; then - CFLAGS="$CFLAGS -Wuninitialized -Wwrite-strings -Wcast-qual -Wbad-function-cast -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wconversion -Wcomment -Wcast-align -Winline -Wshadow -Wredundant-decls" - fi - AC_PROG_INSTALL - dnl# if the path to the install program is relative, make it absolute - currdir=`pwd` - INSTALL=`echo $INSTALL|sed -e "s@\^\.\.@${currdir}@" -e "s@^autoconf@${currdir}/autoconf@"` - INSTALL_PROGRAM=`echo $INSTALL_PROGRAM|sed -e "s@\^\.\.@${currdir}@" -e "s@^autoconf@${currdir}/autoconf@"` - INSTALL_DATA=`echo $INSTALL_DATA|sed -e "s@\^\.\.@${currdir}@" -e "s@^autoconf@${currdir}/autoconf@"` - INSTALL_LIB=`echo $INSTALL_LIB|sed -e "s@\^\.\.@${currdir}@" -e "s@^autoconf@${currdir}/autoconf@"` - - AC_PROG_RANLIB - AC_PATH_PROG(RM, rm, rm) - AC_PATH_PROG(MV, mv, mv) - AC_PATH_PROG(CP, cp, cp) - AC_PATH_PROG(MKDIR, mkdir, mkdir) - AC_PATH_PROG(PERL, perl, perl) - AC_PATH_PROG(FIND, find, find) - AC_PATH_PROG(XARGS, xargs, xargs) - AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) -fi - -if test "x$enable_gdb" = "xno"; then - DIRTY_CFLAGS="$CFLAGS" - CFLAGS="-O3" - for f in $DIRTY_CFLAGS; do - if test "x$f" != "x-O2" -a "x$f" != "x-O3" -a "x$f" != "x-O"; then - CFLAGS="$CFLAGS $f" - fi - done -fi - - -MMX_CFLAGS="-mmmx -Winline" -have_mmx_intrinsics=no - -dnl# Check for MMX : -if test "x$enable_mmx_optimization" = "xyes"; then - AC_MSG_CHECKING(for MMX support) - - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MMX_CFLAGS" -AC_COMPILE_IFELSE([ -#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) -#error "Need GCC >= 3.4 for MMX intrinsics" -#endif -#include -int main () { - __m64 v = _mm_cvtsi32_si64 (1); - __m64 w = _mm_slli_si64 (v, 1); - v = _mm_add_pi32 (v, w); /* paddd */ - v = _mm_srl_pi32 (v, w); /* psrld */ - return _mm_cvtsi64_si32 (v); -}], have_mmx_intrinsics=yes) - - AC_MSG_RESULT($have_mmx_intrinsics) - CFLAGS=$save_CFLAGS -fi - -if test $have_mmx_intrinsics = yes ; then - AC_DEFINE(HAVE_MMX,1,[Define if CPU supports MMX instructions]) -else - MMX_CFLAGS= -fi -AC_SUBST(MMX_CFLAGS) - -dnl# Check for X : -dnl# check for X, if top level configure script did not do that yet : -afterimage_x_support=yes -if test "x$PATH_XTRA_CHECKED" != "xyes"; then - AC_PATH_XTRA -else - if test "x$have_x" != "xyes"; then - AC_DEFINE(X_DISPLAY_MISSING) - afterimage_x_support=no - fi - -fi - -user_ldflags=$LDFLAGS - -if test "x$have_x" = "xyes"; then - x_libs="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" - if test "x$user_ldflags" = "x"; then - full_x_libs=$x_libs - else - full_x_libs="$user_ldflags $x_libs" - fi - AC_CHECK_LIB(X11, XOpenDisplay, [x_libs="-lX11 $x_libs"],,$full_x_libs) -fi - - - -dnl# some standard checks : -dnl# let's check for endiannes of our box -AC_C_BIGENDIAN -AC_C_INLINE -AC_CHECK_TYPES([long long]) - -dnl# Check for headers -AC_HEADER_TIME -AC_CHECK_HEADERS(sys/wait.h sys/time.h malloc.h stdlib.h unistd.h stddef.h stdarg.h errno.h) - -dnl# Check for X shaped window extension -have_shmimage=no -have_xext_lib=no -if test "x$enable_shmimage" = "xyes"; then - AC_CHECK_LIB(Xext, XShmCreateImage, [have_shmimage=yes],,$full_x_libs) - if test "x$have_shmimage" = "xyes"; then - AC_CHECK_HEADER(sys/ipc.h,,[have_shmimage=no]) - fi - if test "x$have_shmimage" = "xyes"; then - AC_CHECK_HEADER(sys/shm.h,,[have_shmimage=no]) - fi - if test "x$have_shmimage" = "xyes"; then - have_xext_lib=yes - AC_DEFINE(XSHMIMAGE,1,[Define if support for shared memory XImages is available]) - fi -fi - -dnl# Check for X shaped window extension -HAVESHAPE="NOSHAPE" -if test "x$enable_shaping" = "xyes"; then - AC_CHECK_LIB(Xext, XShapeCombineMask, [have_xext_lib=yes;AC_DEFINE(SHAPE,1,Support for shaped windows)],,$full_x_libs) -fi - -if test "x$enable_glx" = "xyes"; then - AC_CHECK_LIB(GL, glDrawPixels, [x_libs="$x_libs -lGL";AC_DEFINE(HAVE_GLX,1,Support for OpenGL extention)],,$full_x_libs) -fi - - -if test "x$have_xext_lib" = "xyes"; then - x_libs="$x_libs -lXext" -fi - -dnl# Check for graphics libraries : - -image_format="xpm" - -AFTERIMAGE_LIBS=$x_libs - -if test "$with_xpm" = no; then - have_xpm=disabled -else - if test "$with_builtin_xpm" = no; then - SAVED_CFLAGS=$CPPFLAGS - if test "x$xpm_includes" != "xno"; then - XPM_CFLAGS="-I$xpm_includes" - CPPFLAGS="$CPPFLAGS $XPM_CFLAGS" - fi - have_libxpm=no - AC_CHECK_HEADER(xpm.h,have_libxpm=yes) - if test "x$have_libxpm" = "xno"; then - AC_CHECK_HEADER(X11/xpm.h,have_libxpm_x11="yes") - if test "x$have_libxpm_x11" = "xyes"; then - AC_DEFINE(HAVE_LIBXPM_X11,1,[Define if support for XPM images should be through libXpm library in Xlib]) - have_libxpm=yes - fi - fi - if test "x$have_libxpm" = "xyes"; then - AC_DEFINE(HAVE_XPM,1,[Define if support for XPM images is desired]) - AC_DEFINE(HAVE_LIBXPM,1,[Define if support for XPM images should be through libXpm]) - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lXpm" - fi - CPPFLAGS=$SAVED_CFLAGS - else - AC_DEFINE(HAVE_XPM,1,[Define if support for XPM images is desired]) - XPM_CFLAGS= - fi -fi -AC_SUBST(XPM_CFLAGS) - -JPEG_OBJS= -ZLIB_OBJS= -PNG_OBJS= - -have_jpeg= - -if test "$with_jpeg" = no; then - have_jpeg=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "x$jpeg_includes" != "xno"; then - JPEG_CFLAGS="-I$jpeg_includes" - CPPFLAGS="$CPPFLAGS $JPEG_CFLAGS" - fi - if test "with_builtin_jpeg" = yes -a ! -f libjpeg/jpeglib.h; then - with_builtin_jpeg=no - fi - if test "$with_builtin_jpeg" = no; then - AC_CHECK_HEADER(jpeglib.h,have_jpeg=yes) - fi - if test "$have_jpeg" = yes; then - AC_DEFINE(HAVE_JPEG,1,[Define if libjpeg is available]) - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -ljpeg" - else - AC_MSG_CHECKING(built-in JPEG library) - if test -f libjpeg/jpeglib.h; then - JPEG_OBJS='$(LIBJPEG_OBJS)' - AC_DEFINE(HAVE_JPEG,1,[Define if libjpeg is available]) - AC_DEFINE(HAVE_BUILTIN_JPEG,1,[Define if using builtin libjpeg]) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - CPPFLAGS=$SAVED_CFLAGS -fi -AC_SUBST(JPEG_CFLAGS) - -dnl# these check are needed by built-in jpeg library : -AC_DEFINE(HAVE_PROTOTYPES,1,We always use function prototypes - not supporting old compilers) -AC_CHECK_TYPE(unsigned char) -AC_CHECK_TYPE(unsigned short) -AC_C_CONST -AC_C_CHAR_UNSIGNED - -have_png=no -have_zlib=no - -if test "$with_png" = no; then - have_png=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "$png_includes" != no; then - PNG_CFLAGS="-I$png_includes" - CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" - fi - if test "$with_builtin_png" = yes -a ! -f libpng/png.h; then - with_builtin_png=no - fi - if test "$with_builtin_zlib" = yes -a ! -f zlib/zlib.h; then - with_builtin_zlib=no - fi - - if test "$with_builtin_png" = no; then - AC_CHECK_HEADER(png.h,[have_png=yes with_builtin_zlib=no]) - fi - if test "$with_builtin_zlib" = no; then - AC_CHECK_HEADERS(zlib.h,[have_zlib=yes],[have_zlib=no]) - fi - if test "$have_png" = yes; then - AC_MSG_CHECKING(for png_get_sRGB in png.h) - AC_EGREP_HEADER(png_get_sRGB,png.h,,have_png=no) - AC_MSG_RESULT($have_png) - fi - if test "$have_png" = yes; then - AC_DEFINE(HAVE_PNG,1,[Define if libpng is available]) - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lpng" - image_format="png" - else - AC_MSG_CHECKING(built-in PNG library) - if test -f libpng/png.h; then - PNG_OBJS='$(LIBPNG_OBJS)' - AC_DEFINE(HAVE_PNG,1,[Define if libpng is available]) - AC_DEFINE(HAVE_BUILTIN_PNG,1,[Define if using builtin libpng]) - AC_MSG_RESULT(yes) - if test "$have_zlib" = no; then - AC_MSG_CHECKING(built-in ZLIB library) - if test -f zlib/zlib.h; then - ZLIB_OBJS='$(ZLIB_OBJS)' - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - image_format="png" - have_png=yes - else - AC_MSG_RESULT(no) - fi - fi - CPPFLAGS=$SAVED_CFLAGS -fi -AC_SUBST(PNG_CFLAGS) -dnl# This is required by built in versions of zlib and libpng : - -dnl# Test for libungif first : -have_gif=no -if test "$with_gif$with_ungif" = nono; then - have_gif=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "$gif_includes" != no; then - GIF_CFLAGS="-I$gif_includes" - CPPFLAGS="$CPPFLAGS $GIF_CFLAGS" - fi - AC_CHECK_HEADER(gif_lib.h,have_gif=yes) - CPPFLAGS=$SAVED_CFLAGS - if test "x$have_gif" = "xyes"; then - AC_DEFINE(HAVE_GIF,1,[Define if libgif is available]) - if test "$with_gif" = no; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lungif" - else - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lgif" - fi - fi -fi - -if test "x$have_gif" != "xyes"; then - if test "x$with_builtin_gif" = "xyes"; then - AC_MSG_CHECKING(using built-in UNGIF library) - if test -f libungif/gif_lib.h; then - UNGIF_OBJS='$(LIBUNGIF_OBJS)' - AC_DEFINE(HAVE_GIF,1,[Define if libgif/ungif is available]) - AC_DEFINE(HAVE_BUILTIN_UNGIF,1,[Define if using builtin libgif]) - AC_MSG_RESULT(yes) - have_gif=yes - else - AC_MSG_RESULT(no) - fi - fi -fi - -AC_SUBST(GIF_CFLAGS) - -dnl# Test for libtiff : - -if test "$with_tiff" = no; then - have_tiff=disabled -else - SAVED_CFLAGS=$CPPFLAGS - if test "$tiff_includes" != no; then - TIFF_CFLAGS="-I$tiff_includes" - CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS" - fi - AC_CHECK_HEADER(tiffio.h,[AC_DEFINE(HAVE_TIFF,1,[Define if libtiff is available]) AFTERIMAGE_LIBS="-ltiff $AFTERIMAGE_LIBS" have_tiff=yes]) - CPPFLAGS=$SAVED_CFLAGS -fi -AC_SUBST(TIFF_CFLAGS) - -if test "$have_tiff" = yes -o "$have_png" = yes ; then - if test "x$ZLIB_OBJS" = "x" -a "$have_zlib" = yes; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lz" - fi -fi - -have_svg= -if test "$with_svg" = no; then - have_svg=disabled -else - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config,no) - fi - if test "$PKG_CONFIG" = "no" ; then - AC_MSG_CHECKING(if librsvg 2.0 is available) - AC_MSG_RESULT(pkg-config is not found. Cannot check for librsvg 2.0.) - have_svg=no - else - have_svg=yes - pkg_modules="librsvg-2.0 >= 2.0.0" - - PKG_CHECK_MODULES(SVG,[$pkg_modules],,[have_svg=no]) - - if test "x$have_svg" = "xyes"; then - AC_DEFINE(HAVE_SVG,1,librsvg v.2.0 or higher is available ) - AFTERIMAGE_LIBS="$SVG_LIBS $AFTERIMAGE_LIBS" - fi - fi -fi - -AC_SUBST(SVG_CFLAGS) - -dnl# we always need libm since we now call exp() in gaussian blur -AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lm" - -dnl# check for libfreetype - -TTF_INCLUDES= - -if test "x$with_ttf" = "xno"; then - have_ttf=disabled -else - if test "x$ttf_includes" = "xno"; then - AC_MSG_CHECKING(headers required by TTF support) - if freetype-config --cflags >/dev/null ;then - present_incs="$CCFLAGS $x_includes"; - for l in `freetype-config --cflags` ; do - inc_found=no - for p in `echo "$present_incs"` ; do - if test "x$l" = "x$p" ; then - inc_found=yes; - fi; - if test "x$l" = "x-I$p" ; then - inc_found=yes; - fi; - done; - if test "x$inc_found" != "xyes" ; then - TTF_INCLUDES="$TTF_INCLUDES $l" ; - fi; - done; - AC_MSG_RESULT($TTF_INCLUDES) - saved_CPPFLAGS=$CPPFLAGS - saved_CFLAGS=$CFLAGS - CPPFLAGS="$TTF_INCLUDES $CPPFLAGS" - CFLAGS="$CFLAGS $TTF_INCLUDES $XPM_CFLAGS $JPEG_CFLAGS $PNG_CFLAGS $GIF_CFLAGS $TIFF_CFLAGS $SVG_CFLAGS $X_CFLAGS" - have_ft2build=no - AC_CHECK_HEADERS(ft2build.h,[have_ft2build=yes]) - AC_MSG_CHECKING( freetype/freetype.h ) - have_ttf=no - have_freetype_freetype=no - have_freetype=no - AC_EGREP_HEADER(FT_Face,freetype/freetype.h, - [have_freetype_freetype=yes], - [AC_MSG_RESULT(no);AC_MSG_CHECKING(freetype.h); \ - AC_EGREP_HEADER(FT_Face,freetype.h, - [have_freetype=yes], AC_MSG_RESULT(no))] - ) - if test "x$have_ft2build" = "xno" ; then - if test "x$have_freetype_freetype" = "xyes" ; then - AC_TRY_RUN([#include - int main(){FT_Face f; return 0;}], - [have_ttf=yes],AC_MSG_RESULT(no)) - elif test "x$have_freetype" = "xyes" ; then - AC_TRY_RUN([#include - int main(){FT_Face f; return 0;}], - [have_ttf=yes],AC_MSG_RESULT(no)) - fi; - elif test "x$have_freetype_freetype" = "xyes" ; then - AC_TRY_RUN([#include - #include - int main(){FT_Face f; return 0;}], - [have_ttf=yes],AC_MSG_RESULT(no)) - elif test "x$have_freetype" = "xyes" ; then - AC_TRY_RUN([#include - #include - int main(){FT_Face f; return 0;}], - [have_ttf=yes],AC_MSG_RESULT(no)) - fi; - if test "x$have_ttf" = "xyes" ; then - AC_DEFINE(HAVE_FREETYPE,1,[Define if libFreeType is available]) - if test "x$have_freetype_freetype" = "xyes" ; then - AC_DEFINE(HAVE_FREETYPE_FREETYPE,1,[Define if libFreeType has freetype.h in freetype/ ]) - fi; - AC_MSG_RESULT(yes) - fi; - CPPFLAGS=$saved_CPPFLAGS - CFLAGS=$saved_CFLAGS - else - enable_ttf=no ; - AC_MSG_RESULT(none found, ttf disabled) - echo "You have to install FreeType libary in order to be able to use TTF fonts." - have_ttf=no - fi; - else - TTF_INCLUDES=$ttf_includes - AC_DEFINE(HAVE_FREETYPE,1,[Define if libFreeType is available]) - have_ttf=yes - fi - if test "$have_ttf" = yes; then - AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS" - fi -fi; -AC_SUBST(TTF_INCLUDES) - -AC_SUBST(JPEG_OBJS) -AC_SUBST(ZLIB_OBJS) -AC_SUBST(PNG_OBJS) -AC_SUBST(UNGIF_OBJS) - -AFTERIMAGE_LIBS_EXTERNAL=$AFTERIMAGE_LIBS -AC_SUBST(AFTERIMAGE_LIBS_EXTERNAL) - -USE_DEFAULT_AFTERBASE=0 -AFTERBASE_INCS_PATH= -if test "x$with_afterbase" != "xno"; then - AC_MSG_CHECKING(libAfterBase headers in ../libAfterBase) - have_afterbase=yes - if test "x$afterbase_includes" = "xno"; then - if test -r "../libAfterBase/astypes.h"; then - AC_MSG_RESULT(yes) - AFTERBASE_INCS_PATH="../" - else - AC_MSG_RESULT(no) - AC_CHECK_HEADER(libAfterBase/astypes.h,[USE_DEFAULT_AFTERBASE=1],[have_afterbase=no]) - fi - else - AFTERBASE_INCS_PATH="$afterbase_includes/" - AC_MSG_RESULT($AFTERBASE_INCS_PATH) - fi -else - AC_MSG_CHECKING(libAfterBase) -fi - -AFTERBASE_C=afterbase.o -HAVE_AFTERBASE_FLAG=0 -if test "x$have_afterbase" = "xyes"; then - HAVE_AFTERBASE_FLAG=1 - AFTERBASE_C= - if test "x$CYGWIN" = "xno" -a "x$GCC" = "xyes" ; then -dnl# rdynamic is only useable if we have libAfterBase's backtrace functionality - user_ldflags="$user_ldflags $RDYNAMIC" - fi - if test "x$have_x" != "xyes" -a "x$have_gif" = "xyes"; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase" - else - AFTERIMAGE_LIBS="-lAfterBase $AFTERIMAGE_LIBS" - fi - if test -r "../libAfterBase/astypes.h"; then - AFTERIMAGE_APPS_LIBS="-L../ -L../../libAfterBase -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_TEST_LIBS="-L./ -L../libAfterBase -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_LIB_LIBS="-L./ -L../libAfterBase $AFTERIMAGE_LIBS" - else - AFTERIMAGE_APPS_LIBS="-L../ -L$libdir -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_TEST_LIBS="-L./ -L$libdir -lAfterImage $AFTERIMAGE_LIBS" - AFTERIMAGE_LIB_LIBS="-L./ -L$libdir $AFTERIMAGE_LIBS" - fi - AC_DEFINE(HAVE_AFTERBASE,1,[Define if libAfterBase is available]) -else - AFTERIMAGE_APPS_LIBS="-L../ -lAfterImage $AFTERIMAGE_LIBS_EXTERNAL" - AFTERIMAGE_TEST_LIBS="-L./ -lAfterImage $AFTERIMAGE_LIBS_EXTERNAL" - AFTERIMAGE_LIB_LIBS="-L./ $AFTERIMAGE_LIBS_EXTERNAL" - if test "$with_afterbase" = "no"; then - AC_MSG_RESULT(disabled) - fi - AC_HEADER_DIRENT - AC_CHECK_HEADERS(sys/dirent.h) -fi -AC_SUBST(AFTERBASE_INCS_PATH) -AC_SUBST(USE_DEFAULT_AFTERBASE) -AC_SUBST(HAVE_AFTERBASE_FLAG) -AC_SUBST(AFTERBASE_C) -AC_SUBST(have_afterbase) -AC_SUBST(AFTERIMAGE_APPS_LIBS) -AC_SUBST(AFTERIMAGE_TEST_LIBS) -AC_SUBST(AFTERIMAGE_LIB_LIBS) -AC_SUBST(afterimage_x_support) - -dnl# finalizing libs listing : - -CLEAN_AFTERIMAGE_LIBS= -for L in $AFTERIMAGE_LIBS; do - if test "$L" != "-L$libdir"; then - CLEAN_AFTERIMAGE_LIBS="$CLEAN_AFTERIMAGE_LIBS $L" - fi -done -AFTERIMAGE_LIBS="-L$libdir -lAfterImage $CLEAN_AFTERIMAGE_LIBS" -AC_SUBST(AFTERIMAGE_LIBS) - -if test "x$enable_staticlibs" = "xyes"; then - LIBPROG='$(LIB_STATIC)' - LIBINSTALL="install.static" - LIBUNINSTALL="install.static" -else - enable_sharedlibs="yes" -fi -if test "x$enable_sharedlibs" = "xyes"; then - if test "x$CYGWIN" = "xyes" ; then - tmp='$(LIB_SHARED_CYG)' - tmp2='install.cyg' - else - tmp='$(LIB_SHARED)' - tmp2='install.dyn' - fi - LIBPROG="$LIBPROG $tmp" - LIBINSTALL="$LIBINSTALL $tmp2" - LIBUNINSTALL="uninstall.static un$tmp2" -fi - -dnl# define X_LOCALE. need Linux, NetBSD and etc. -if test "x$enable_xlocale" = "xyes"; then - DEFINE_XLOCALE="-DX_LOCALE" -fi - -dnl# Translate enable_* from "yes/no" to "1/0" (for configure.h) - -if test "x$enable_i18n" = "xyes"; then AC_DEFINE(I18N,1,[Define if locale support in X is needed]) fi -if test "x$enable_audit" = "xyes"; then AC_DEFINE(DEBUG_ALLOCS,1,[Define if memory allocation logging and debugging is desired]) fi - -dnl# Variable strings declaration - -AC_SUBST(image_format) - -AC_SUBST(CFLAGS) -AC_SUBST(version) -AC_SUBST(version_major) -AC_SUBST(lib_name) -AC_SUBST(lib_file_name) -AC_SUBST(with_locale) -AC_SUBST(user_ldflags) -AC_SUBST(x_libs) -AC_SUBST(X_CFLAGS) -AC_SUBST(LIBPROG) -AC_SUBST(LIBINSTALL) -AC_SUBST(DEFINE_XLOCALE) -AC_SUBST(PERL) - -dnl# Write results -dnl# Common parts of the Makefile - -LIBAFTERIMAGEFILES=.shared -AC_SUBST_FILE(LIBAFTERIMAGEFILES) - -APPSDEPS= -if test -d apps ; then - APPSDEPS='$(APPS_DEPS)' - AC_CONFIG_FILES([apps/Makefile]) -fi - -if test -d aftershow ; then - AC_CONFIG_FILES([aftershow/Makefile]) -fi - -AC_SUBST(APPSDEPS) - -AC_OUTPUT(Makefile \ -afterbase.h \ -afterimage-libs \ -afterimage-config) - -chmod 755 afterimage-libs diff --git a/graf2d/asimage/src/libAfterImage/draw.c b/graf2d/asimage/src/libAfterImage/draw.c index 4ce1f01dc4717..c3d55fe3d4a3b 100644 --- a/graf2d/asimage/src/libAfterImage/draw.c +++ b/graf2d/asimage/src/libAfterImage/draw.c @@ -20,12 +20,6 @@ #undef DEBUG_ELLIPS -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #ifdef _WIN32 #define Long64_t __int64 #else @@ -38,11 +32,7 @@ #include #include #include -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #include "asvisual.h" #include "asimage.h" #include "draw.h" diff --git a/graf2d/asimage/src/libAfterImage/export.c b/graf2d/asimage/src/libAfterImage/export.c index 9c9de56264d3c..e53ce5b979f12 100644 --- a/graf2d/asimage/src/libAfterImage/export.c +++ b/graf2d/asimage/src/libAfterImage/export.c @@ -19,11 +19,6 @@ */ #undef LOCAL_DEBUG -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif #ifdef HAVE_PNG /* Include file for users of png library. */ @@ -69,11 +64,7 @@ #include /* is used for the optional error recovery mechanism */ -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #ifdef HAVE_GIF # include @@ -1222,17 +1213,17 @@ ASImage2tiff( ASImage *im, const char *path, ASImageExportParams *params) TIFF *out; static const ASTiffExportParams defaultsTiff = { ASIT_Tiff, 0, (CARD32)-1, TIFF_COMPRESSION_NONE, 100, 0 }; ASImageExportParams defaults; - uint16 photometric = PHOTOMETRIC_RGB; - tsize_t linebytes, scanline; - ASImageDecoder *imdec ; - CARD32 *r, *g, *b, *a ; - unsigned char* buf; - CARD32 row ; - Bool has_alpha ; - int nsamples = 3 ; - START_TIME(started); - - if( params == NULL ) { + uint16_t photometric = PHOTOMETRIC_RGB; + tsize_t linebytes, scanline; + ASImageDecoder *imdec; + CARD32 *r, *g, *b, *a; + unsigned char *buf; + CARD32 row; + Bool has_alpha; + int nsamples = 3; + START_TIME(started); + + if (params == NULL) { defaults.type = defaultsTiff.type; defaults.tiff = defaultsTiff; params = &defaults ; @@ -1268,15 +1259,15 @@ ASImage2tiff( ASImage *im, const char *path, ASImageExportParams *params) return False; } - TIFFSetField(out, TIFFTAG_IMAGEWIDTH, (uint32) im->width); - TIFFSetField(out, TIFFTAG_IMAGELENGTH, (uint32) im->height); - TIFFSetField(out, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); + TIFFSetField(out, TIFFTAG_IMAGEWIDTH, (uint32_t)im->width); + TIFFSetField(out, TIFFTAG_IMAGELENGTH, (uint32_t)im->height); + TIFFSetField(out, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); TIFFSetField(out, TIFFTAG_SAMPLESPERPIXEL, nsamples); if (has_alpha) { - uint16 v[1]; - v[0] = EXTRASAMPLE_UNASSALPHA; - TIFFSetField(out, TIFFTAG_EXTRASAMPLES, 1, v); + uint16_t v[1]; + v[0] = EXTRASAMPLE_UNASSALPHA; + TIFFSetField(out, TIFFTAG_EXTRASAMPLES, 1, v); } TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 8); diff --git a/graf2d/asimage/src/libAfterImage/imencdec.c b/graf2d/asimage/src/libAfterImage/imencdec.c index ee0f23af4989c..ee9ceb2416a7d 100644 --- a/graf2d/asimage/src/libAfterImage/imencdec.c +++ b/graf2d/asimage/src/libAfterImage/imencdec.c @@ -25,12 +25,6 @@ #undef DEBUG_RECTS2 #endif -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #include #ifdef DO_CLOCKING #if TIME_WITH_SYS_TIME @@ -58,11 +52,7 @@ #include #endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #include "asvisual.h" #include "blender.h" #include "asimage.h" diff --git a/graf2d/asimage/src/libAfterImage/import.c b/graf2d/asimage/src/libAfterImage/import.c index 2b422d011835c..1441eee6cd279 100644 --- a/graf2d/asimage/src/libAfterImage/import.c +++ b/graf2d/asimage/src/libAfterImage/import.c @@ -27,12 +27,6 @@ #undef DO_CLOCKING #undef DEBUG_TRANSP_GIF -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #ifdef HAVE_PNG /* Include file for users of png library. */ #include @@ -79,11 +73,7 @@ #ifdef const #undef const #endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #ifdef HAVE_GIF # include #endif @@ -2172,8 +2162,8 @@ tiff2ASImage( const char * path, ASImageImportParams *params ) if ( 1/* striped image */) { int strip_no; - uint32* bc; - TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc); + uint32_t *bc; + TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc); int all_strip_size = 0; for (strip_no = 0; strip_no < TIFFNumberOfStrips(tif); ++strip_no) all_strip_size += bc[strip_no]; diff --git a/graf2d/asimage/src/libAfterImage/import.h b/graf2d/asimage/src/libAfterImage/import.h index 23980e5457fd9..0060fd4947633 100644 --- a/graf2d/asimage/src/libAfterImage/import.h +++ b/graf2d/asimage/src/libAfterImage/import.h @@ -186,8 +186,6 @@ ASImage *argb2ASImage( const char *path, ASImageImportParams *params ); * files. * After the file is found file2ASImage() attempts to detect file format, * and if it is known it will load it into new ASImage structure. - * EXAMPLE - * asview.c: ASView.2 *********/ /****f* libAfterImage/import/get_asimage() * NAME diff --git a/graf2d/asimage/src/libAfterImage/install-sh b/graf2d/asimage/src/libAfterImage/install-sh deleted file mode 100755 index 6ebe46de6cf49..0000000000000 --- a/graf2d/asimage/src/libAfterImage/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2004-12-17.09 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit 0;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit 0;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/graf2d/asimage/src/libAfterImage/libAfterImage.dsp b/graf2d/asimage/src/libAfterImage/libAfterImage.dsp deleted file mode 100644 index 9f24ff975ddb8..0000000000000 --- a/graf2d/asimage/src/libAfterImage/libAfterImage.dsp +++ /dev/null @@ -1,573 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libAfterImage" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libAfterImage - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libAfterImage.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libAfterImage.mak" CFG="libAfterImage - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libAfterImage - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libAfterImage - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libAfterImage - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NO_DEBUG_OUTPUT" /D "NDEBUG" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"libAfterImage.lib" - -!ELSEIF "$(CFG)" == "libAfterImage - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "win32\Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libAfterImage - Win32 Release" -# Name "libAfterImage - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "PNG Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\libpng\png.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngerror.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngget.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngmem.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngpread.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngread.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngrio.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngrtran.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngrutil.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngset.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngtrans.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngwio.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngwrite.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngwtran.c -# End Source File -# Begin Source File - -SOURCE=.\libpng\pngwutil.c -# End Source File -# End Group -# Begin Group "JPG Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\libjpeg\jcapimin.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcapistd.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jccoefct.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jccolor.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcdctmgr.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jchuff.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcinit.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcmainct.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcmarker.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcmaster.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcomapi.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcparam.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcphuff.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcprepct.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcsample.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jctrans.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdapimin.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdapistd.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdatadst.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdatasrc.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdcoefct.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdcolor.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\transupp.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jaricom.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdarith.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jcarith.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jddctmgr.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdhuff.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdinput.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdmainct.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdmarker.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdmaster.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdmerge.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdpostct.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdsample.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jdtrans.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jerror.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jfdctflt.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jfdctfst.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jfdctint.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jidctflt.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jidctfst.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jidctint.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jmemmgr.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jmemnobs.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jquant1.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jquant2.c -# End Source File -# Begin Source File - -SOURCE=.\libjpeg\jutils.c -# End Source File -# End Group -# Begin Group "ZLIB Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\zlib\adler32.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\compress.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\crc32.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\deflate.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\gzio.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\infback.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\inffast.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\inflate.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\inftrees.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\trees.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\uncompr.c -# End Source File -# Begin Source File - -SOURCE=.\zlib\zutil.c -# End Source File -# End Group -# Begin Group "UNGIF Files" - -# PROP Default_Filter "*.c" -# Begin Source File - -SOURCE=.\libungif\dgif_lib.c -# End Source File -# Begin Source File - -SOURCE=.\libungif\egif_lib.c -# End Source File -# Begin Source File - -SOURCE=.\libungif\gif_err.c -# End Source File -# Begin Source File - -SOURCE=.\libungif\gifalloc.c -# End Source File -# End Group -# Begin Source File - -SOURCE=.\afterbase.c -# End Source File -# Begin Source File - -SOURCE=.\ascmap.c -# End Source File -# Begin Source File - -SOURCE=.\asfont.c -# End Source File -# Begin Source File - -SOURCE=.\asimage.c -# End Source File -# Begin Source File - -SOURCE=.\asstorage.c -# End Source File -# Begin Source File - -SOURCE=.\asvisual.c -# End Source File -# Begin Source File - -SOURCE=.\blender.c -# End Source File -# Begin Source File - -SOURCE=.\bmp.c -# End Source File -# Begin Source File - -SOURCE=.\char2uni.c -# End Source File -# Begin Source File - -SOURCE=.\export.c -# End Source File -# Begin Source File - -SOURCE=.\imencdec.c -# End Source File -# Begin Source File - -SOURCE=.\import.c -# End Source File -# Begin Source File - -SOURCE=.\transform.c -# End Source File -# Begin Source File - -SOURCE=.\ungif.c -# End Source File -# Begin Source File - -SOURCE=.\xcf.c -# End Source File -# Begin Source File - -SOURCE=.\ximage.c -# End Source File -# Begin Source File - -SOURCE=.\xpm.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\win32\afterbase.h -# End Source File -# Begin Source File - -SOURCE=.\afterimage.h -# End Source File -# Begin Source File - -SOURCE=.\ascmap.h -# End Source File -# Begin Source File - -SOURCE=.\asfont.h -# End Source File -# Begin Source File - -SOURCE=.\asim_afterbase.h -# End Source File -# Begin Source File - -SOURCE=.\asimage.h -# End Source File -# Begin Source File - -SOURCE=.\asvisual.h -# End Source File -# Begin Source File - -SOURCE=.\blender.h -# End Source File -# Begin Source File - -SOURCE=.\bmp.h -# End Source File -# Begin Source File - -SOURCE=.\char2uni.h -# End Source File -# Begin Source File - -SOURCE=.\win32\config.h -# End Source File -# Begin Source File - -SOURCE=.\export.h -# End Source File -# Begin Source File - -SOURCE=.\imencdec.h -# End Source File -# Begin Source File - -SOURCE=.\import.h -# End Source File -# Begin Source File - -SOURCE=.\transform.h -# End Source File -# Begin Source File - -SOURCE=.\ungif.h -# End Source File -# Begin Source File - -SOURCE=.\xcf.h -# End Source File -# Begin Source File - -SOURCE=.\ximage.h -# End Source File -# Begin Source File - -SOURCE=.\xpm.h -# End Source File -# Begin Source File - -SOURCE=.\xwrap.h -# End Source File -# End Group -# End Target -# End Project diff --git a/graf2d/asimage/src/libAfterImage/libAfterImage.dsw b/graf2d/asimage/src/libAfterImage/libAfterImage.dsw deleted file mode 100644 index 6966f1d96786b..0000000000000 --- a/graf2d/asimage/src/libAfterImage/libAfterImage.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "asview"=".\win32\asview.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libAfterImage - End Project Dependency -}}} - -############################################################################### - -Project: "libAfterImage"=".\libAfterImage.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/graf2d/asimage/src/libAfterImage/libAfterImage.mak b/graf2d/asimage/src/libAfterImage/libAfterImage.mak deleted file mode 100644 index d6844e6c4c1ed..0000000000000 --- a/graf2d/asimage/src/libAfterImage/libAfterImage.mak +++ /dev/null @@ -1,813 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on libAfterImage.dsp -!IF "$(CFG)" == "" -CFG=libAfterImage - Win32 Debug -!MESSAGE No configuration specified. Defaulting to libAfterImage - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "libAfterImage - Win32 Release" && "$(CFG)" != "libAfterImage - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libAfterImage.mak" CFG="libAfterImage - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libAfterImage - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libAfterImage - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libAfterImage - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release - -ALL : ".\libAfterImage.lib" - - -CLEAN : - -@erase /q "$(INTDIR)" - -@erase ".\libAfterImage.lib" - -DISTCLEAN: CLEAN - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=$(FREETYPEDIRI) /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_DEBUG_OUTPUT" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\libAfterImage.pch" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c $(NMAKECXXFLAGS) -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libAfterImage.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"libAfterImage.lib" -LIB32_OBJS= \ - "$(INTDIR)\png.obj" \ - "$(INTDIR)\pngerror.obj" \ - "$(INTDIR)\pngget.obj" \ - "$(INTDIR)\pngmem.obj" \ - "$(INTDIR)\pngpread.obj" \ - "$(INTDIR)\pngread.obj" \ - "$(INTDIR)\pngrio.obj" \ - "$(INTDIR)\pngrtran.obj" \ - "$(INTDIR)\pngrutil.obj" \ - "$(INTDIR)\pngset.obj" \ - "$(INTDIR)\pngtrans.obj" \ - "$(INTDIR)\pngwio.obj" \ - "$(INTDIR)\pngwrite.obj" \ - "$(INTDIR)\pngwtran.obj" \ - "$(INTDIR)\pngwutil.obj" \ - "$(INTDIR)\jcapimin.obj" \ - "$(INTDIR)\jcapistd.obj" \ - "$(INTDIR)\jccoefct.obj" \ - "$(INTDIR)\jccolor.obj" \ - "$(INTDIR)\jcdctmgr.obj" \ - "$(INTDIR)\jchuff.obj" \ - "$(INTDIR)\jcinit.obj" \ - "$(INTDIR)\jcmainct.obj" \ - "$(INTDIR)\jcmarker.obj" \ - "$(INTDIR)\jcmaster.obj" \ - "$(INTDIR)\jcomapi.obj" \ - "$(INTDIR)\jcparam.obj" \ - "$(INTDIR)\jcphuff.obj" \ - "$(INTDIR)\jcprepct.obj" \ - "$(INTDIR)\jcsample.obj" \ - "$(INTDIR)\jctrans.obj" \ - "$(INTDIR)\jdapimin.obj" \ - "$(INTDIR)\jdapistd.obj" \ - "$(INTDIR)\jdatadst.obj" \ - "$(INTDIR)\jdatasrc.obj" \ - "$(INTDIR)\jdcoefct.obj" \ - "$(INTDIR)\jdcolor.obj" \ - "$(INTDIR)\transupp.obj" \ - "$(INTDIR)\jaricom.obj" \ - "$(INTDIR)\jdarith.obj" \ - "$(INTDIR)\jcarith.obj" \ - "$(INTDIR)\jddctmgr.obj" \ - "$(INTDIR)\jdhuff.obj" \ - "$(INTDIR)\jdinput.obj" \ - "$(INTDIR)\jdmainct.obj" \ - "$(INTDIR)\jdmarker.obj" \ - "$(INTDIR)\jdmaster.obj" \ - "$(INTDIR)\jdmerge.obj" \ - "$(INTDIR)\jdpostct.obj" \ - "$(INTDIR)\jdsample.obj" \ - "$(INTDIR)\jdtrans.obj" \ - "$(INTDIR)\jerror.obj" \ - "$(INTDIR)\jfdctflt.obj" \ - "$(INTDIR)\jfdctfst.obj" \ - "$(INTDIR)\jfdctint.obj" \ - "$(INTDIR)\jidctflt.obj" \ - "$(INTDIR)\jidctfst.obj" \ - "$(INTDIR)\jidctint.obj" \ - "$(INTDIR)\jmemmgr.obj" \ - "$(INTDIR)\jmemnobs.obj" \ - "$(INTDIR)\jquant1.obj" \ - "$(INTDIR)\jquant2.obj" \ - "$(INTDIR)\jutils.obj" \ - "$(INTDIR)\dgif_lib.obj" \ - "$(INTDIR)\egif_lib.obj" \ - "$(INTDIR)\gif_err.obj" \ - "$(INTDIR)\gifalloc.obj" \ - "$(INTDIR)\gif_hash.obj" \ - "$(INTDIR)\afterbase.obj" \ - "$(INTDIR)\ascmap.obj" \ - "$(INTDIR)\asfont.obj" \ - "$(INTDIR)\asimage.obj" \ - "$(INTDIR)\asstorage.obj" \ - "$(INTDIR)\asvisual.obj" \ - "$(INTDIR)\blender.obj" \ - "$(INTDIR)\bmp.obj" \ - "$(INTDIR)\char2uni.obj" \ - "$(INTDIR)\export.obj" \ - "$(INTDIR)\import.obj" \ - "$(INTDIR)\transform.obj" \ - "$(INTDIR)\ungif.obj" \ - "$(INTDIR)\xcf.obj" \ - "$(INTDIR)\ximage.obj" \ - "$(INTDIR)\xpm.obj" \ - "$(INTDIR)\draw.obj" \ - "$(INTDIR)\imencdec.obj" \ - "$(INTDIR)\scanline.obj" - -".\libAfterImage.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "libAfterImage - Win32 Debug" - -OUTDIR=. -INTDIR=.\win32\Debug -# Begin Custom Macros -OutDir=. -# End Custom Macros - -ALL : "$(OUTDIR)\libAfterImage.lib" - - -CLEAN : - -@erase /q "$(INTDIR)" - -@erase "$(OUTDIR)\libAfterImage.lib" - -DISTCLEAN: CLEAN - -"$(INTDIR)" : - if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" - -CPP_PROJ=$(FREETYPEDIRI) /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_DEBUG_OUTPUT" /D "_MBCS" /D "_LIB" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c $(NMAKECXXFLAGS) -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\libAfterImage.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libAfterImage.lib" -LIB32_OBJS= \ - "$(INTDIR)\png.obj" \ - "$(INTDIR)\pngerror.obj" \ - "$(INTDIR)\pngget.obj" \ - "$(INTDIR)\pngmem.obj" \ - "$(INTDIR)\pngpread.obj" \ - "$(INTDIR)\pngread.obj" \ - "$(INTDIR)\pngrio.obj" \ - "$(INTDIR)\pngrtran.obj" \ - "$(INTDIR)\pngrutil.obj" \ - "$(INTDIR)\pngset.obj" \ - "$(INTDIR)\pngtrans.obj" \ - "$(INTDIR)\pngwio.obj" \ - "$(INTDIR)\pngwrite.obj" \ - "$(INTDIR)\pngwtran.obj" \ - "$(INTDIR)\pngwutil.obj" \ - "$(INTDIR)\jcapimin.obj" \ - "$(INTDIR)\jcapistd.obj" \ - "$(INTDIR)\jccoefct.obj" \ - "$(INTDIR)\jccolor.obj" \ - "$(INTDIR)\jcdctmgr.obj" \ - "$(INTDIR)\jchuff.obj" \ - "$(INTDIR)\jcinit.obj" \ - "$(INTDIR)\jcmainct.obj" \ - "$(INTDIR)\jcmarker.obj" \ - "$(INTDIR)\jcmaster.obj" \ - "$(INTDIR)\jcomapi.obj" \ - "$(INTDIR)\jcparam.obj" \ - "$(INTDIR)\jcphuff.obj" \ - "$(INTDIR)\jcprepct.obj" \ - "$(INTDIR)\jcsample.obj" \ - "$(INTDIR)\jctrans.obj" \ - "$(INTDIR)\jdapimin.obj" \ - "$(INTDIR)\jdapistd.obj" \ - "$(INTDIR)\jdatadst.obj" \ - "$(INTDIR)\jdatasrc.obj" \ - "$(INTDIR)\jdcoefct.obj" \ - "$(INTDIR)\jdcolor.obj" \ - "$(INTDIR)\transupp.obj" \ - "$(INTDIR)\jaricom.obj" \ - "$(INTDIR)\jdarith.obj" \ - "$(INTDIR)\jcarith.obj" \ - "$(INTDIR)\jddctmgr.obj" \ - "$(INTDIR)\jdhuff.obj" \ - "$(INTDIR)\jdinput.obj" \ - "$(INTDIR)\jdmainct.obj" \ - "$(INTDIR)\jdmarker.obj" \ - "$(INTDIR)\jdmaster.obj" \ - "$(INTDIR)\jdmerge.obj" \ - "$(INTDIR)\jdpostct.obj" \ - "$(INTDIR)\jdsample.obj" \ - "$(INTDIR)\jdtrans.obj" \ - "$(INTDIR)\jerror.obj" \ - "$(INTDIR)\jfdctflt.obj" \ - "$(INTDIR)\jfdctfst.obj" \ - "$(INTDIR)\jfdctint.obj" \ - "$(INTDIR)\jidctflt.obj" \ - "$(INTDIR)\jidctfst.obj" \ - "$(INTDIR)\jidctint.obj" \ - "$(INTDIR)\jmemmgr.obj" \ - "$(INTDIR)\jmemnobs.obj" \ - "$(INTDIR)\jquant1.obj" \ - "$(INTDIR)\jquant2.obj" \ - "$(INTDIR)\jutils.obj" \ - "$(INTDIR)\dgif_lib.obj" \ - "$(INTDIR)\egif_lib.obj" \ - "$(INTDIR)\gif_err.obj" \ - "$(INTDIR)\gifalloc.obj" \ - "$(INTDIR)\gif_hash.obj" \ - "$(INTDIR)\afterbase.obj" \ - "$(INTDIR)\ascmap.obj" \ - "$(INTDIR)\asfont.obj" \ - "$(INTDIR)\asimage.obj" \ - "$(INTDIR)\asstorage.obj" \ - "$(INTDIR)\asvisual.obj" \ - "$(INTDIR)\blender.obj" \ - "$(INTDIR)\bmp.obj" \ - "$(INTDIR)\char2uni.obj" \ - "$(INTDIR)\export.obj" \ - "$(INTDIR)\import.obj" \ - "$(INTDIR)\transform.obj" \ - "$(INTDIR)\ungif.obj" \ - "$(INTDIR)\xcf.obj" \ - "$(INTDIR)\ximage.obj" \ - "$(INTDIR)\xpm.obj" \ - "$(INTDIR)\draw.obj" \ - "$(INTDIR)\imencdec.obj" \ - "$(INTDIR)\scanline.obj" - -"$(OUTDIR)\libAfterImage.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("libAfterImage.dep") -!INCLUDE "libAfterImage.dep" -!ELSE -!MESSAGE Cannot find "libAfterImage.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "libAfterImage - Win32 Release" || "$(CFG)" == "libAfterImage - Win32 Debug" -SOURCE=.\libpng\png.c - -"$(INTDIR)\png.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngerror.c - -"$(INTDIR)\pngerror.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngget.c - -"$(INTDIR)\pngget.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngmem.c - -"$(INTDIR)\pngmem.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngpread.c - -"$(INTDIR)\pngpread.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngread.c - -"$(INTDIR)\pngread.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngrio.c - -"$(INTDIR)\pngrio.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngrtran.c - -"$(INTDIR)\pngrtran.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngrutil.c - -"$(INTDIR)\pngrutil.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngset.c - -"$(INTDIR)\pngset.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngtrans.c - -"$(INTDIR)\pngtrans.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngwio.c - -"$(INTDIR)\pngwio.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngwrite.c - -"$(INTDIR)\pngwrite.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngwtran.c - -"$(INTDIR)\pngwtran.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libpng\pngwutil.c - -"$(INTDIR)\pngwutil.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcapimin.c - -"$(INTDIR)\jcapimin.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcapistd.c - -"$(INTDIR)\jcapistd.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jccoefct.c - -"$(INTDIR)\jccoefct.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jccolor.c - -"$(INTDIR)\jccolor.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcdctmgr.c - -"$(INTDIR)\jcdctmgr.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jchuff.c - -"$(INTDIR)\jchuff.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcinit.c - -"$(INTDIR)\jcinit.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcmainct.c - -"$(INTDIR)\jcmainct.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcmarker.c - -"$(INTDIR)\jcmarker.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcmaster.c - -"$(INTDIR)\jcmaster.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcomapi.c - -"$(INTDIR)\jcomapi.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcparam.c - -"$(INTDIR)\jcparam.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcphuff.c - -"$(INTDIR)\jcphuff.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcprepct.c - -"$(INTDIR)\jcprepct.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcsample.c - -"$(INTDIR)\jcsample.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jctrans.c - -"$(INTDIR)\jctrans.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdapimin.c - -"$(INTDIR)\jdapimin.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdapistd.c - -"$(INTDIR)\jdapistd.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdatadst.c - -"$(INTDIR)\jdatadst.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdatasrc.c - -"$(INTDIR)\jdatasrc.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdcoefct.c - -"$(INTDIR)\jdcoefct.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdcolor.c - -"$(INTDIR)\jdcolor.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\transupp.c - -"$(INTDIR)\transupp.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jaricom.c - -"$(INTDIR)\jaricom.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdarith.c - -"$(INTDIR)\jdarith.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jcarith.c - -"$(INTDIR)\jcarith.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jddctmgr.c - -"$(INTDIR)\jddctmgr.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdhuff.c - -"$(INTDIR)\jdhuff.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdinput.c - -"$(INTDIR)\jdinput.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdmainct.c - -"$(INTDIR)\jdmainct.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdmarker.c - -"$(INTDIR)\jdmarker.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdmaster.c - -"$(INTDIR)\jdmaster.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdmerge.c - -"$(INTDIR)\jdmerge.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdpostct.c - -"$(INTDIR)\jdpostct.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdsample.c - -"$(INTDIR)\jdsample.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jdtrans.c - -"$(INTDIR)\jdtrans.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jerror.c - -"$(INTDIR)\jerror.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jfdctflt.c - -"$(INTDIR)\jfdctflt.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jfdctfst.c - -"$(INTDIR)\jfdctfst.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jfdctint.c - -"$(INTDIR)\jfdctint.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jidctflt.c - -"$(INTDIR)\jidctflt.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jidctfst.c - -"$(INTDIR)\jidctfst.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jidctint.c - -"$(INTDIR)\jidctint.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jmemmgr.c - -"$(INTDIR)\jmemmgr.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jmemnobs.c - -"$(INTDIR)\jmemnobs.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jquant1.c - -"$(INTDIR)\jquant1.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jquant2.c - -"$(INTDIR)\jquant2.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libjpeg\jutils.c - -"$(INTDIR)\jutils.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libungif\dgif_lib.c - -"$(INTDIR)\dgif_lib.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libungif\egif_lib.c - -"$(INTDIR)\egif_lib.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libungif\gif_err.c - -"$(INTDIR)\gif_err.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libungif\gifalloc.c - -"$(INTDIR)\gifalloc.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\libungif\gif_hash.c - -"$(INTDIR)\gif_hash.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\afterbase.c - -"$(INTDIR)\afterbase.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ascmap.c - -"$(INTDIR)\ascmap.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\asfont.c - -"$(INTDIR)\asfont.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\asimage.c - -"$(INTDIR)\asimage.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\asstorage.c - -"$(INTDIR)\asstorage.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\asvisual.c - -"$(INTDIR)\asvisual.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\blender.c - -"$(INTDIR)\blender.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\bmp.c - -"$(INTDIR)\bmp.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\char2uni.c - -"$(INTDIR)\char2uni.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\export.c - -"$(INTDIR)\export.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\imencdec.c - -"$(INTDIR)\imencdec.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\import.c - -"$(INTDIR)\import.obj" : $(SOURCE) "$(INTDIR)" - - -"$(INTDIR)\transform.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ungif.c - -"$(INTDIR)\ungif.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\xcf.c - -"$(INTDIR)\xcf.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\ximage.c - -"$(INTDIR)\ximage.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\xpm.c - -"$(INTDIR)\xpm.obj" : $(SOURCE) "$(INTDIR)" - -SOURCE=.\draw.c - -"$(INTDIR)\draw.obj" : $(SOURCE) "$(INTDIR)" - -SOURCE=.\scanline.c - -"$(INTDIR)\scanline.obj" : $(SOURCE) "$(INTDIR)" - - -!ENDIF - diff --git a/graf2d/asimage/src/libAfterImage/scanline.c b/graf2d/asimage/src/libAfterImage/scanline.c index b8cbd1dde8260..a35eee93e2c07 100644 --- a/graf2d/asimage/src/libAfterImage/scanline.c +++ b/graf2d/asimage/src/libAfterImage/scanline.c @@ -16,12 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #define LOCAL_DEBUG #include #ifdef HAVE_UNISTD_H @@ -33,12 +27,8 @@ #ifdef HAVE_STDARG_H #include #endif - -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif + +#include "afterbase.h" #include "scanline.h" diff --git a/graf2d/asimage/src/libAfterImage/test_mmx.c b/graf2d/asimage/src/libAfterImage/test_mmx.c index 4afdc61c84c62..0703071ac9e75 100644 --- a/graf2d/asimage/src/libAfterImage/test_mmx.c +++ b/graf2d/asimage/src/libAfterImage/test_mmx.c @@ -24,11 +24,7 @@ #undef DEBUG_RECTS2 #endif -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif +#include "afterbase.h" #include diff --git a/graf2d/asimage/src/libAfterImage/transform.c b/graf2d/asimage/src/libAfterImage/transform.c index 9c86e3ac9772a..2c490033338c3 100644 --- a/graf2d/asimage/src/libAfterImage/transform.c +++ b/graf2d/asimage/src/libAfterImage/transform.c @@ -23,11 +23,6 @@ #define USE_64BIT_FPU #undef NEED_RBITSHIFT_FUNCS -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif //#undef HAVE_MMX #ifdef DO_CLOCKING @@ -58,11 +53,7 @@ #include #endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else # include "afterbase.h" -#endif #include "asvisual.h" #include "blender.h" #include "asimage.h" diff --git a/graf2d/asimage/src/libAfterImage/ungif.c b/graf2d/asimage/src/libAfterImage/ungif.c index c9679bfd86f9f..30588d47407d9 100644 --- a/graf2d/asimage/src/libAfterImage/ungif.c +++ b/graf2d/asimage/src/libAfterImage/ungif.c @@ -19,12 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - /*#define LOCAL_DEBUG */ /*#define DO_CLOCKING */ @@ -50,11 +44,7 @@ #include #include -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #ifdef HAVE_GIF # include #endif diff --git a/graf2d/asimage/src/libAfterImage/win32/StdAfx.cpp b/graf2d/asimage/src/libAfterImage/win32/StdAfx.cpp deleted file mode 100644 index 0719ce237d290..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// asview.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/graf2d/asimage/src/libAfterImage/win32/StdAfx.h b/graf2d/asimage/src/libAfterImage/win32/StdAfx.h deleted file mode 100644 index ae1ba446d2356..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/StdAfx.h +++ /dev/null @@ -1,28 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) -#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -#include - - -// TODO: reference additional headers your program requires here -#include "config.h" -#include -#include "afterbase.h" -#include "../afterimage.h" -#include "../bmp.h" - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) diff --git a/graf2d/asimage/src/libAfterImage/win32/afterbase.h b/graf2d/asimage/src/libAfterImage/win32/afterbase.h deleted file mode 100644 index 39cf553d03c97..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/afterbase.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef AFTERBASE_H_HEADER_INCLUDED -#define AFTERBASE_H_HEADER_INCLUDED - -#define HAVE_AFTERBASE_FLAG 0 - - -# include "../asim_afterbase.h" - -#define R_OK 04 - -#endif /* AFTERBASE_H_HEADER_INCLUDED */ - diff --git a/graf2d/asimage/src/libAfterImage/win32/asview.cpp b/graf2d/asimage/src/libAfterImage/win32/asview.cpp deleted file mode 100644 index 5f89d0aad5f33..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/asview.cpp +++ /dev/null @@ -1,159 +0,0 @@ -// asview.cpp : Defines the entry point for the application. -// - -#include "stdafx.h" - -void usage() -{ - printf( "Usage: asview [-h]|[image]\n"); - printf( "Where: image - filename of the image to display.\n"); -} - -LRESULT CALLBACK MyWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -void show_system_error(); - - -HINSTANCE hinst; -HWND hWnd = NULL ; -void *bmbits = NULL ; -BITMAPINFO *bmi = NULL ; - - -int APIENTRY -WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int nCmdShow) -{ - char *image_file = "../apps/rose512.jpg" ; - -// char *image_file = "../apps/fore.xpm" ; - ASImage *im ; - WNDCLASSEX wnd_class ; - ASVisual *asv ; - MSG msg; - - if( lpCmdLine != NULL && strncmp( lpCmdLine, "-h", 2 ) == 0 ) - { - usage(); - return 0; - }else if( lpCmdLine != NULL && strlen(lpCmdLine) > 0 ) - image_file = lpCmdLine ; - else - usage(); - - if( image_file[0] == '\"' ) - { - int i = 0; - while( image_file[i+1] != '\0' && image_file[i+1] != '\"') - { - image_file[i] = image_file[i+1] ; - ++i ; - } - image_file[i] = '\0' ; - } - - asv = create_asvisual( NULL, 0, 0, NULL ); - - im = file2ASImage( image_file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL ); - if( im == NULL ) - { - MessageBox( NULL, "Unable to load image from file.", image_file, MB_OK | MB_ICONINFORMATION ); - return 0 ; - } - - /* converting result into BMP file ( as an example ) */ - /* ASImage2file( im, NULL, "asview.bmp", ASIT_Bmp, NULL ); */ - - /* The following could be used to dump JPEG version of the image into - * stdout : */ - /* ASImage2file( im, NULL, NULL, ASIT_Jpeg, NULL ); */ - - - bmbits = NULL ; - // Convert ASImage into DIB: - bmi = ASImage2DBI( asv, im, 0, 0, im->width, im->height, &bmbits ); - - if( bmi == NULL ) - { - MessageBox( NULL, "Failed to convert image into Windows bitmap.", image_file, MB_OK | MB_ICONINFORMATION ); - return 0 ; - } - - memset( &wnd_class, 0x00, sizeof(wnd_class)); - wnd_class.cbSize = sizeof(wnd_class); - wnd_class.hInstance = hInstance ; - wnd_class.lpszClassName = "ASView" ; - wnd_class.lpfnWndProc = MyWindowProc ; - wnd_class.hIcon = LoadIcon((HINSTANCE) NULL, IDI_APPLICATION); - wnd_class.hCursor = LoadCursor((HINSTANCE) NULL, IDC_ARROW); - wnd_class.hbrBackground = (struct HBRUSH__ *)GetStockObject(WHITE_BRUSH); - - if( !RegisterClassEx( &wnd_class ) ) - { - show_system_error(); - return 0 ; - } - - hinst = hInstance ; - /* Now let us create a window and display image in that window : */ - hWnd = CreateWindow( "ASView", image_file, - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, - bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - (HWND) NULL, (HMENU)NULL, hinst, NULL ); - if (!hWnd) - { - show_system_error(); - return FALSE; - } - - // Show the window and paint its contents. - ShowWindow(hWnd, nCmdShow); - UpdateWindow(hWnd); - - // Start the message loop. - while (GetMessage(&msg, hWnd, 0, 0) > 0 ) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return 0; -} - -LRESULT CALLBACK -MyWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if( uMsg == WM_PAINT ) - { - // Paint image in responce to WM_PAINT event : - if( bmi != NULL && bmbits != NULL ) - { - PAINTSTRUCT ps ; - HDC dc = BeginPaint(hWnd, &ps ); - StretchDIBits( dc, // handle to device context - 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - bmbits, bmi, DIB_RGB_COLORS, SRCCOPY ); - EndPaint(hWnd, &ps ); - - } - return 0; - } - - return DefWindowProc( hwnd, uMsg, wParam, lParam ) ; -} - -void -show_system_error() -{ - LPVOID lpMsgBuf; - FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, - 0, NULL ); - MessageBox( NULL, (LPCTSTR)lpMsgBuf, "ASView System Error", MB_OK | MB_ICONINFORMATION ); - // Free the buffer. - LocalFree( lpMsgBuf ); -} - - diff --git a/graf2d/asimage/src/libAfterImage/win32/asview.dsp b/graf2d/asimage/src/libAfterImage/win32/asview.dsp deleted file mode 100644 index af83fef23adc9..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/asview.dsp +++ /dev/null @@ -1,122 +0,0 @@ -# Microsoft Developer Studio Project File - Name="asview" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=asview - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "asview.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "asview.mak" CFG="asview - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "asview - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "asview - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "asview - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"LIBCD" /nodefaultlib:"LIBC" /out:"asview.exe" /editandcontinue:NO -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "asview - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "asview___Win32_Debug" -# PROP BASE Intermediate_Dir "asview___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"LIBC" /out:"asview.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "asview - Win32 Release" -# Name "asview - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\asview.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=..\libAfterImage.lib -# End Source File -# End Target -# End Project diff --git a/graf2d/asimage/src/libAfterImage/win32/asview.mak b/graf2d/asimage/src/libAfterImage/win32/asview.mak deleted file mode 100644 index ee1bd8cd616e9..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/asview.mak +++ /dev/null @@ -1,229 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on asview.dsp -!IF "$(CFG)" == "" -CFG=asview - Win32 Debug -!MESSAGE No configuration specified. Defaulting to asview - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "asview - Win32 Release" && "$(CFG)" != "asview - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "asview.mak" CFG="asview - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "asview - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "asview - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "asview - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : ".\asview.exe" - -!ELSE - -ALL : "libAfterImage - Win32 Release" ".\asview.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libAfterImage - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\asview.obj" - -@erase "$(INTDIR)\asview.pch" - -@erase "$(INTDIR)\StdAfx.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase ".\asview.exe" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\asview.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\asview.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\asview.pdb" /machine:I386 /nodefaultlib:"LIBCD" /out:"asview.exe" /editandcontinue:NO -LINK32_OBJS= \ - "$(INTDIR)\asview.obj" \ - "$(INTDIR)\StdAfx.obj" \ - "..\libAfterImage.lib" - -".\asview.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "asview - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug - -!IF "$(RECURSE)" == "0" - -ALL : ".\asview.exe" - -!ELSE - -ALL : "libAfterImage - Win32 Debug" ".\asview.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libAfterImage - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\asview.obj" - -@erase "$(INTDIR)\asview.pch" - -@erase "$(INTDIR)\StdAfx.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\asview.pdb" - -@erase ".\asview.exe" - -@erase ".\asview.ilk" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\asview.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\asview.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\asview.pdb" /debug /machine:I386 /nodefaultlib:"LIBC" /out:"asview.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\asview.obj" \ - "$(INTDIR)\StdAfx.obj" \ - "..\libAfterImage.lib" - -".\asview.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("asview.dep") -!INCLUDE "asview.dep" -!ELSE -!MESSAGE Warning: cannot find "asview.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "asview - Win32 Release" || "$(CFG)" == "asview - Win32 Debug" -SOURCE=.\asview.cpp - -"$(INTDIR)\asview.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\asview.pch" - - -SOURCE=.\StdAfx.cpp - -!IF "$(CFG)" == "asview - Win32 Release" - -CPP_SWITCHES=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\asview.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -"$(INTDIR)\StdAfx.obj" "$(INTDIR)\asview.pch" : $(SOURCE) "$(INTDIR)" - $(CPP) @<< - $(CPP_SWITCHES) $(SOURCE) -<< - - -!ELSEIF "$(CFG)" == "asview - Win32 Debug" - -CPP_SWITCHES=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\asview.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -"$(INTDIR)\StdAfx.obj" "$(INTDIR)\asview.pch" : $(SOURCE) "$(INTDIR)" - $(CPP) @<< - $(CPP_SWITCHES) $(SOURCE) -<< - - -!ENDIF - -!IF "$(CFG)" == "asview - Win32 Release" - -"libAfterImage - Win32 Release" : - cd "\devel\AfterStep\afterstep-stable\libAfterImage" - $(MAKE) /$(MAKEFLAGS) /F ".\libAfterImage.mak" CFG="libAfterImage - Win32 Release" - cd ".\win32" - -"libAfterImage - Win32 ReleaseCLEAN" : - cd "\devel\AfterStep\afterstep-stable\libAfterImage" - $(MAKE) /$(MAKEFLAGS) /F ".\libAfterImage.mak" CFG="libAfterImage - Win32 Release" RECURSE=1 CLEAN - cd ".\win32" - -!ELSEIF "$(CFG)" == "asview - Win32 Debug" - -"libAfterImage - Win32 Debug" : - cd "\devel\AfterStep\afterstep-stable\libAfterImage" - $(MAKE) /$(MAKEFLAGS) /F ".\libAfterImage.mak" CFG="libAfterImage - Win32 Debug" - cd ".\win32" - -"libAfterImage - Win32 DebugCLEAN" : - cd "\devel\AfterStep\afterstep-stable\libAfterImage" - $(MAKE) /$(MAKEFLAGS) /F ".\libAfterImage.mak" CFG="libAfterImage - Win32 Debug" RECURSE=1 CLEAN - cd ".\win32" - -!ENDIF - - -!ENDIF - diff --git a/graf2d/asimage/src/libAfterImage/win32/config.h b/graf2d/asimage/src/libAfterImage/win32/config.h deleted file mode 100644 index 698e7f88030fa..0000000000000 --- a/graf2d/asimage/src/libAfterImage/win32/config.h +++ /dev/null @@ -1,174 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ -#ifndef WIN32_CONFIG_H -#define WIN32_CONFIG_H -/* Define if memory allocation logging and debugging is desired */ -#undef DEBUG_ALLOCS - -/* Define if libAfterBase is available */ -#undef HAVE_AFTERBASE - -#define HAVE_UNSIGNED_CHAR -#define HAVE_UNSIGNED_SHORT -#define HAVE_BOOLEAN -typedef unsigned char boolean; - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define if libFreeType is available - should always be under win32 ! */ -#define HAVE_FREETYPE 1 - -/* Define if libFreeType is available */ -#define HAVE_FREETYPE_FREETYPE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FT2BUILD_H 1 - -/* Define if libgif is available */ -#define HAVE_GIF - -#if _MSC_VER >= 1400 -#define NO_DOUBLE_FCLOSE_AFTER_FDOPEN -#else -/*#undef NO_DOUBLE_FCLOSE_AFTER_FDOPEN */ -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define if libjpeg is available */ -#define HAVE_JPEG 1 - -/* Define if support for XPM images should be through libXpm */ -#undef HAVE_LIBXPM - -/* Define if support for XPM images should be through libXpm library in Xlib - */ -#undef HAVE_LIBXPM_X11 - -/* Define to 1 if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if CPU supports MMX instructions */ -#undef HAVE_MMX - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define if libpng is available */ -#define HAVE_PNG 1 - -/* We always use function prototypes - not supporting old compilers */ -#define HAVE_PROTOTYPES 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDARG_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H /* VC++ does not have that ! */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_DIRENT_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if libtiff is available */ -#undef HAVE_TIFF - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if support for XPM images is desired */ -#define HAVE_XPM 1 - -/* Define to 1 if you have the header file. */ -// 16 Mar 2026: With a system or builtin zlib, the file is there by definition -#define HAVE_ZLIB_H 1 - -/* Define if locale support in X is needed */ -#undef I18N - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "as-bugs@afterstep.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libAfterImage" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libAfterImage 0.99" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libAfterImage.tar" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.99" - -/* Support for shaped windows */ -#undef SHAPE - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* Define if support for shared memory XImages is available */ -#undef XSHMIMAGE - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Define to 1 if type `char' is unsigned and you are not using gcc. */ -#ifndef __CHAR_UNSIGNED__ -# undef __CHAR_UNSIGNED__ -#endif - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -#define inline - -#endif \ No newline at end of file diff --git a/graf2d/asimage/src/libAfterImage/xcf.c b/graf2d/asimage/src/libAfterImage/xcf.c index 1718dc0cb7d0c..cee13caec0f7b 100644 --- a/graf2d/asimage/src/libAfterImage/xcf.c +++ b/graf2d/asimage/src/libAfterImage/xcf.c @@ -18,12 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - /*#define LOCAL_DEBUG*/ /*#define DO_CLOCKING*/ @@ -42,11 +36,7 @@ # endif #endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #include "asimage.h" #include "xcf.h" diff --git a/graf2d/asimage/src/libAfterImage/ximage.c b/graf2d/asimage/src/libAfterImage/ximage.c index 5c2577eb792d0..118630c4232c4 100644 --- a/graf2d/asimage/src/libAfterImage/ximage.c +++ b/graf2d/asimage/src/libAfterImage/ximage.c @@ -16,12 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef _WIN32 -#include "win32/config.h" -#else -#include "config.h" -#endif - #undef LOCAL_DEBUG #define DO_CLOCKING @@ -47,12 +41,7 @@ /*# include */ #endif - -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #include "asvisual.h" #include "blender.h" #include "asimage.h" diff --git a/graf2d/asimage/src/libAfterImage/ximage.h b/graf2d/asimage/src/libAfterImage/ximage.h index b88d2e70e71bf..313f9d8d3c093 100644 --- a/graf2d/asimage/src/libAfterImage/ximage.h +++ b/graf2d/asimage/src/libAfterImage/ximage.h @@ -298,8 +298,6 @@ ASImage *pixmap2asimage (struct ASVisual *asv, Pixmap p, int x, int y, * asimage2pixmap() creates new pixmap of exactly same size as * supplied ASImage. It then calls asimage2drawable to copy entire content * of the ASImage onto that created pixmap. - * EXAMPLE - * asview.c: ASView.5 * SEE ALSO * asimage2ximage() * asimage2drawable() diff --git a/graf2d/asimage/src/libAfterImage/xpm.c b/graf2d/asimage/src/libAfterImage/xpm.c index 006e8e1d29053..d5ee59bf6c1c2 100644 --- a/graf2d/asimage/src/libAfterImage/xpm.c +++ b/graf2d/asimage/src/libAfterImage/xpm.c @@ -22,11 +22,8 @@ #undef DO_CLOCKING #ifdef _WIN32 -#include "win32/config.h" #include #define read _read -#else -#include "config.h" #endif #ifdef HAVE_XPM @@ -66,11 +63,7 @@ #endif #endif -#ifdef _WIN32 -# include "win32/afterbase.h" -#else -# include "afterbase.h" -#endif +#include "afterbase.h" #include "asimage.h" #include "ascmap.h" #include "xpm.h" From 2b4f2a3cc64dd332222302933a2e8d11717258bc Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Mon, 6 Apr 2026 11:28:02 +0200 Subject: [PATCH 5/5] [afterimage] silence many warnings --- graf2d/asimage/src/libAfterImage/afterbase.c | 131 ++++-- graf2d/asimage/src/libAfterImage/ascmap.c | 33 +- graf2d/asimage/src/libAfterImage/asfont.c | 159 +++---- .../src/libAfterImage/asim_afterbase.h | 6 +- graf2d/asimage/src/libAfterImage/asimage.c | 30 +- graf2d/asimage/src/libAfterImage/asimage.h | 43 +- graf2d/asimage/src/libAfterImage/asstorage.c | 23 +- graf2d/asimage/src/libAfterImage/asvisual.c | 240 ++++++++--- graf2d/asimage/src/libAfterImage/blender.c | 37 +- graf2d/asimage/src/libAfterImage/bmp.c | 35 +- graf2d/asimage/src/libAfterImage/char2uni.c | 12 +- graf2d/asimage/src/libAfterImage/draw.c | 4 +- graf2d/asimage/src/libAfterImage/export.c | 32 +- graf2d/asimage/src/libAfterImage/imencdec.c | 89 ++-- graf2d/asimage/src/libAfterImage/import.c | 398 ++++++++++-------- graf2d/asimage/src/libAfterImage/scanline.c | 23 +- graf2d/asimage/src/libAfterImage/transform.c | 281 ++++++------- graf2d/asimage/src/libAfterImage/ungif.c | 2 +- graf2d/asimage/src/libAfterImage/xcf.c | 18 +- graf2d/asimage/src/libAfterImage/ximage.c | 124 ++++-- graf2d/asimage/src/libAfterImage/xpm.c | 52 +-- 21 files changed, 1055 insertions(+), 717 deletions(-) diff --git a/graf2d/asimage/src/libAfterImage/afterbase.c b/graf2d/asimage/src/libAfterImage/afterbase.c index 106c6be4f709a..0456fd9b23cfc 100644 --- a/graf2d/asimage/src/libAfterImage/afterbase.c +++ b/graf2d/asimage/src/libAfterImage/afterbase.c @@ -186,7 +186,9 @@ void asim_nonGNUC_debugout( const char *format, ...) } void asim_nonGNUC_debugout_stub( const char *format, ...) -{} +{ + (void)format; // silence unused variable warning +} /* from libAfterBase/fs.c : */ @@ -194,8 +196,8 @@ int asim_check_file_mode (const char *file, int mode) { struct stat st; - if ((stat (file, &st) == -1) || (st.st_mode & S_IFMT) != mode) - return (-1); + if ((stat(file, &st) == -1) || (int)(st.st_mode & S_IFMT) != mode) + return (-1); else return (0); } @@ -534,9 +536,8 @@ asim_mystrncasecmp (const char *s1, const char *s2, size_t n) if (s1 == NULL || s2 == NULL) return (s1 == s2) ? 0 : ((s1==NULL)?1:-1); - while( i < n ) - { - c1 = s1[i], c2 = s2[i]; + while ((size_t)i < n) { + c1 = s1[i], c2 = s2[i]; ++i ; if (c1==0) return -c2; @@ -546,8 +547,8 @@ asim_mystrncasecmp (const char *s1, const char *s2, size_t n) c2 = tolower(c2); if (c1 != c2) return (c1 - c2); - } - return 0; + } + return 0; } #ifdef X_DISPLAY_MISSING @@ -624,28 +625,28 @@ const char *asim_parse_argb_color( const char *color, CARD32 *pargb ) } }else if( *color ) { - /* does not really matter here what screen to use : */ - Display *dpy = get_default_asvisual()->dpy; #ifdef X_DISPLAY_MISSING register const char *ptr = &(color[0]); if(!FindColor(color, pargb)) return color; - while( !isspace((int)*ptr) && *ptr != '\0' ) ptr++; - return ptr; + while (!isspace((int)*ptr) && *ptr != '\0') + ptr++; + return ptr; #else - if( dpy == NULL ) + /* does not really matter here what screen to use : */ + Display *dpy = get_default_asvisual()->dpy; + if( dpy == NULL ) return color ; else { - register const char *ptr = &(color[0]); -#ifndef X_DISPLAY_MISSING - XColor xcol, xcol_scr ; + register const char *ptr = &(color[0]); + XColor xcol, xcol_scr ; /* XXX Not sure if Scr.asv->colormap is always defined here. If not, ** change back to DefaultColormap(dpy,DefaultScreen(dpy)). */ if( XLookupColor( dpy, DefaultColormap(dpy,DefaultScreen(dpy)), color, &xcol, &xcol_scr) ) - *pargb = 0xFF000000|((xcol.red<<8)&0x00FF0000)|(xcol.green&0x0000FF00)|((xcol.blue>>8)&0x000000FF); -#endif - while( !isspace((int)*ptr) && *ptr != '\0' ) ptr++; + *pargb = 0xFF000000 | ((xcol.red << 8) & 0x00FF0000) | (xcol.green & 0x0000FF00) | + ((xcol.blue >> 8) & 0x000000FF); + while( !isspace((int)*ptr) && *ptr != '\0' ) ptr++; return ptr; } #endif @@ -863,10 +864,10 @@ asim_add_hash_item (ASHashTable * hash, ASHashableValue value, void *data) if (key >= hash->size) return ASH_BadParameter; - if( deallocated_used > 0 ) - item = deallocated_mem[--deallocated_used]; - else - item = safecalloc (1, sizeof (ASHashItem)); + if (deallocated_used > 0) + item = deallocated_mem[--deallocated_used]; + else + item = safecalloc(1, sizeof(ASHashItem)); item->next = NULL; item->value = value; @@ -1011,8 +1012,8 @@ asim_string_hash_value (ASHashableValue value, ASHashKey hash_size) break; hash_key += (((ASHashKey) c) << i); ++i ; - }while( i < ((sizeof (ASHashKey) - sizeof (char)) << 3) ); - return hash_key % hash_size; + } while ((size_t)i < ((sizeof(ASHashKey) - sizeof(char)) << 3)); + return hash_key % hash_size; } long @@ -1040,7 +1041,8 @@ asim_string_compare (ASHashableValue value1, ASHashableValue value2) void asim_string_destroy_without_data (ASHashableValue value, void *data) { - if ((char*)value != NULL) + (void)data; // silence unused variable warning + if ((char*)value != NULL) free ((char*)value); } @@ -1062,9 +1064,9 @@ asim_casestring_hash_value (ASHashableValue value, ASHashKey hash_size) c = tolower (c); hash_key += (((ASHashKey) c) << i); ++i; - }while(i < ((sizeof (ASHashKey) - sizeof (char)) << 3)); + } while ((size_t)i < ((sizeof(ASHashKey) - sizeof(char)) << 3)); - return hash_key % hash_size; + return hash_key % hash_size; } long @@ -1111,6 +1113,9 @@ asim_get_drawable_size (Drawable d, unsigned int *ret_w, unsigned int *ret_h) if (XGetGeometry (dpy, d, &root, &junk, &junk, ret_w, ret_h, &ujunk, &ujunk) != 0) return 1; } +#else + (void)d; + (void)dpy; // silence unused variable warning #endif return 0; } @@ -1120,15 +1125,53 @@ int XParseGeometry ( char *string,int *x,int *y, unsigned int *width, /* RETURN */ unsigned int *height) /* RETURN */ { - show_error( "Parsing of geometry is not supported without either Xlib opr libAfterBase" ); - return 0; + (void)string; + (void)x; + (void)y; + (void)width; + (void)height; // silence unused variable warning + show_error("Parsing of geometry is not supported without either Xlib or libAfterBase"); + return 0; +} +void XDestroyImage(void *d) +{ + (void)d; // silence unused variable warning +} +int XGetWindowAttributes(void *d, Window w, unsigned long m, void *s) +{ + (void)d; + (void)w; + (void)m; + (void)s; // silence unused variable warning + return 0; } -void XDestroyImage( void* d){} -int XGetWindowAttributes( void*d, Window w, unsigned long m, void* s){ return 0;} void *XGetImage( void* dpy,Drawable d,int x,int y,unsigned int width,unsigned int height, unsigned long m,int t) -{return NULL ;} -unsigned long XGetPixel(void* d, int x, int y){return 0;} -int XQueryColors(void* a,Colormap c,void* x,int m){return 0;} +{ + (void)dpy; + (void)d; + (void)x; + (void)y; + (void)width; + (void)height; + (void)m; + (void)t; // silence unused variable warning + return NULL; +} +unsigned long XGetPixel(void *d, int x, int y) +{ + (void)d; + (void)x; + (void)y; // silence unused variable warning + return 0; +} +int XQueryColors(void *a, Colormap c, void *x, int m) +{ + (void)a; + (void)c; + (void)x; + (void)m; // silence unused variable warning + return 0; +} #endif @@ -1303,16 +1346,14 @@ asim_asxml_var_init(void) { if ( asxml_var == NULL ) { - Display *dpy = get_default_asvisual()->dpy; - - asxml_var = create_ashash(0, string_hash_value, string_compare, string_destroy_without_data); - if (!asxml_var) return; + asxml_var = create_ashash(0, string_hash_value, string_compare, string_destroy_without_data); + if (!asxml_var) return; #ifndef X_DISPLAY_MISSING - if ( dpy != NULL ) - { - asxml_var_insert("xroot.width", XDisplayWidth (dpy, DefaultScreen(dpy))); + Display *dpy = get_default_asvisual()->dpy; + if (dpy != NULL) { + asxml_var_insert("xroot.width", XDisplayWidth (dpy, DefaultScreen(dpy))); asxml_var_insert("xroot.height", XDisplayHeight(dpy, DefaultScreen(dpy))); - } + } #endif } } @@ -1531,9 +1572,9 @@ int asim_xml_parse(const char* str, xml_elem_t* current, ASHashTable *vocabulary /* Find a tag of the form , , or . */ while (*ptr) { - const char* oab = ptr; + const char *oab; - /* Look for an open oab bracket. */ + /* Look for an open oab bracket. */ for (oab = ptr ; *oab && *oab != '<' ; oab++); /* If there are no oab brackets left, we're done. */ diff --git a/graf2d/asimage/src/libAfterImage/ascmap.c b/graf2d/asimage/src/libAfterImage/ascmap.c index 9fd83e1dc6bb3..6e0261fbf609b 100644 --- a/graf2d/asimage/src/libAfterImage/ascmap.c +++ b/graf2d/asimage/src/libAfterImage/ascmap.c @@ -422,25 +422,20 @@ print_asimage( im, ASFLAGS_EVERYTHING, __FUNCTION__, __LINE__ ); if( max_colors == 0 ) max_colors = 256 ; - if( dither == -1 ) - dither = 4 ; - else if( dither >= 8 ) - dither = 7 ; - switch( dither ) - { - case 0 : - case 1 : - case 2 : buckets_num = 4096 ; - break ; - case 3 : - case 4 : buckets_num = 1024 ; - break ; - case 5 : - case 6 : buckets_num = 64 ; - break ; - case 7 : buckets_num = 8 ; - break ; - } + if (dither == (unsigned int)-1) + dither = 4; + else if (dither >= 8) + dither = 7; + switch (dither) { + case 0: + case 1: + case 2: buckets_num = 4096; break; + case 3: + case 4: buckets_num = 1024; break; + case 5: + case 6: buckets_num = 64; break; + case 7: buckets_num = 8; break; + } dst = mapped_im = safemalloc( im->width*im->height*sizeof(int)); memset(cmap, 0x00, sizeof(ASColormap)); diff --git a/graf2d/asimage/src/libAfterImage/asfont.c b/graf2d/asimage/src/libAfterImage/asfont.c index 89a679d6c2fd9..39b9bf732570f 100644 --- a/graf2d/asimage/src/libAfterImage/asfont.c +++ b/graf2d/asimage/src/libAfterImage/asfont.c @@ -261,6 +261,10 @@ open_X11_font_int( ASFontManager *fontman, const char *font_string, ASFlagType f font->flags = flags ; load_X11_glyphs( fontman->dpy, font, xfs ); XFreeFont( fontman->dpy, xfs ); +#else + (void)fontman; + (void)font_string; + (void)flags; // silence unused variable warning #endif /* #ifndef X_DISPLAY_MISSING */ return font; } @@ -417,7 +421,8 @@ destroy_font( ASFont *font ) void asglyph_destroy (ASHashableValue value, void *data) { - if( data ) + (void)value; // silence unused variable warning) + if( data ) { free_glyph_data( (ASGlyph*)data ); free( data ); @@ -798,9 +803,8 @@ LOCAL_DEBUG_OUT( "loading glyph range of %lu-%lu", r->min_char, r->max_char ); if( chars[i].lbearing > 0 ) pen_x += chars[i].lbearing ; - for( y = 0 ; y < height ; y++ ) - { - for( x = 0 ; x < width ; x++ ) + for (y = 0; y < (int)height; y++) { + for( x = 0 ; x < width ; x++ ) { /* fprintf( stderr, "glyph %d (%c): (%d,%d) 0x%X\n", i, (char)(i+r->min_char), x, y, XGetPixel( xim, pen_x+x, y ));*/ /* remember default GC colors are black on white - 0 on 1 - and we need @@ -808,7 +812,7 @@ LOCAL_DEBUG_OUT( "loading glyph range of %lu-%lu", r->min_char, r->max_char ); row[x] = ( XGetPixel( xim, pen_x+x, y ) != 0 )? 0x00:0xFF; } row += width; - } + } #ifdef DO_X11_ANTIALIASING if( height > X11_AA_HEIGHT_THRESHOLD ) @@ -1080,21 +1084,19 @@ load_glyph_freetype( ASFont *font, ASGlyph *asg, int glyph, UNICODE_CHAR uc ) register CARD8 *buf ; int i ; asg->width = (int)font->space_size - asg->lead ; - if( glyph_scaling_buf_size < bmap->width*bmap->rows*2 ) - { - glyph_scaling_buf_size = bmap->width*bmap->rows*2; + if ((unsigned int)glyph_scaling_buf_size < bmap->width * bmap->rows * 2) { + glyph_scaling_buf_size = bmap->width*bmap->rows*2; glyph_scaling_buf = realloc( glyph_scaling_buf, glyph_scaling_buf_size ); - } - buf = &(glyph_scaling_buf[0]); - for( i = 0 ; i < bmap->rows ; ++i ) - { - int k = bmap->width; + } + buf = &(glyph_scaling_buf[0]); + for (i = 0; i < (int)bmap->rows; ++i) { + int k = bmap->width; while( --k >= 0 ) buf[k] = src[k] ; buf += bmap->width ; - src += src_step ; - } - src = &(glyph_scaling_buf[0]); + src += src_step ; + } + src = &(glyph_scaling_buf[0]); scale_down_glyph_width( src, bmap->width, asg->width, asg->height ); src_step = asg->width ; /* fprintf(stderr, "lead = %d, space_size = %d, width = %d, to_width = %d\n", @@ -1305,44 +1307,33 @@ utf8_to_unicode ( const unsigned char *s ) } else if (c < 0xc2) { return 0; - } else if (c < 0xe0) - { - if (!((s[1] ^ 0x80) < 0x40)) + } else if (c < 0xe0) { + if (!((s[1] ^ 0x80) < 0x40)) return 0; return ((UNICODE_CHAR) (c & 0x1f) << 6) |(UNICODE_CHAR) (s[1] ^ 0x80); - } else if (c < 0xf0) - { - if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 - && (c >= 0xe1 || s[1] >= 0xa0))) - return 0; + } else if (c < 0xf0) { + if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 && (c >= 0xe1 || s[1] >= 0xa0))) + return 0; return ((UNICODE_CHAR) (c & 0x0f) << 12) | ((UNICODE_CHAR) (s[1] ^ 0x80) << 6) | (UNICODE_CHAR) (s[2] ^ 0x80); - } else if (c < 0xf8 && sizeof(UNICODE_CHAR)*8 >= 32) - { - if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 - && (s[3] ^ 0x80) < 0x40 - && (c >= 0xf1 || s[1] >= 0x90))) - return 0; - return ((UNICODE_CHAR) (c & 0x07) << 18) - | ((UNICODE_CHAR) (s[1] ^ 0x80) << 12) - | ((UNICODE_CHAR) (s[2] ^ 0x80) << 6) - | (UNICODE_CHAR) (s[3] ^ 0x80); - } else if (c < 0xfc && sizeof(UNICODE_CHAR)*8 >= 32) - { - if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 - && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40 - && (c >= 0xf9 || s[1] >= 0x88))) - return 0; + } else if (c < 0xf8 && sizeof(UNICODE_CHAR) * 8 >= 32) { + if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 && (s[3] ^ 0x80) < 0x40 && (c >= 0xf1 || s[1] >= 0x90))) + return 0; + return ((UNICODE_CHAR)(c & 0x07) << 18) | ((UNICODE_CHAR)(s[1] ^ 0x80) << 12) | + ((UNICODE_CHAR)(s[2] ^ 0x80) << 6) | (UNICODE_CHAR)(s[3] ^ 0x80); + } else if (c < 0xfc && sizeof(UNICODE_CHAR) * 8 >= 32) { + if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40 && + (c >= 0xf9 || s[1] >= 0x88))) + return 0; return ((UNICODE_CHAR) (c & 0x03) << 24) | ((UNICODE_CHAR) (s[1] ^ 0x80) << 18) | ((UNICODE_CHAR) (s[2] ^ 0x80) << 12) | ((UNICODE_CHAR) (s[3] ^ 0x80) << 6) | (UNICODE_CHAR) (s[4] ^ 0x80); - } else if (c < 0xfe && sizeof(UNICODE_CHAR)*8 >= 32) - { - if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 + } else if (c < 0xfe && sizeof(UNICODE_CHAR) * 8 >= 32) { + if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40 && (s[5] ^ 0x80) < 0x40 && (c >= 0xfd || s[1] >= 0x84))) @@ -1353,7 +1344,7 @@ utf8_to_unicode ( const unsigned char *s ) | ((UNICODE_CHAR) (s[3] ^ 0x80) << 12) | ((UNICODE_CHAR) (s[4] ^ 0x80) << 6) | (UNICODE_CHAR) (s[5] ^ 0x80); - } + } return 0; } @@ -1721,8 +1712,8 @@ get_text_size_internal( const char *src_text, ASFont *font, ASTextAttributes *at Bool get_text_size( const char *src_text, ASFont *font, ASText3DType type, unsigned int *width, unsigned int *height ) { - ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0 }; - attr.type = type ; + ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0, 0, 0}; + attr.type = type ; if( IsUTF8Locale() ) attr.char_type = ASCT_UTF8 ; return get_text_size_internal( (char*)src_text, font, &attr, width, height, 0/*autodetect length*/, NULL ); @@ -1731,24 +1722,24 @@ get_text_size( const char *src_text, ASFont *font, ASText3DType type, unsigned i Bool get_unicode_text_size( const UNICODE_CHAR *src_text, ASFont *font, ASText3DType type, unsigned int *width, unsigned int *height ) { - ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Unicode, 8, 0, NULL, 0 }; - attr.type = type ; + ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Unicode, 8, 0, NULL, 0, 0, 0}; + attr.type = type ; return get_text_size_internal( (char*)src_text, font, &attr, width, height, 0/*autodetect length*/, NULL ); } Bool get_utf8_text_size( const char *src_text, ASFont *font, ASText3DType type, unsigned int *width, unsigned int *height ) { - ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_UTF8, 8, 0, NULL, 0 }; - attr.type = type ; + ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_UTF8, 8, 0, NULL, 0, 0, 0}; + attr.type = type ; return get_text_size_internal( (char*)src_text, font, &attr, width, height, 0/*autodetect length*/, NULL ); } Bool get_fancy_text_size( const void *src_text, ASFont *font, ASTextAttributes *attr, unsigned int *width, unsigned int *height, int length, int *x_positions ) { - ASTextAttributes internal_attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0 }; - if( attr != NULL ) + ASTextAttributes internal_attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0, 0, 0}; + if( attr != NULL ) { internal_attr = *attr; if( internal_attr.tab_size == 0 ) @@ -1868,19 +1859,19 @@ draw_text_internal( const char *text, ASFont *font, ASTextAttributes *attr, int get_text_size( text , font, attr->type, &width, &height ); if ( (width > attr->width) && (strchr(text, ' ')) ) { - char *tryPtr = strchr(text,' '); - char *oldTryPtr = tryPtr; - while (tryPtr) - { - *tryPtr = 0; - get_text_size( text , font, attr->type, &width, &height ); - if (width > attr->width) - *oldTryPtr = '\n'; - - *tryPtr = ' '; - oldTryPtr = tryPtr; - tryPtr = strchr(tryPtr + 1,' '); - } + char *tryPtr = strchr( + text, ' '); // casting away this const could lead to UB, see https://stackoverflow.com/a/14368141/7471760 + char *oldTryPtr = tryPtr; + while (tryPtr) { + *tryPtr = 0; + get_text_size(text, font, attr->type, &width, &height); + if (width > attr->width) + *oldTryPtr = '\n'; + + *tryPtr = ' '; + oldTryPtr = tryPtr; + tryPtr = strchr(tryPtr + 1, ' '); + } } } @@ -2100,8 +2091,8 @@ LOCAL_DEBUG_OUT( "line_height is %d, space_size is %d, base_line is %d", line_he ASImage * draw_text( const char *text, ASFont *font, ASText3DType type, int compression ) { - ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0, ARGB32_White }; - attr.type = type ; + ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0, ARGB32_White, 0}; + attr.type = type ; if( IsUTF8Locale() ) attr.char_type = ASCT_UTF8 ; return draw_text_internal( text, font, &attr, compression, 0/*autodetect length*/ ); @@ -2110,23 +2101,23 @@ draw_text( const char *text, ASFont *font, ASText3DType type, int compression ) ASImage * draw_unicode_text( const UNICODE_CHAR *text, ASFont *font, ASText3DType type, int compression ) { - ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Unicode, 8, 0, NULL, 0, ARGB32_White }; - attr.type = type ; + ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Unicode, 8, 0, NULL, 0, ARGB32_White, 0}; + attr.type = type ; return draw_text_internal( (const char*)text, font, &attr, compression, 0/*autodetect length*/ ); } ASImage * draw_utf8_text( const char *text, ASFont *font, ASText3DType type, int compression ) { - ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_UTF8, 8, 0, NULL, 0, ARGB32_White }; - attr.type = type ; + ASTextAttributes attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_UTF8, 8, 0, NULL, 0, ARGB32_White, 0}; + attr.type = type ; return draw_text_internal( text, font, &attr, compression, 0/*autodetect length*/ ); } ASImage * draw_fancy_text( const void *text, ASFont *font, ASTextAttributes *attr, int compression, int length ) { - ASTextAttributes internal_attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0, ARGB32_White }; + ASTextAttributes internal_attr = {ASTA_VERSION_INTERNAL, 0, 0, ASCT_Char, 8, 0, NULL, 0, ARGB32_White, 0 }; if( attr != NULL ) { internal_attr = *attr; @@ -2226,12 +2217,24 @@ void print_asglyph( FILE* stream, ASFont* font, unsigned long c) #ifndef HAVE_XRENDER Bool afterimage_uses_xrender(){ return False;} - -void -draw_text_xrender( ASVisual *asv, const void *text, ASFont *font, ASTextAttributes *attr, int length, - int xrender_op, unsigned long xrender_src, unsigned long xrender_dst, - int xrender_xSrc, int xrender_ySrc, int xrender_xDst, int xrender_yDst ) -{} + +void draw_text_xrender(ASVisual *asv, const void *text, ASFont *font, ASTextAttributes *attr, int length, + int xrender_op, unsigned long xrender_src, unsigned long xrender_dst, int xrender_xSrc, + int xrender_ySrc, int xrender_xDst, int xrender_yDst) +{ + (void)asv; + (void)text; + (void)font; + (void)attr; + (void)length; + (void)xrender_op; + (void)xrender_src; + (void)xrender_dst; + (void)xrender_xSrc; + (void)xrender_ySrc; + (void)xrender_xDst; + (void)xrender_yDst; // silence unused variable warning +} #else Bool afterimage_uses_xrender(){ return True;} diff --git a/graf2d/asimage/src/libAfterImage/asim_afterbase.h b/graf2d/asimage/src/libAfterImage/asim_afterbase.h index 986ba417b000c..06c81745a3bfc 100644 --- a/graf2d/asimage/src/libAfterImage/asim_afterbase.h +++ b/graf2d/asimage/src/libAfterImage/asim_afterbase.h @@ -179,7 +179,7 @@ void asim_nonGNUC_debugout_stub( const char *format, ...); #define LOCAL_DEBUG_CALLER_OUT(format,args...) \ do{ fprintf( stderr, "%s:%s:%s:> called from [%s] with args(" format ")\n", get_application_name(), __FILE__, __FUNCTION__, get_caller_func(), ## args );}while(0) #else -#define LOCAL_DEBUG_OUT(format,args...) +#define LOCAL_DEBUG_OUT(format, args...) #define LOCAL_DEBUG_CALLER_OUT(format,args...) #endif /* LOCAL_DEBUG */ @@ -233,8 +233,8 @@ void asim_nonGNUC_debugout_stub( const char *format, ...); #define START_TIME(started) time_t started = clock() #define SHOW_TIME(s,started) fprintf (stderr, "%s " s " time (clocks): %lu mlsec\n", __FUNCTION__, ((clock () - (started))*100)/CLOCKS_PER_SEC) #else -#define START_TIME(started) unsigned long started = 0 -#define SHOW_TIME(s,started) started = 0 +#define START_TIME(started) +#define SHOW_TIME(s, started) #endif /* from libAfterBase/safemalloc.h : */ diff --git a/graf2d/asimage/src/libAfterImage/asimage.c b/graf2d/asimage/src/libAfterImage/asimage.c index 7188e49905c0e..aea8a719dbf86 100644 --- a/graf2d/asimage/src/libAfterImage/asimage.c +++ b/graf2d/asimage/src/libAfterImage/asimage.c @@ -80,22 +80,24 @@ ASVisual *get_default_asvisual() /* internal buffer used for compression/decompression */ -static CARD8 *__as_compression_buffer = NULL ; -static size_t __as_compression_buffer_len = 0; /* allocated size */ +// static CARD8 *__as_compression_buffer = NULL ; +// static size_t __as_compression_buffer_len = 0; /* allocated size */ +/* static inline CARD8* get_compression_buffer( size_t size ) { - if( size > __as_compression_buffer_len ) - __as_compression_buffer_len = (size+1023)&(~0x03FF) ; - return (__as_compression_buffer = realloc( __as_compression_buffer, __as_compression_buffer_len )); + if( size > __as_compression_buffer_len ) + __as_compression_buffer_len = (size+1023)&(~0x03FF) ; + return (__as_compression_buffer = realloc( __as_compression_buffer, __as_compression_buffer_len )); } - +*/ +/* static inline void release_compression_buffer( CARD8 *ptr ) { - /* do nothing so far */ + (void)ptr; // silence unused variable warning + // do nothing so far } - - +*/ #ifdef TRACK_ASIMAGES static ASHashTable *__as_image_registry = NULL ; @@ -154,6 +156,8 @@ flush_asimage_cache( ASImage *im ) XDestroyImage( im->alt.mask_ximage ); im->alt.mask_ximage = NULL ; } +#else + (void)im; // silence unused variable warning #endif } @@ -232,6 +236,9 @@ check_created_asimage( ASImage *im, unsigned int width, unsigned int height ) im = NULL ; #ifdef TRACK_ASIMAGES show_error( "failed to create ASImage of size %dx%d", width, height ); +#else + (void)width; + (void)height; // silence unused variable warning #endif }else { @@ -640,6 +647,8 @@ print_asimage_manager(ASImageManager *imageman) { #ifdef TRACK_ASIMAGES print_ashash( imageman->image_hash, string_print ); +#else + (void)imageman; // silence unused variable warning #endif } @@ -849,6 +858,7 @@ asimage_add_line_bgra (ASImage * im, register CARD32 * data, unsigned int y) unsigned int asimage_print_line (ASImage * im, ColorPart color, unsigned int y, unsigned long verbosity) { + (void)verbosity; // silence unused variable warning int colint = (int) color; if (AS_ASSERT(im) || colint < 0 || color >= IC_NUM_CHANNELS ) return 0; @@ -1158,7 +1168,7 @@ vectorize_asimage( ASImage *im, unsigned int max_colors, unsigned int dither, } /* ********************************************************************************/ -/* Convinience function - very fast image cloning : */ +/* Convenience function - very fast image cloning : */ /* ********************************************************************************/ ASImage* clone_asimage( ASImage *src, ASFlagType filter ) diff --git a/graf2d/asimage/src/libAfterImage/asimage.h b/graf2d/asimage/src/libAfterImage/asimage.h index 4423a6fc43eed..35dcd5214c6e0 100644 --- a/graf2d/asimage/src/libAfterImage/asimage.h +++ b/graf2d/asimage/src/libAfterImage/asimage.h @@ -1014,23 +1014,32 @@ do{ asimage_add_line((im), IC_RED, (src).red, (y)); \ if( get_flags((src).flags,SCL_DO_ALPHA))asimage_add_line((im), IC_ALPHA, (src).alpha, (y)); \ }while(0) -#define SCANLINE_FUNC(f,src,dst,scales,len) \ -do{ if( (src).offset_x > 0 || (dst).offset_x > 0 ) \ - LOCAL_DEBUG_OUT( "(src).offset_x = %d. (dst).offset_x = %d", (src).offset_x, (dst).offset_x ); \ - f((src).red+(src).offset_x, (dst).red+(dst).offset_x, (scales),(len)); \ - f((src).green+(src).offset_x,(dst).green+(dst).offset_x,(scales),(len)); \ - f((src).blue+(src).offset_x, (dst).blue+(dst).offset_x, (scales),(len)); \ - if(get_flags((src).flags,SCL_DO_ALPHA)) f((src).alpha+(src).offset_x,(dst).alpha+(dst).offset_x,(scales),(len)); \ - }while(0) - -#define SCANLINE_FUNC_FILTERED(f,src,dst,scales,len) \ -do{ if( (src).offset_x > 0 || (dst).offset_x > 0 ) \ - LOCAL_DEBUG_OUT( "(src).offset_x = %d. (dst).offset_x = %d", (src).offset_x, (dst).offset_x ); \ - if(get_flags((src).flags,SCL_DO_RED)) f((src).red+(src).offset_x, (dst).red+(dst).offset_x, (scales),(len)); \ - if(get_flags((src).flags,SCL_DO_GREEN)) f((src).green+(src).offset_x,(dst).green+(dst).offset_x,(scales),(len)); \ - if(get_flags((src).flags,SCL_DO_BLUE)) f((src).blue+(src).offset_x, (dst).blue+(dst).offset_x, (scales),(len)); \ - if(get_flags((src).flags,SCL_DO_ALPHA)) f((src).alpha+(src).offset_x,(dst).alpha+(dst).offset_x,(scales),(len)); \ - }while(0) +#define SCANLINE_FUNC(f, src, dst, scales, len) \ + do { \ + if ((src).offset_x > 0 || (dst).offset_x > 0) { \ + LOCAL_DEBUG_OUT("(src).offset_x = %d. (dst).offset_x = %d", (src).offset_x, (dst).offset_x); \ + } \ + f((src).red + (src).offset_x, (dst).red + (dst).offset_x, (scales), (len)); \ + f((src).green + (src).offset_x, (dst).green + (dst).offset_x, (scales), (len)); \ + f((src).blue + (src).offset_x, (dst).blue + (dst).offset_x, (scales), (len)); \ + if (get_flags((src).flags, SCL_DO_ALPHA)) \ + f((src).alpha + (src).offset_x, (dst).alpha + (dst).offset_x, (scales), (len)); \ + } while (0) + +#define SCANLINE_FUNC_FILTERED(f, src, dst, scales, len) \ + do { \ + if ((src).offset_x > 0 || (dst).offset_x > 0) { \ + LOCAL_DEBUG_OUT("(src).offset_x = %d. (dst).offset_x = %d", (src).offset_x, (dst).offset_x); \ + } \ + if (get_flags((src).flags, SCL_DO_RED)) \ + f((src).red + (src).offset_x, (dst).red + (dst).offset_x, (scales), (len)); \ + if (get_flags((src).flags, SCL_DO_GREEN)) \ + f((src).green + (src).offset_x, (dst).green + (dst).offset_x, (scales), (len)); \ + if (get_flags((src).flags, SCL_DO_BLUE)) \ + f((src).blue + (src).offset_x, (dst).blue + (dst).offset_x, (scales), (len)); \ + if (get_flags((src).flags, SCL_DO_ALPHA)) \ + f((src).alpha + (src).offset_x, (dst).alpha + (dst).offset_x, (scales), (len)); \ + } while (0) #define CHOOSE_SCANLINE_FUNC(r,src,dst,scales,len) \ switch(r) \ diff --git a/graf2d/asimage/src/libAfterImage/asstorage.c b/graf2d/asimage/src/libAfterImage/asstorage.c index 7d97f6faf00f9..fd9d09496fce0 100644 --- a/graf2d/asimage/src/libAfterImage/asstorage.c +++ b/graf2d/asimage/src/libAfterImage/asstorage.c @@ -701,9 +701,9 @@ compress_stored_data( ASStorage *storage, CARD8 *data, int size, ASFlagType *fla /* TODO: just a stub for now - need to implement compression */ int comp_size = size ; CARD8 *buffer = data ; - size_t buf_size = size ; + // size_t buf_size = size ; - static compute_diff_func_type compute_diff_func[2][4] = + static compute_diff_func_type compute_diff_func[2][4] = { { compute_diff32, compute_diff32_8bitshift, @@ -769,8 +769,8 @@ compress_stored_data( ASStorage *storage, CARD8 *data, int size, ASFlagType *fla #endif } buffer = storage->comp_buf ; - buf_size = storage->comp_buf_size ; - if( buffer ) + // buf_size = storage->comp_buf_size ; + if( buffer ) { if( get_flags( *flags, ASStorage_Bitmap ) ) { @@ -874,7 +874,8 @@ decompress_stored_data( ASStorage *storage, CARD8 *data, int size, int uncompres { CARD8 *buffer = data ; - LOCAL_DEBUG_OUT( "size = %d, uncompressed_size = %d, flags = 0x%lX", size, uncompressed_size, flags ); + (void)uncompressed_size; // silence unused variable warning when LOCAL_DEBUG_OUT is void + LOCAL_DEBUG_OUT( "size = %d, uncompressed_size = %d, flags = 0x%lX", size, uncompressed_size, flags ); if( get_flags( flags, ASStorage_RLEDiffCompress )) { buffer = storage->comp_buf ; @@ -999,7 +1000,8 @@ destroy_asstorage_block( ASStorageBlock *block ) static int select_storage_block( ASStorage *storage, int compressed_size, ASFlagType flags, int block_id_start ) { - int i ; + (void)flags; // unused variable + int i ; int new_block = -1 ; compressed_size += ASStorageSlot_SIZE; i = block_id_start - 1 ; @@ -1483,13 +1485,12 @@ convert_slot_to_ref( ASStorage *storage, ASStorageID id ) * there is enough space in its block, otherwise we have to relocate it * into different block, which is slower. */ - if( block->total_free > sizeof(ASStorageID)) - { - slot_id = store_data_in_block( block, (CARD8*)&target_id, + if (block->total_free > (int)sizeof(ASStorageID)) { + slot_id = store_data_in_block( block, (CARD8*)&target_id, sizeof(ASStorageID), sizeof(ASStorageID), 0, ASStorage_Reference ); - } - LOCAL_DEBUG_OUT( "block = %p, block->total_free = %d, slot_id = 0x%X", block, block->total_free, slot_id ); + } + LOCAL_DEBUG_OUT( "block = %p, block->total_free = %d, slot_id = 0x%X", block, block->total_free, slot_id ); if( slot_id > 0 ) { /* We can use fast strategy : now we need to swap contents of the slots */ diff --git a/graf2d/asimage/src/libAfterImage/asvisual.c b/graf2d/asimage/src/libAfterImage/asvisual.c index d341b076189f3..ea821e4d287e0 100644 --- a/graf2d/asimage/src/libAfterImage/asvisual.c +++ b/graf2d/asimage/src/libAfterImage/asvisual.c @@ -59,7 +59,9 @@ void _XInitImageFuncPtrs(XImage*); int asvisual_empty_XErrorHandler (Display * dpy, XErrorEvent * event) { - return 0; + (void)dpy; // silence unused variable warning + (void)event; // silence unused variable warning + return 0; } /***************************************************************************/ #if defined(LOCAL_DEBUG) && !defined(NO_DEBUG_OUTPUT) @@ -103,6 +105,7 @@ ARGB32_manhattan_distance (long a, long b) ***************************************************************************/ int get_bits_per_pixel(Display *dpy, int depth) { + (void)dpy; // silence unused variable warning #if 0 #ifndef X_DISPLAY_MISSING register ScreenFormat *fmt = dpy->pixmap_format; @@ -126,8 +129,8 @@ int get_bits_per_pixel(Display *dpy, int depth) ASVisual *_set_default_asvisual( ASVisual *new_v ); #ifndef X_DISPLAY_MISSING -static XColor black_xcol = { 0, 0x0000, 0x0000, 0x0000, DoRed|DoGreen|DoBlue }; -static XColor white_xcol = { 0, 0xFFFF, 0xFFFF, 0xFFFF, DoRed|DoGreen|DoBlue }; +static XColor black_xcol = {0, 0x0000, 0x0000, 0x0000, DoRed | DoGreen | DoBlue, 0}; +static XColor white_xcol = {0, 0xFFFF, 0xFFFF, 0xFFFF, DoRed | DoGreen | DoBlue, 0}; static void find_useable_visual( ASVisual *asv, Display *dpy, int screen, Window root, XVisualInfo *list, int nitems, @@ -236,6 +239,12 @@ query_screen_visual_id( ASVisual *asv, Display *dpy, int screen, Window root, in { NULL , 0 , 0 , 15 , DirectColor, 0x0 , 0xE003 , 0x0 , 0 , 0 }, { NULL , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 }, } ; +#else + (void)screen; + (void)root; + (void)default_depth; + (void)visual_id; + (void)cmap; // silence unused variable warning #endif /*ifndef X_DISPLAY_MISSING */ if( asv == NULL ) return False ; @@ -350,6 +359,13 @@ create_asvisual_for_id( Display *dpy, int screen, int default_depth, VisualID vi asv = NULL ; } } +#else + (void)dpy; + (void)screen; + (void)default_depth; + (void)visual_id; + (void)cmap; + (void)reusable_memory; // silence unused variable warning #endif /*ifndef X_DISPLAY_MISSING */ _set_default_asvisual( asv ); return asv; @@ -454,11 +470,13 @@ visual2visual_prop( ASVisual *asv, size_t *size_ret, } if( size_ret ) *size_ret = size; +#else + (void)size_ret; // silence unused variable warning #endif /*ifndef X_DISPLAY_MISSING */ - if( version_ret ) - *version_ret = (1<<16)+0; /* version is 1.0 */ - *data_ret = prop ; - return True; + if (version_ret) + *version_ret = (1 << 16) + 0; /* version is 1.0 */ + *data_ret = prop; + return True; } Bool @@ -518,7 +536,7 @@ visual_prop2visual( ASVisual *asv, Display *dpy, int screen, }else asv->as_colormap_type = ACM_None ; /* just in case */ #else - + (void)screen; // silence unused variable warning #endif /*ifndef X_DISPLAY_MISSING */ return True; } @@ -626,7 +644,8 @@ make_reverse_colormap( unsigned long *cmap, size_t size, int depth, unsigned sho ASHashTable * make_reverse_colorhash( unsigned long *cmap, size_t size, int depth, unsigned short mask, unsigned short shift ) { - ASHashTable *hash = create_ashash( 0, NULL, NULL, NULL ); + (void)depth; // silence unused variable warning + ASHashTable *hash = create_ashash( 0, NULL, NULL, NULL ); register unsigned int i ; if( hash ) @@ -695,6 +714,8 @@ setup_pseudo_visual( ASVisual *asv ) asv->true_depth, 0x000F, 4 ); } } +#else + (void)asv; // silence unused variable warning #endif /*ifndef X_DISPLAY_MISSING */ } @@ -886,6 +907,8 @@ setup_as_colormap( ASVisual *asv ) asv->as_colormap = cmap ; asv->as_colormap_reverse.hash = make_reverse_colorhash( cmap, 4096, asv->true_depth, 0x000F, 4 ); } +#else + (void)asv; // silence unused variable warning #endif /*ifndef X_DISPLAY_MISSING */ } @@ -960,7 +983,17 @@ LOCAL_DEBUG_OUT( "Colormap %lX, parent %lX, %ux%u%+d%+d, bw = %d, class %d", wclass, asv->visual_info.visual, mask, attributes); #else - return None ; + (void)asv; + (void)parent; + (void)x; + (void)y; + (void)width; + (void)height; + (void)border_width; + (void)wclass; + (void)mask; + (void)attributes; // silence unused variable warning + return None; #endif /*ifndef X_DISPLAY_MISSING */ } @@ -980,6 +1013,11 @@ create_visual_gc( ASVisual *asv, Window root, unsigned long mask, XGCValues *gcv if( asv->scratch_window != None ) gc = XCreateGC( asv->dpy, asv->scratch_window, gcvalues?mask:0, gcvalues?gcvalues:&scratch_gcv ); } +#else + (void)asv; + (void)root; + (void)mask; + (void)gcvalues; // silence unused variable warning #endif return gc; } @@ -999,7 +1037,12 @@ create_visual_pixmap( ASVisual *asv, Window root, unsigned int width, unsigned i } return p; #else - return None ; + (void)asv; + (void)root; + (void)width; + (void)height; + (void)depth; // silence unused variable warning + return None ; #endif /*ifndef X_DISPLAY_MISSING */ } @@ -1020,7 +1063,9 @@ destroy_visual_pixmap( ASVisual *asv, Pixmap *ppmap ) static int quiet_xerror_handler (Display * dpy, XErrorEvent * error) { - return 0; + (void)dpy; // silence unused variable warning + (void)error; // silence unused variable warning + return 0; } #endif @@ -1039,6 +1084,9 @@ get_dpy_drawable_size (Display *drawable_dpy, Drawable d, unsigned int *ret_w, u result = XGetGeometry (drawable_dpy, d, &root, &junk, &junk, ret_w, ret_h, &ujunk, &ujunk); XSetErrorHandler (oldXErrorHandler); } +#else + (void)drawable_dpy; + (void)d; // silence unused variable warning #endif if ( result == 0) { @@ -1082,6 +1130,10 @@ get_dpy_window_position (Display *window_dpy, Window root, Window w, int *px, in while( transp_y > rootHeight ) transp_y -= rootHeight ; } } +#else + (void)window_dpy; + (void)root; + (void)w; // silence unused variable warning #endif if( px ) *px = x; @@ -1476,7 +1528,11 @@ XImage *ASGetXImage( ASVisual *asv, Drawable d, Bool enable_shmem_images (){return False; } void disable_shmem_images(){} -void *check_XImage_shared( XImage *xim ) {return NULL ; } +void *check_XImage_shared(XImage *xim) +{ + (void)xim; // silence unused variable warning + return NULL; +} Bool ASPutXImage( ASVisual *asv, Drawable d, GC gc, XImage *xim, int src_x, int src_y, int dest_x, int dest_y, @@ -1487,7 +1543,17 @@ Bool ASPutXImage( ASVisual *asv, Drawable d, GC gc, XImage *xim, return False ; return XPutImage( asv->dpy, d, gc, xim, src_x, src_y, dest_x, dest_y,width, height ); #else - return False; + (void)asv; + (void)d; + (void)gc; + (void)xim; + (void)src_x; + (void)src_y; + (void)dest_x; + (void)dest_y; + (void)width; + (void)height; // silence unused variable warning + return False; #endif } @@ -1500,7 +1566,14 @@ XImage * ASGetXImage( ASVisual *asv, Drawable d, return NULL ; return XGetImage( asv->dpy, d, x, y, width, height, plane_mask, ZPixmap ); #else - return NULL ; + (void)asv; + (void)d; + (void)x; + (void)y; + (void)width; + (void)height; + (void)plane_mask; // silence unused variable warning + return NULL ; #endif } @@ -1581,10 +1654,10 @@ create_visual_ximage( ASVisual *asv, unsigned int width, unsigned int height, un #endif if( ximage == NULL ) { - ximage = XCreateImage (asv->dpy, asv->visual_info.visual, (depth==0)?asv->visual_info.depth/*true_depth*/:depth, ZPixmap, - 0, NULL, MAX(width,(unsigned int)1), MAX(height,(unsigned int)1), - unit, 0); - if (ximage != NULL) + ximage = XCreateImage(asv->dpy, asv->visual_info.visual, + (depth == 0) ? (unsigned int)asv->visual_info.depth /*true_depth*/ : depth, ZPixmap, 0, + NULL, MAX(width, (unsigned int)1), MAX(height, (unsigned int)1), unit, 0); + if (ximage != NULL) { _XInitImageFuncPtrs (ximage); ximage->obdata = NULL; @@ -1600,7 +1673,11 @@ create_visual_ximage( ASVisual *asv, unsigned int width, unsigned int height, un } return ximage; #else - return NULL ; + (void)asv; + (void)width; + (void)height; + (void)depth; // silence unused variable warning + return NULL ; #endif /*ifndef X_DISPLAY_MISSING */ } /* this is the vehicle to use static allocated buffer for temporary XImages @@ -1635,11 +1712,10 @@ create_visual_scratch_ximage( ASVisual *asv, unsigned int width, unsigned int he if( ximage == NULL ) { - ximage = XCreateImage (asv->dpy, asv->visual_info.visual, - (depth==0)?asv->visual_info.depth/*true_depth*/:depth, ZPixmap, - 0, NULL, MAX(width,(unsigned int)1), MAX(height,(unsigned int)1), - unit, 0); - if (ximage != NULL) + ximage = XCreateImage(asv->dpy, asv->visual_info.visual, + (depth == 0) ? (unsigned int)asv->visual_info.depth /*true_depth*/ : depth, ZPixmap, 0, + NULL, MAX(width, (unsigned int)1), MAX(height, (unsigned int)1), unit, 0); + if (ximage != NULL) { data = get_scratch_data(ximage->bytes_per_line * ximage->height); if( data == NULL ) @@ -1722,45 +1798,53 @@ query_pixel_color( ASVisual *asv, unsigned long pixel, CARD32 *r, CARD32 *g, CAR CARD32 color2pixel32bgr(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - *pixel = ARGB32_RED8(encoded_color)|(ARGB32_GREEN8(encoded_color)<<8)|(ARGB32_BLUE8(encoded_color)<<16); + (void)asv; // silence unused variable warning + *pixel = ARGB32_RED8(encoded_color)|(ARGB32_GREEN8(encoded_color)<<8)|(ARGB32_BLUE8(encoded_color)<<16); return 0; } CARD32 color2pixel32rgb(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - *pixel = encoded_color&0x00FFFFFF; + (void)asv; // silence unused variable warning + *pixel = encoded_color&0x00FFFFFF; return 0; } CARD32 color2pixel24bgr(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - *pixel = encoded_color&0x00FFFFFF; + (void)asv; // silence unused variable warning + *pixel = encoded_color&0x00FFFFFF; return 0; } CARD32 color2pixel24rgb(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - *pixel = encoded_color&0x00FFFFFF; + (void)asv; // silence unused variable warning + *pixel = encoded_color&0x00FFFFFF; return 0; } CARD32 color2pixel16bgr(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - register CARD32 c = encoded_color ; - *pixel = ((c&0x000000F8)<<8)|((c&0x0000FC00)>>5)|((c&0x00F80000)>>19); + (void)asv; // silence unused variable warning + register CARD32 c = encoded_color; + *pixel = ((c & 0x000000F8) << 8) | ((c & 0x0000FC00) >> 5) | ((c & 0x00F80000) >> 19); return (c>>1)&0x00030103; } CARD32 color2pixel16rgb(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - register CARD32 c = encoded_color ; + (void)asv; // silence unused variable warning + register CARD32 c = encoded_color ; *pixel = ((c&0x00F80000)>>8)|((c&0x0000FC00)>>5)|((c&0x000000F8)>>3); return (c>>1)&0x00030103; } CARD32 color2pixel15bgr(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - register CARD32 c = encoded_color ; + (void)asv; // silence unused variable warning + register CARD32 c = encoded_color ; *pixel = ((c&0x000000F8)<<7)|((c&0x0000F800)>>6)|((c&0x00F80000)>>19); return (c>>1)&0x00030303; } CARD32 color2pixel15rgb(ASVisual *asv, CARD32 encoded_color, unsigned long *pixel) { - register CARD32 c = encoded_color ; + (void)asv; // silence unused variable warning + register CARD32 c = encoded_color ; *pixel = ((c&0x00F80000)>>9)|((c&0x0000F800)>>6)|((c&0x000000F8)>>3); return (c>>1)&0x00030303; } @@ -1787,21 +1871,69 @@ CARD32 color2pixel_pseudo12bpp( ASVisual *asv, CARD32 encoded_color, unsigned lo } void pixel2color32rgb(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color32bgr(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color24rgb(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color24bgr(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color16rgb(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color16bgr(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color15rgb(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void pixel2color15bgr(ASVisual *asv, unsigned long pixel, CARD32 *red, CARD32 *green, CARD32 *blue) -{} +{ + (void)asv; + (void)pixel; + (void)red; + (void)green; + (void)blue; // silence unused variable warning +} void ximage2scanline32(ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { @@ -1809,8 +1941,9 @@ void ximage2scanline32(ASVisual *asv, XImage *xim, ASScanline *sl, int y, regis register CARD32 *a = sl->alpha+sl->offset_x; int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x); register CARD32 *src = (CARD32*)xim_data ; -/* src += sl->offset_x; */ -/*fprintf( stderr, "%d: ", y);*/ + (void)y; // silence unused variable warning + /* src += sl->offset_x; */ + /*fprintf( stderr, "%d: ", y);*/ #ifdef WORDS_BIGENDIAN if( !asv->msb_first ) @@ -1841,7 +1974,8 @@ void ximage2scanline32(ASVisual *asv, XImage *xim, ASScanline *sl, int y, regis void ximage2scanline16( ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { - register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; + (void)y; // silence unused variable warning + register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; register CARD16 *src = (CARD16*)xim_data ; register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; #ifdef WORDS_BIGENDIAN @@ -1868,7 +2002,8 @@ void ximage2scanline16( ASVisual *asv, XImage *xim, ASScanline *sl, int y, regi } void ximage2scanline15( ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { - register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; + (void)y; // silence unused variable warning + register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; register CARD16 *src = (CARD16*)xim_data ; register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; #ifdef WORDS_BIGENDIAN @@ -1898,7 +2033,8 @@ void ximage2scanline15( ASVisual *asv, XImage *xim, ASScanline *sl, int y, regi void ximage2scanline_pseudo3bpp( ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { - register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; + (void)xim_data; // silence unused variable warning + register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; do @@ -2004,6 +2140,7 @@ void scanline2ximage32( ASVisual *asv, XImage *xim, ASScanline *sl, int y, regi register CARD32 *a = sl->alpha+sl->offset_x; register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x); register CARD32 *src = (CARD32*)xim_data; + (void)y; // silence unused variable warning /* src += sl->offset_x ; */ /*fprintf( stderr, "%d: ", y);*/ #ifdef WORDS_BIGENDIAN @@ -2031,7 +2168,8 @@ void scanline2ximage32( ASVisual *asv, XImage *xim, ASScanline *sl, int y, regi void scanline2ximage16( ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { - register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; + (void)y; // silence unused variable warning + register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; register CARD16 *src = (CARD16*)xim_data ; register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; register CARD32 c = (r[i]<<20) | (g[i]<<10) | (b[i]); @@ -2089,7 +2227,8 @@ void scanline2ximage16( ASVisual *asv, XImage *xim, ASScanline *sl, int y, regi void scanline2ximage15( ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { - register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; + (void)y; // silence unused variable warning + register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; register CARD16 *src = (CARD16*)xim_data ; register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; register CARD32 c = (r[i]<<20) | (g[i]<<10) | (b[i]); @@ -2151,7 +2290,8 @@ void scanline2ximage15( ASVisual *asv, XImage *xim, ASScanline *sl, int y, regi void scanline2ximage_pseudo3bpp( ASVisual *asv, XImage *xim, ASScanline *sl, int y, register unsigned char *xim_data ) { - register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; + (void)xim_data; // silence unused variable warning + register CARD32 *r = sl->xc1+sl->offset_x, *g = sl->xc2+sl->offset_x, *b = sl->xc3+sl->offset_x; register int i = MIN((unsigned int)(xim->width),sl->width-sl->offset_x)-1; register CARD32 c = (r[i]<<20) | (g[i]<<10) | (b[i]); diff --git a/graf2d/asimage/src/libAfterImage/blender.c b/graf2d/asimage/src/libAfterImage/blender.c index 922328f0bd7dc..b368022376716 100644 --- a/graf2d/asimage/src/libAfterImage/blender.c +++ b/graf2d/asimage/src/libAfterImage/blender.c @@ -298,25 +298,23 @@ typedef struct merge_scanlines_func_desc { char *short_desc; }merge_scanlines_func_desc; -merge_scanlines_func_desc std_merge_scanlines_func_list[] = -{ - { "add", 3, add_scanlines, "color addition with saturation" }, - { "alphablend", 10, alphablend_scanlines, "alpha-blending" }, - { "allanon", 7, allanon_scanlines, "color values averaging" }, - { "colorize", 8, colorize_scanlines, "hue and saturate bottom image same as top image" }, - { "darken", 6, darken_scanlines, "use lowest color value from both images" }, - { "diff", 4, diff_scanlines, "use absolute value of the color difference between two images" }, - { "dissipate", 9, dissipate_scanlines, "randomly alpha-blend images"}, - { "hue", 3, hue_scanlines, "hue bottom image same as top image" }, - { "lighten", 7, lighten_scanlines, "use highest color value from both images" }, - { "overlay", 7, overlay_scanlines, "some weird image overlaying(see GIMP)" }, - { "saturate", 8, saturate_scanlines, "saturate bottom image same as top image"}, - { "screen", 6, screen_scanlines, "another weird image overlaying(see GIMP)" }, - { "sub", 3, sub_scanlines, "color substraction with saturation" }, - { "tint", 4, tint_scanlines, "tinting image with image" }, - { "value", 5, value_scanlines, "value bottom image same as top image" }, - { NULL, 0, NULL } -}; +merge_scanlines_func_desc std_merge_scanlines_func_list[] = { + {"add", 3, add_scanlines, "color addition with saturation"}, + {"alphablend", 10, alphablend_scanlines, "alpha-blending"}, + {"allanon", 7, allanon_scanlines, "color values averaging"}, + {"colorize", 8, colorize_scanlines, "hue and saturate bottom image same as top image"}, + {"darken", 6, darken_scanlines, "use lowest color value from both images"}, + {"diff", 4, diff_scanlines, "use absolute value of the color difference between two images"}, + {"dissipate", 9, dissipate_scanlines, "randomly alpha-blend images"}, + {"hue", 3, hue_scanlines, "hue bottom image same as top image"}, + {"lighten", 7, lighten_scanlines, "use highest color value from both images"}, + {"overlay", 7, overlay_scanlines, "some weird image overlaying(see GIMP)"}, + {"saturate", 8, saturate_scanlines, "saturate bottom image same as top image"}, + {"screen", 6, screen_scanlines, "another weird image overlaying(see GIMP)"}, + {"sub", 3, sub_scanlines, "color substraction with saturation"}, + {"tint", 4, tint_scanlines, "tinting image with image"}, + {"value", 5, value_scanlines, "value bottom image same as top image"}, + {NULL, 0, NULL, NULL}}; merge_scanlines_func blend_scanlines_name2func( const char *name ) @@ -450,6 +448,7 @@ tint_scanlines( ASScanline *bottom, ASScanline *top, int offset ) bb[i] = (bb[i]*(tb[i]>>1))>>15 ; } } + (void)ba; // silence unused variable warning } void /* addition with saturation : */ diff --git a/graf2d/asimage/src/libAfterImage/bmp.c b/graf2d/asimage/src/libAfterImage/bmp.c index 667ff2490025b..71d2ff8457d20 100644 --- a/graf2d/asimage/src/libAfterImage/bmp.c +++ b/graf2d/asimage/src/libAfterImage/bmp.c @@ -49,14 +49,13 @@ dib_data_to_scanline( ASScanline *buf, switch( bmp_info->biBitCount ) { case 1 : - for( x = 0 ; x < bmp_info->biWidth ; x++ ) - { - int entry = (data[x>>3]&(1<<(x&0x07)))?cmap_entry_size:0 ; + for (x = 0; x < (int)bmp_info->biWidth; x++) { + int entry = (data[x>>3]&(1<<(x&0x07)))?cmap_entry_size:0 ; buf->red[x] = cmap[entry+2]; buf->green[x] = cmap[entry+1]; buf->blue[x] = cmap[entry]; - } - break ; + } + break ; case 4 : for( x = 0 ; x < (int)bmp_info->biWidth ; x++ ) { @@ -357,7 +356,8 @@ bmp_write16 (FILE *fp, CARD16 *data, int count) Bool ASImage2bmp ( ASImage *im, const char *path, ASImageExportParams *params ) { - Bool success = False; + (void)params; // silence unused variable warning + Bool success = False; FILE *outfile = NULL ; START_TIME(started); @@ -387,8 +387,8 @@ ASImage2bmp ( ASImage *im, const char *path, ASImageExportParams *params ) bmp_write32( outfile, &bmi->bmiHeader.biCompression, 6 ); /* writing off the bitmapbits */ - if (fwrite( bmbits, sizeof(CARD8), bits_size, outfile ) == bits_size) - success = True; + if ((int)fwrite(bmbits, sizeof(CARD8), bits_size, outfile) == bits_size) + success = True; free( bmbits ); free( bmi ); @@ -413,9 +413,9 @@ bmp_read32 (FILE *fp, CARD32 *data, int count) CARD8 *raw = (CARD8*)data ; #endif total = fread((char*) data, sizeof (CARD8), count<<2, fp)>>2; - count = 0 ; #ifdef WORDS_BIGENDIAN /* BMPs are encoded as Little Endian */ - while( count < total ) + count = 0; + while( count < total ) { data[count] = (raw[0]<<24)|(raw[1]<<16)|(raw[2]<<8)|raw[3]; ++count ; @@ -436,9 +436,9 @@ bmp_read16 (FILE *fp, CARD16 *data, int count) CARD8 *raw = (CARD8*)data ; #endif total = fread((char*) data, sizeof (CARD8), count<<1, fp)>>1; - count = 0 ; #ifdef WORDS_BIGENDIAN /* BMPs are encoded as Little Endian */ - while( count < total ) + count = 0; + while( count < total ) { data[count] = (raw[0]<<16)|raw[1]; ++count ; @@ -512,11 +512,12 @@ read_bmp_image( FILE *infile, size_t data_offset, BITMAPINFOHEADER *bmp_info, size_t ret; cmap = safemalloc( cmap_entries * cmap_entry_size ); ret = fread(cmap, sizeof (CARD8), cmap_entries * cmap_entry_size, infile); - if (ret != cmap_entries * cmap_entry_size) { - if (cmap) free(cmap); - return NULL; - } - } + if ((int)ret != cmap_entries * cmap_entry_size) { + if (cmap) + free(cmap); + return NULL; + } + } if( add_colormap ) data_offset += cmap_entries*cmap_entry_size ; diff --git a/graf2d/asimage/src/libAfterImage/char2uni.c b/graf2d/asimage/src/libAfterImage/char2uni.c index 0cb2ad59367fe..753f9e4f5a36f 100644 --- a/graf2d/asimage/src/libAfterImage/char2uni.c +++ b/graf2d/asimage/src/libAfterImage/char2uni.c @@ -763,10 +763,9 @@ parse_short_charset_name( const char *name ) ASSupportedCharsets parse_charset_name( const char *name ) { - ASSupportedCharsets set = 0; - int i = 0; - if( name == NULL || name[0] == '\0' || name[1] == '\0' ) /* that includes locale "C" */ - return CHARSET_ISO8859_1 ; + int i = 0; + if (name == NULL || name[0] == '\0' || name[1] == '\0') /* that includes locale "C" */ + return CHARSET_ISO8859_1 ; /* if locale name came from LANG env var it may have formatof : * language.charset@modifier * we only need charset part of it here: */ @@ -929,8 +928,8 @@ parse_charset_name( const char *name ) if( name[3] == 'A' || name[3] == 'a' ) return CHARSET_CP1252 ; } - set = CHARSET_CP1250 ; - }else if( name[0] == 'A' || name[0] == 'a' ) /* ARABIC or ASMO-708 */ + return CHARSET_CP1250; + }else if( name[0] == 'A' || name[0] == 'a' ) /* ARABIC or ASMO-708 */ { return CHARSET_ISO8859_6 ; }else if( name[0] == 'G' || name[0] == 'g' ) /* GREEK or GREEK8 */ @@ -947,6 +946,7 @@ parse_charset_name( const char *name ) } #if 0 + ASSupportedCharsets set = 0; while( set < SUPPORTED_CHARSETS_NUM ) { char **aliases =&(_as_charset_names[set][0]) ; diff --git a/graf2d/asimage/src/libAfterImage/draw.c b/graf2d/asimage/src/libAfterImage/draw.c index c3d55fe3d4a3b..b1606bd1c3fbe 100644 --- a/graf2d/asimage/src/libAfterImage/draw.c +++ b/graf2d/asimage/src/libAfterImage/draw.c @@ -1006,8 +1006,10 @@ asim_apply_path( ASDrawContext *ctx, int start_x, int start_y, Bool fill, int fi LOCAL_DEBUG_CALLER_OUT( "start_x = %d, start_y = %d, fill = %d, fill_start_x = %d, fill_start_y = %d", start_x, start_y, fill, fill_start_x, fill_start_y ); + (void)start_x; + (void)start_y; // silence unused variable warning - /* TODO : contour tracing functionality : */ + /* TODO : contour tracing functionality : */ if( fill ) asim_flood_fill( ctx, fill_start_x, fill_start_y, 0, fill_threshold==0?CTX_DEFAULT_FILL_THRESHOLD:fill_threshold ); diff --git a/graf2d/asimage/src/libAfterImage/export.c b/graf2d/asimage/src/libAfterImage/export.c index e53ce5b979f12..21515a3b22f30 100644 --- a/graf2d/asimage/src/libAfterImage/export.c +++ b/graf2d/asimage/src/libAfterImage/export.c @@ -473,8 +473,8 @@ ASImage2png_int ( ASImage *im, void *data, png_rw_ptr write_fn, png_flush_ptr fl static const ASPngExportParams defaults = { ASIT_Png, EXPORT_ALPHA, -1 }; png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if ( png_ptr != NULL ) - if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) + if (png_ptr != NULL) + if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) if( setjmp(png_jmpbuf(png_ptr)) ) { png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); @@ -660,7 +660,8 @@ void asim_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length) void asim_png_flush_data(png_structp png_ptr) { - /* nothing to do really, but PNG requires it */ + (void)png_ptr; // silence unused variable warning + /* nothing to do really, but PNG requires it */ } @@ -873,8 +874,11 @@ ASImage2jpeg( ASImage *im, const char *path, ASImageExportParams *params ) Bool ASImage2xcf ( ASImage *im, const char *path, ASImageExportParams *params ) { - /* More stuff */ - XcfImage *xcf_im = NULL; + (void)im; + (void)path; + (void)params; // silence unused variable warning + /* More stuff */ + XcfImage *xcf_im = NULL; START_TIME(started); SHOW_PENDING_IMPLEMENTATION_NOTE("XCF"); @@ -897,7 +901,10 @@ ASImage2xcf ( ASImage *im, const char *path, ASImageExportParams *params ) Bool ASImage2ppm ( ASImage *im, const char *path, ASImageExportParams *params ) { - START_TIME(started); + (void)im; + (void)path; + (void)params; // silence unused variable warning + START_TIME(started); SHOW_PENDING_IMPLEMENTATION_NOTE("PPM"); SHOW_TIME("image export",started); return False; @@ -910,7 +917,10 @@ ASImage2ppm ( ASImage *im, const char *path, ASImageExportParams *params ) Bool ASImage2ico ( ASImage *im, const char *path, ASImageExportParams *params ) { - START_TIME(started); + (void)im; + (void)path; + (void)params; // silence unused variable warning + START_TIME(started); SHOW_PENDING_IMPLEMENTATION_NOTE("ICO"); SHOW_TIME("image export",started); return False; @@ -925,8 +935,8 @@ Bool ASImage2gif( ASImage *im, const char *path, ASImageExportParams *params ) GifFileType *gif = NULL ; ColorMapObject *gif_cmap ; Bool dont_save_cmap = False ; - static const ASGifExportParams defaultsGif = { ASIT_Gif,EXPORT_ALPHA|EXPORT_APPEND, 3, 127, 10 }; - ASImageExportParams defaults; + static const ASGifExportParams defaultsGif = {ASIT_Gif, EXPORT_ALPHA | EXPORT_APPEND, 3, 127, 10, 0}; + ASImageExportParams defaults; ASColormap cmap; int *mapped_im ; int y ; @@ -1272,8 +1282,8 @@ ASImage2tiff( ASImage *im, const char *path, ASImageExportParams *params) TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 8); TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - if( params->tiff.compression_type == -1 ) - params->tiff.compression_type = defaultsTiff.compression_type ; + if (params->tiff.compression_type == (unsigned int)-1) + params->tiff.compression_type = defaultsTiff.compression_type ; TIFFSetField(out, TIFFTAG_COMPRESSION, params->tiff.compression_type); switch (params->tiff.compression_type ) { diff --git a/graf2d/asimage/src/libAfterImage/imencdec.c b/graf2d/asimage/src/libAfterImage/imencdec.c index ee9ceb2416a7d..927d9efff3746 100644 --- a/graf2d/asimage/src/libAfterImage/imencdec.c +++ b/graf2d/asimage/src/libAfterImage/imencdec.c @@ -115,13 +115,13 @@ Bool create_image_xim( ASVisual *asv, ASImage *im, ASAltImFormats format ) format = ASA_ScratchXImage ; do_alpha = True ; } + (void)do_alpha; // silence unused variable warning - if( format == ASA_ScratchXImage || format == ASA_ScratchMaskXImage ) - { - scratch = True ; + if (format == ASA_ScratchXImage || format == ASA_ScratchMaskXImage) { + scratch = True ; format = (format - ASA_ScratchXImage ) + ASA_XImage ; - } - dst = (format == ASA_MaskXImage )? &(im->alt.mask_ximage):&(im->alt.ximage); + } + dst = (format == ASA_MaskXImage )? &(im->alt.mask_ximage):&(im->alt.ximage); if( *dst == NULL ) { int depth = 0 ; @@ -141,8 +141,10 @@ Bool create_image_xim( ASVisual *asv, ASImage *im, ASAltImFormats format ) Bool create_image_argb32( ASVisual *asv, ASImage *im, ASAltImFormats format ) { - if( im->alt.argb32 == NULL ) - im->alt.argb32 = safemalloc( im->width*im->height*sizeof(ARGB32) ); + (void)asv; + (void)format; // silence unused variable warning + if (im->alt.argb32 == NULL) + im->alt.argb32 = safemalloc( im->width*im->height*sizeof(ARGB32) ); return True; } @@ -151,8 +153,9 @@ Bool create_image_argb32( ASVisual *asv, ASImage *im, ASAltImFormats format ) static void asimage_dup_line (ASImage * im, ColorPart color, unsigned int y1, unsigned int y2, unsigned int length) { - ASStorageID *part = im->channels[color]; - if (part[y2] != 0) + (void)length; // silence unused variable warning + ASStorageID *part = im->channels[color]; + if (part[y2] != 0) { forget_data(NULL, part[y2]); part[y2] = 0 ; @@ -193,6 +196,7 @@ asimage_erase_line( ASImage * im, ColorPart color, unsigned int y ) void copy_component( register CARD32 *src, register CARD32 *dst, int *unused, int len ) { + (void)unused; // silence unused variable warning #if 1 #ifdef CARD64 CARD64 *dsrc = (CARD64*)src; @@ -612,27 +616,27 @@ best_output_filter( register CARD32 *line1, register CARD32 *line2, int unused, {/* we carry half of the quantization error onto the surrounding pixels : */ /* X 7/16 */ /* 3/16 5/16 1/16 */ - register int i ; - register CARD32 errp = 0, err = 0, c; - c = line1[0]; - if( (c&0xFFFF0000)!= 0 ) - c = ( c&0x7F000000 )?0:0x0000FFFF; - errp = c&QUANT_ERR_MASK; - line1[0] = c>>QUANT_ERR_BITS ; - line2[0] += (errp*5)>>4 ; - - for( i = 1 ; i < len ; ++i ) - { - c = line1[i]; - if( (c&0xFFFF0000)!= 0 ) - c = (c&0x7F000000)?0:0x0000FFFF; - c += ((errp*7)>>4) ; - err = c&QUANT_ERR_MASK; - line1[i] = (c&0x7FFF0000)?0x000000FF:(c>>QUANT_ERR_BITS); - line2[i-1] += (err*3)>>4 ; - line2[i] += ((err*5)>>4)+(errp>>4); - errp = err ; - } + (void)unused; // silence unused variable warning + register int i; + register CARD32 errp = 0, err = 0, c; + c = line1[0]; + if ((c & 0xFFFF0000) != 0) + c = (c & 0x7F000000) ? 0 : 0x0000FFFF; + errp = c & QUANT_ERR_MASK; + line1[0] = c >> QUANT_ERR_BITS; + line2[0] += (errp * 5) >> 4; + + for (i = 1; i < len; ++i) { + c = line1[i]; + if ((c & 0xFFFF0000) != 0) + c = (c & 0x7F000000) ? 0 : 0x0000FFFF; + c += ((errp * 7) >> 4); + err = c & QUANT_ERR_MASK; + line1[i] = (c & 0x7FFF0000) ? 0x000000FF : (c >> QUANT_ERR_BITS); + line2[i - 1] += (err * 3) >> 4; + line2[i] += ((err * 5) >> 4) + (errp >> 4); + errp = err; + } } static inline void @@ -720,8 +724,9 @@ fast_output_filter( register CARD32 *src, register CARD32 *dst, short ratio, int static inline void fine_output_filter_mod( register CARD32 *data, int unused, int len ) {/* we carry half of the quantization error onto the following pixel : */ - register int i ; - register CARD32 err = 0, c; + (void)unused; // silence unused variable warning + register int i; + register CARD32 err = 0, c; for( i = 0 ; i < len ; ++i ) { c = data[i]; @@ -901,6 +906,8 @@ decode_asscanline_ximage( ASImageDecoder *imdec, unsigned int skip, int y ) { while(--x >= 0 ) dst[x] = (XGetPixel(xim, x, y) == 0)?0x00:0xFF; } +#else + (void)y; // silence unused variable warning #endif } count = MIN(width,xim_width); @@ -1130,15 +1137,15 @@ decode_image_scanline_beveled( ASImageDecoder *imdec ) int alt_right = (line*bevel->right_outline/bevel->bottom_outline)+1 ; alt_left += MAX(imdec->bevel_left-(int)bevel->left_outline,0) ; - offset_shade = MIN(alt_left, (int)scl->width ); if( (int)scl->width < imdec->bevel_right ) alt_right -= imdec->bevel_right-(int)scl->width ; -/* fprintf( stderr, __FUNCTION__ " %d: y_out = %d, alt_left = %d, offset_shade = %d, alt_right = %d, scl->width = %d, out_width = %d\n", - __LINE__, y_out, alt_left, offset_shade, alt_right, scl->width, imdec->out_width ); - */ - set_flags( scl->flags, imdec->filter ); + /* offset_shade = MIN(alt_left, (int)scl->width ); fprintf( stderr, __FUNCTION__ " %d: y_out = %d, alt_left = + %d, offset_shade = %d, alt_right = %d, scl->width = %d, out_width = %d\n", + __LINE__, y_out, alt_left, offset_shade, alt_right, scl->width, imdec->out_width ); + */ + set_flags( scl->flags, imdec->filter ); draw_solid_bevel_line( scl, alt_left, alt_left, alt_left, alt_right, bevel->hi_color, bevel->lo_color, bevel->hilo_color, bevel->lolo_color ); @@ -1237,6 +1244,7 @@ decode_image_scanline_beveled( ASImageDecoder *imdec ) ++(imdec->next_line); } +#ifndef X_DISPLAY_MISSING /* *********************************************************************/ /* ENCODER : */ inline static void @@ -1253,6 +1261,7 @@ tile_ximage_line( XImage *xim, unsigned int line, int step, int range ) dst_line += xim_step ; } } +#endif void encode_image_scanline_mask_xim( ASImageOutput *imout, ASScanline *to_store ) @@ -1284,6 +1293,9 @@ encode_image_scanline_mask_xim( ASImageOutput *imout, ASScanline *to_store ) (imout->tiling_range ? imout->tiling_range:imout->im->height) ); imout->next_line += imout->bottom_to_top; } +#else + (void)imout; + (void)to_store; // silence unused variable warning #endif } @@ -1342,6 +1354,9 @@ encode_image_scanline_xim( ASImageOutput *imout, ASScanline *to_store ) #endif imout->next_line += imout->bottom_to_top; } +#else + (void)imout; + (void)to_store; // silence unused variable warning #endif } diff --git a/graf2d/asimage/src/libAfterImage/import.c b/graf2d/asimage/src/libAfterImage/import.c index 1441eee6cd279..595003ff0ef58 100644 --- a/graf2d/asimage/src/libAfterImage/import.c +++ b/graf2d/asimage/src/libAfterImage/import.c @@ -300,13 +300,14 @@ void init_asimage_import_params( ASImageImportParams *iparams ) ASImage * file2ASImage( const char *file, ASFlagType what, double gamma, unsigned int compression, ... ) { - int i ; - char *paths[MAX_SEARCH_PATHS+1] ; - ASImageImportParams iparams ; - va_list ap; - - init_asimage_import_params( &iparams ); - iparams.gamma = gamma ; + (void)what; // silence unused variable warning + int i; + char *paths[MAX_SEARCH_PATHS + 1]; + ASImageImportParams iparams; + va_list ap; + + init_asimage_import_params(&iparams); + iparams.gamma = gamma ; iparams.compression = compression ; iparams.search_path = &(paths[0]); #if 0 @@ -363,6 +364,11 @@ file2pixmap(ASVisual *asv, Window root, const char *realfilename, Pixmap *mask_o XFreePixmap( asv->dpy, *mask_out ); *mask_out = mask ; } +#else + (void)asv; + (void)root; + (void)realfilename; + (void)mask_out; // silence unused variable warning #endif return trg ; } @@ -405,19 +411,20 @@ get_asimage_file_type( ASImageManager* imageman, const char *file ) ASImage * get_asimage( ASImageManager* imageman, const char *file, ASFlagType what, unsigned int compression ) { - ASImage *im = NULL ; - if( imageman && file ) - if( (im = fetch_asimage(imageman, file )) == NULL ) - { - im = load_image_from_path( file, &(imageman->search_path[0]), imageman->gamma); - if( im ) + (void)what; + (void)compression; // silence unused variable warning + + ASImage *im = NULL; + if (imageman && file) + if ((im = fetch_asimage(imageman, file)) == NULL) { + im = load_image_from_path(file, &(imageman->search_path[0]), imageman->gamma); + if( im ) { store_asimage( imageman, im, file ); set_flags( im->flags, ASIM_NAME_IS_FILENAME ); } - - } - return im; + } + return im; } void @@ -578,6 +585,8 @@ reload_asimage_manager( ASImageManager *imman ) return True; } } +#else + (void)imman; // silence unused variable warning #endif return False; } @@ -738,29 +747,27 @@ direntry2ASImageListEntry( const char *fname, const char *fullname, else tile_height = data->preview_height ; } - if( scale_width != im->width || scale_height != im->height ) - { - ASImage *tmp = scale_asimage( data->asv, im, scale_width, scale_height, ASA_ASImage, data->preview_compression, ASIMAGE_QUALITY_DEFAULT ); - if( tmp != NULL ) - { - destroy_asimage( &im ); - im = tmp ; - } - } - if( tile_width != im->width || tile_height != im->height ) - { - ASImage *tmp = tile_asimage( data->asv, im, 0, 0, tile_width, tile_height, TINT_NONE, ASA_ASImage, data->preview_compression, ASIMAGE_QUALITY_DEFAULT ); - if( tmp != NULL ) - { - destroy_asimage( &im ); - im = tmp ; - } - } - } - - curr->preview = im ; - } - return True; + if (scale_width != (int)im->width || scale_height != (int)im->height) { + ASImage *tmp = scale_asimage(data->asv, im, scale_width, scale_height, ASA_ASImage, + data->preview_compression, ASIMAGE_QUALITY_DEFAULT); + if (tmp != NULL) { + destroy_asimage(&im); + im = tmp; + } + } + if (tile_width != (int)im->width || tile_height != (int)im->height) { + ASImage *tmp = tile_asimage(data->asv, im, 0, 0, tile_width, tile_height, TINT_NONE, ASA_ASImage, + data->preview_compression, ASIMAGE_QUALITY_DEFAULT); + if (tmp != NULL) { + destroy_asimage(&im); + im = tmp; + } + } + } + + curr->preview = im; + } + return True; } #endif @@ -772,7 +779,8 @@ get_asimage_list( ASVisual *asv, const char *dir, unsigned int *count_ret, int (*select) (const char *) ) { - ASImageListEntry *im_list = NULL ; + (void)gamma; // silence unused variable warning + ASImageListEntry *im_list = NULL; #ifndef _WIN32 struct ASImageListAuxData aux_data ; int count ; @@ -1353,31 +1361,29 @@ png2ASImage_int( void *data, png_rw_ptr read_fn, ASImageImportParams *params ) { int i, pixel_i = -1; static CARD8 gray2bit_translation[4] = {0,85,170,255}; - for ( i = 0 ; i < row_bytes ; ++i ) - { - CARD8 b = row_pointers[y][i]; - upscaled_gray[++pixel_i] = gray2bit_translation[b&0x03]; - upscaled_gray[++pixel_i] = gray2bit_translation[(b&0xC)>>2]; - upscaled_gray[++pixel_i] = gray2bit_translation[(b&0x30)>>4]; - upscaled_gray[++pixel_i] = gray2bit_translation[(b&0xC0)>>6]; - } - im->channels[IC_RED][y] = store_data( NULL, upscaled_gray, width, rgb_flags, 0); - }else if ( bit_depth == 4 ) - { - int i, pixel_i = -1; - static CARD8 gray4bit_translation[16] = {0,17,34,51, 68,85,102,119, 136,153,170,187, 204,221,238,255}; - for ( i = 0 ; i < row_bytes ; ++i ) - { - CARD8 b = row_pointers[y][i]; - upscaled_gray[++pixel_i] = gray4bit_translation[b&0x0F]; - upscaled_gray[++pixel_i] = gray4bit_translation[(b&0xF0)>>4]; - } - im->channels[IC_RED][y] = store_data( NULL, upscaled_gray, width, rgb_flags, 0); - }else - im->channels[IC_RED][y] = store_data( NULL, row_pointers[y], row_bytes, rgb_flags, 1); - } - - if( grayscale ) + for (i = 0; (size_t)i < row_bytes; ++i) { + CARD8 b = row_pointers[y][i]; + upscaled_gray[++pixel_i] = gray2bit_translation[b & 0x03]; + upscaled_gray[++pixel_i] = gray2bit_translation[(b & 0xC) >> 2]; + upscaled_gray[++pixel_i] = gray2bit_translation[(b & 0x30) >> 4]; + upscaled_gray[++pixel_i] = gray2bit_translation[(b&0xC0)>>6]; + } + im->channels[IC_RED][y] = store_data(NULL, upscaled_gray, width, rgb_flags, 0); + } else if (bit_depth == 4) { + int i, pixel_i = -1; + static CARD8 gray4bit_translation[16] = {0, 17, 34, 51, 68, 85, 102, 119, + 136, 153, 170, 187, 204, 221, 238, 255}; + for (i = 0; (size_t)i < row_bytes; ++i) { + CARD8 b = row_pointers[y][i]; + upscaled_gray[++pixel_i] = gray4bit_translation[b & 0x0F]; + upscaled_gray[++pixel_i] = gray4bit_translation[(b & 0xF0) >> 4]; + } + im->channels[IC_RED][y] = store_data(NULL, upscaled_gray, width, rgb_flags, 0); + } else + im->channels[IC_RED][y] = store_data(NULL, row_pointers[y], row_bytes, rgb_flags, 1); + } + + if( grayscale ) { im->channels[IC_GREEN][y] = dup_data( NULL, im->channels[IC_RED][y] ); im->channels[IC_BLUE][y] = dup_data( NULL, im->channels[IC_RED][y] ); @@ -1721,11 +1727,12 @@ jpeg2ASImage( const char * path, ASImageImportParams *params ) ASImage * xcf2ASImage( const char * path, ASImageImportParams *params ) { - ASImage *im = NULL ; - /* More stuff */ - FILE *infile; /* source file */ - XcfImage *xcf_im; - START_TIME(started); + (void)params; // silence unused variable warning + ASImage *im = NULL; + /* More stuff */ + FILE *infile; /* source file */ + XcfImage *xcf_im; + START_TIME(started); /* we want to open the input file before doing anything else, * so that the setjmp() error recovery below can assume the file is open. @@ -1983,26 +1990,24 @@ gif2ASImage( const char * path, ASImageImportParams *params ) { unsigned int x ; Bool do_alpha = False ; - image_y = interlaced ? gif_interlaced2y(y, height):y; - for (x = 0; x < width; ++x) - { - int c = row_pointer[x]; - if ( c == transparent) - { - c = bg_color ; - do_alpha = True ; + image_y = interlaced ? gif_interlaced2y(y, height) : (int)y; + for (x = 0; x < width; ++x) { + int c = row_pointer[x]; + if (c == transparent) { + c = bg_color; + do_alpha = True ; a[x] = 0 ; - }else - a[x] = 0x00FF ; + } else + a[x] = 0x00FF; - r[x] = cmap->Colors[c].Red; + r[x] = cmap->Colors[c].Red; g[x] = cmap->Colors[c].Green; b[x] = cmap->Colors[c].Blue; - } - row_pointer += x ; - im->channels[IC_RED][image_y] = store_data( NULL, r, width, ASStorage_RLEDiffCompress, 0); - im->channels[IC_GREEN][image_y] = store_data( NULL, g, width, ASStorage_RLEDiffCompress, 0); - im->channels[IC_BLUE][image_y] = store_data( NULL, b, width, ASStorage_RLEDiffCompress, 0); + } + row_pointer += x; + im->channels[IC_RED][image_y] = store_data(NULL, r, width, ASStorage_RLEDiffCompress, 0); + im->channels[IC_GREEN][image_y] = store_data(NULL, g, width, ASStorage_RLEDiffCompress, 0); + im->channels[IC_BLUE][image_y] = store_data( NULL, b, width, ASStorage_RLEDiffCompress, 0); if( do_alpha ) im->channels[IC_ALPHA][image_y] = store_data( NULL, a, im->width, ASStorage_RLEDiffCompress|ASStorage_Bitmap, 0); } @@ -2165,51 +2170,49 @@ tiff2ASImage( const char * path, ASImageImportParams *params ) uint32_t *bc; TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc); int all_strip_size = 0; - for (strip_no = 0; strip_no < TIFFNumberOfStrips(tif); ++strip_no) - all_strip_size += bc[strip_no]; - /* create one large buffer for the image data : */ - if (data_size < all_strip_size) - { - data_size = all_strip_size; + for (strip_no = 0; strip_no < (int)TIFFNumberOfStrips(tif); ++strip_no) + all_strip_size += bc[strip_no]; + /* create one large buffer for the image data : */ + if (data_size < all_strip_size) { + data_size = all_strip_size; _TIFFfree(data); data = _TIFFmalloc(data_size); - } + } - if (planar_config == PLANARCONFIG_CONTIG) + if (planar_config == PLANARCONFIG_CONTIG) { - for (strip_no = 0; strip_no < TIFFNumberOfStrips(tif); strip_no++) - { - int bytes_in; - if (bits == 12) /* can't use libTIFF's function - it can't handle 12bit data ! */ - { - /* PENTAX cameras claim that data is compressed as runlength packbits - - it is not in fact run-length, which confuses libTIFF - */ - bytes_in = TIFFReadRawStrip(tif, strip_no, data+loaded_data_size, data_size-loaded_data_size); - }else - bytes_in = TIFFReadEncodedStrip(tif, strip_no, data+loaded_data_size, data_size-loaded_data_size); - -LOCAL_DEBUG_OUT( "strip size = %d, bytes_in = %d, bytes_per_row = %d", bc[strip_no], bytes_in, bytes_per_row); - if (bytes_in >= 0) + for (strip_no = 0; strip_no < (int)TIFFNumberOfStrips(tif); strip_no++) { + int bytes_in; + if (bits == 12) /* can't use libTIFF's function - it can't handle 12bit data ! */ + { + /* PENTAX cameras claim that data is compressed as runlength packbits - + it is not in fact run-length, which confuses libTIFF + */ + bytes_in = + TIFFReadRawStrip(tif, strip_no, data + loaded_data_size, data_size - loaded_data_size); + } else + bytes_in = TIFFReadEncodedStrip(tif, strip_no, data + loaded_data_size, + data_size - loaded_data_size); + + LOCAL_DEBUG_OUT("strip size = %d, bytes_in = %d, bytes_per_row = %d", bc[strip_no], bytes_in, + bytes_per_row); + if (bytes_in >= 0) loaded_data_size += bytes_in; else { LOCAL_DEBUG_OUT( "failed reading strip %d", strip_no); } - } - } else if (planar_config == PLANARCONFIG_SEPARATE) - { - /* TODO: do something with split channels */ - } - }else - { - /* TODO: implement support for tiled images */ - } - - if (loaded_data_size > 0) - { - int offset; - int data_row = 0; + } + } else if (planar_config == PLANARCONFIG_SEPARATE) { + /* TODO: do something with split channels */ + } + } else { + /* TODO: implement support for tiled images */ + } + + if (loaded_data_size > 0) { + int offset; + int data_row = 0; do { offset = data_row * bytes_per_row; @@ -2242,9 +2245,9 @@ LOCAL_DEBUG_OUT( "strip size = %d, bytes_in = %d, bytes_per_row = %d", bc[strip_ data_row += loaded_rows; }while (offset < loaded_data_size); success = True; - } - } - destroy_asim_strip (&strip); + } + } + destroy_asim_strip (&strip); stop_image_output( &imout ); if (!success) @@ -2256,51 +2259,48 @@ LOCAL_DEBUG_OUT( "strip size = %d, bytes_in = %d, bytes_per_row = %d", bc[strip_ { register CARD32 *row = data ; int y = first_row + rows_per_strip ; - if( y > height ) - y = height ; - while( --y >= first_row ) - { - int x ; - for( x = 0 ; x < width ; ++x ) - { - CARD32 c = row[x] ; - if( depth == 4 || depth == 2 ) - a[x] = TIFFGetA(c); - r[x] = TIFFGetR(c); - if( depth > 2 ) + if (y > (int)height) + y = height; + while (--y >= first_row) { + int x; + for (x = 0; x < (int)width; ++x) { + CARD32 c = row[x]; + if (depth == 4 || depth == 2) + a[x] = TIFFGetA(c); + r[x] = TIFFGetR(c); + if( depth > 2 ) { g[x] = TIFFGetG(c); b[x] = TIFFGetB(c); } - } - im->channels[IC_RED][y] = store_data( NULL, r, width, store_flags, 0); - if( depth > 2 ) - { - im->channels[IC_GREEN][y] = store_data( NULL, g, width, store_flags, 0); - im->channels[IC_BLUE][y] = store_data( NULL, b, width, store_flags, 0); - }else - { - im->channels[IC_GREEN][y] = dup_data( NULL, im->channels[IC_RED][y]); - im->channels[IC_BLUE][y] = dup_data( NULL, im->channels[IC_RED][y]); - } - - if( depth == 4 || depth == 2 ) - im->channels[IC_ALPHA][y] = store_data( NULL, a, width, store_flags, 0); - row += width ; - } - /* move onto the next strip now : */ - do - { - first_row += rows_per_strip ; - }while (first_row < height && !TIFFReadRGBAStrip(tif, first_row, (void*)data)); - - }while (first_row < height); - } - set_asstorage_block_size( NULL, old_storage_block_size ); - - if( b ) free( b ); - if( g ) free( g ); - if( r ) free( r ); + } + im->channels[IC_RED][y] = store_data(NULL, r, width, store_flags, 0); + if (depth > 2) { + im->channels[IC_GREEN][y] = store_data(NULL, g, width, store_flags, 0); + im->channels[IC_BLUE][y] = store_data(NULL, b, width, store_flags, 0); + } else { + im->channels[IC_GREEN][y] = dup_data(NULL, im->channels[IC_RED][y]); + im->channels[IC_BLUE][y] = dup_data(NULL, im->channels[IC_RED][y]); + } + + if (depth == 4 || depth == 2) + im->channels[IC_ALPHA][y] = store_data(NULL, a, width, store_flags, 0); + row += width ; + } + /* move onto the next strip now : */ + do { + first_row += rows_per_strip ; + } while (first_row < (int)height && !TIFFReadRGBAStrip(tif, first_row, (void *)data)); + + } while (first_row < (int)height); + } + set_asstorage_block_size(NULL, old_storage_block_size); + + if (b) + free(b); + if (g) + free(g); + if( r ) free( r ); if( a ) free( a ); _TIFFfree(data); } @@ -2325,6 +2325,11 @@ tiff2ASImage( const char * path, ASImageImportParams *params ) static ASImage * load_xml2ASImage( ASImageManager *imman, const char *path, unsigned int compression, int width, int height ) { + (void)imman; + (void)path; + (void)compression; + (void)width; + (void)height; // silence unused variable warning // Incompatible license fprintf(stderr, "ERROR in load_xml2ASImage: XML import is disabled.\n"); ASImage *im = NULL ; @@ -2449,8 +2454,9 @@ svg2ASImage( const char * path, ASImageImportParams *params ) ASImage * svg2ASImage( const char * path, ASImageImportParams *params ) { - show_error( "unable to load file \"%s\" - missing SVG image format libraries.\n", path ); - return NULL ; + (void)params; // silence unused variable warning + show_error("unable to load file \"%s\" - missing SVG image format libraries.\n", path); + return NULL; } #endif /* SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG SVG */ @@ -2507,15 +2513,21 @@ typedef struct ASTGAImageData static Bool load_tga_colormapped(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf, CARD8 *gamma_table ) { - - return True; + (void)infile; + (void)tga; + (void)cmap; + (void)buf; + (void)read_buf; + (void)gamma_table; // silence unused variable warning + return True; } static Bool load_tga_truecolor(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf, CARD8 *gamma_table ) { - CARD32 *a = buf->alpha ; - CARD32 *r = buf->red ; - CARD32 *g = buf->green ; + (void)cmap; // silence unused variable warning + CARD32 *a = buf->alpha; + CARD32 *r = buf->red; + CARD32 *g = buf->green ; CARD32 *b = buf->blue ; int bpp = (tga->ImageSpec.Depth+7)/8; int bpl = buf->width*bpp; @@ -2557,26 +2569,46 @@ static Bool load_tga_truecolor(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cm static Bool load_tga_bw(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf, CARD8 *gamma_table ) { - - return True; + (void)infile; + (void)tga; + (void)cmap; + (void)buf; + (void)read_buf; + (void)gamma_table; // silence unused variable warning + return True; } static Bool load_tga_rle_colormapped(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf, CARD8 *gamma_table ) { - - return True; + (void)infile; + (void)tga; + (void)cmap; + (void)buf; + (void)read_buf; + (void)gamma_table; // silence unused variable warning + return True; } static Bool load_tga_rle_truecolor(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf, CARD8 *gamma_table ) { - - return True; + (void)infile; + (void)tga; + (void)cmap; + (void)buf; + (void)read_buf; + (void)gamma_table; // silence unused variable warning + return True; } static Bool load_tga_rle_bw(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf, CARD8 *gamma_table ) { - - return True; + (void)infile; + (void)tga; + (void)cmap; + (void)buf; + (void)read_buf; + (void)gamma_table; // silence unused variable warning + return True; } @@ -2684,7 +2716,9 @@ tga2ASImage( const char * path, ASImageImportParams *params ) ASImage * convert_argb2ASImage( ASVisual *asv, int width, int height, ARGB32 *argb, CARD8 *gamma_table ) { - ASImage *im = NULL ; + (void)asv; + (void)gamma_table; // silence unused variable warning + ASImage *im = NULL ; ASImageOutput *imout ; im = create_asimage( width, height, 100 ); if((imout = start_image_output( NULL, im, ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT)) == NULL ) diff --git a/graf2d/asimage/src/libAfterImage/scanline.c b/graf2d/asimage/src/libAfterImage/scanline.c index a35eee93e2c07..add6fba000ba7 100644 --- a/graf2d/asimage/src/libAfterImage/scanline.c +++ b/graf2d/asimage/src/libAfterImage/scanline.c @@ -307,8 +307,9 @@ typedef void (*ASIMDiagInterpolationFunc) (CARD32 *dst, CARD32 **channs, int wid void interpolate_channel_v_15x51 (CARD32 *dst, CARD32 **channs, int width, int offset) { - /* Assumptions : channs is array of 5 CARD32 pointers not NULL */ - int x; + (void)offset; // silence unused variable warning + /* Assumptions : channs is array of 5 CARD32 pointers not NULL */ + int x; for (x = 0; x < width; ++x) { int v = (int)channs[1][x]*5+(int)channs[3][x]*5-(int)channs[4][x]-(int)channs[0][x]; @@ -332,8 +333,9 @@ interpolate_channel_v_checkered_15x51 (CARD32 *dst, CARD32 **channs, int width, void smooth_channel_v_15x51 (CARD32 *dst, CARD32 **channs, int width, int offset) { - /* Assumptions : channs is array of 5 CARD32 pointers not NULL */ - int x; + (void)offset; // silence unused variable warning + /* Assumptions : channs is array of 5 CARD32 pointers not NULL */ + int x; for (x = 0; x < width; ++x) { int v = (int)(channs[2][x]<<3) + (int)channs[1][x]*5+(int)channs[3][x]*5-(int)channs[4][x]-(int)channs[0][x]; @@ -573,7 +575,8 @@ Bool calculate_green_diff(ASIMStrip *strip, int line, int chan, int offset) Bool interpolate_green_diff(ASIMStrip *strip, int line, int chan, int offset) { - if (line > 0 && line < strip->size-1) + (void)offset; // silence unused variable warning + if (line > 0 && line < strip->size-1) { ASScanline *above = strip->lines[line-1]; ASScanline *below = strip->lines[line+1]; @@ -605,7 +608,8 @@ interpolate_green_diff(ASIMStrip *strip, int line, int chan, int offset) Bool interpolate_from_green_diff(ASIMStrip *strip, int line, int chan, int offset) { - int width = strip->lines[line]->width; + (void)offset; // silence unused variable warning + int width = strip->lines[line]->width; CARD32 *green = strip->lines[line]->green; CARD32 *dst = strip->lines[line]->channels[chan]; int *diff = strip->aux_data[line]; @@ -669,12 +673,13 @@ interpolate_asim_strip_custom_rggb2 (ASIMStrip *strip, ASFlagType filter, Bool f set_flags(strip->lines[line]->flags, ASIM_SCL_InterpolatedH<size-1 ; ++line) if (get_flags(strip->lines[line]->flags, SCL_DO_GREEN) diff --git a/graf2d/asimage/src/libAfterImage/transform.c b/graf2d/asimage/src/libAfterImage/transform.c index 2c490033338c3..838f985fcf6f3 100644 --- a/graf2d/asimage/src/libAfterImage/transform.c +++ b/graf2d/asimage/src/libAfterImage/transform.c @@ -139,14 +139,13 @@ static inline void enlarge_component23( register CARD32 *src, register CARD32 *dst, int *scales, int len ) {/* expected len >= 2 */ register int i = 0, k = 0; - register int c1 = src[0], c4 = src[1]; - if( scales[0] == 1 ) - {/* special processing for first element - it can be 1 - others can only be 2 or 3 */ - dst[k] = INTERPOLATE_COLOR1(src[0]) ; + register int c1 = src[0], c4; + if (scales[0] == 1) { /* special processing for first element - it can be 1 - others can only be 2 or 3 */ + dst[k] = INTERPOLATE_COLOR1(src[0]) ; ++k; ++i; - } - --len; --len ; + } + --len; --len ; while( i < len ) { register int c2 = src[i], c3 = src[i+1] ; @@ -295,18 +294,19 @@ shrink_component( register CARD32 *src, register CARD32 *dst, int *scales, int l static inline void shrink_component11( register CARD32 *src, register CARD32 *dst, int *scales, int len ) { - register int i ; - for( i = 0 ; i < len ; ++i ) - dst[i] = AVERAGE_COLOR1(src[i]); + (void)scales; // silence unused variable warning + register int i; + for (i = 0; i < len; ++i) + dst[i] = AVERAGE_COLOR1(src[i]); } - static inline void reverse_component( register CARD32 *src, register CARD32 *dst, int *unused, int len ) { - register int i = 0; - src += len-1 ; - do + (void)unused; // silence unused variable warning + register int i = 0; + src += len - 1; + do { dst[i] = src[-i]; }while(++i < len ); @@ -315,7 +315,8 @@ reverse_component( register CARD32 *src, register CARD32 *dst, int *unused, int static inline void add_component( CARD32 *src, CARD32 *incr, int *scales, int len ) { - len += len&0x01; + (void)scales; // silence unused variable warning + len += len & 0x01; #ifdef HAVE_MMX #if 1 if( asimage_use_mmx ) @@ -386,10 +387,10 @@ start_component_interpolation( CARD32 *c1, CARD32 *c2, CARD32 *c3, CARD32 *c4, r static inline void component_interpolation_hardcoded( CARD32 *c1, CARD32 *c2, CARD32 *c3, CARD32 *c4, register CARD32 *T, CARD32 *unused, CARD16 kind, int len) { - register int i; - if( kind == 1 ) - { - for( i = 0 ; i < len ; i++ ) + (void)unused; // silence unused variable warning + register int i; + if (kind == 1) { + for( i = 0 ; i < len ; i++ ) { #if 1 /* its seems that this simple formula is completely sufficient @@ -403,15 +404,14 @@ component_interpolation_hardcoded( CARD32 *c1, CARD32 *c2, CARD32 *c3, CARD32 *c (plus-minus)>>2; #endif } - }else if( kind == 2 ) - { - for( i = 0 ; i < len ; i++ ) + } else if (kind == 2) { + for( i = 0 ; i < len ; i++ ) { register int rc1 = c1[i], rc2 = c2[i], rc3 = c3[i] ; T[i] = INTERPOLATE_A_COLOR3_V(rc1,rc2,rc3,c4[i]); } - }else - for( i = 0 ; i < len ; i++ ) + } else + for( i = 0 ; i < len ; i++ ) { register int rc1 = c1[i], rc2 = c2[i], rc3 = c3[i] ; T[i] = INTERPOLATE_B_COLOR3_V(rc1,rc2,rc3,c4[i]); @@ -438,9 +438,10 @@ rbitshift_component_mod( register CARD32 *data, int bits, int len ) void print_component( register CARD32 *data, int nonsense, int len ) { - register int i ; - for( i = 0 ; i < len ; ++i ) - fprintf( stderr, " %8.8lX", (long)data[i] ); + (void)nonsense; // silence unused variable warning + register int i; + for (i = 0; i < len; ++i) + fprintf( stderr, " %8.8lX", (long)data[i] ); fprintf( stderr, "\n"); } @@ -491,9 +492,9 @@ copytintpad_scanline( ASScanline *src, ASScanline *dst, int offset, ARGB32 tint register int i ; CARD32 chan_tint[4], chan_fill[4] ; int color ; - int copy_width = src->width, dst_offset = 0, src_offset = 0; + int copy_width, dst_offset = 0, src_offset = 0; - if( offset+(int)src->width < 0 || offset > (int)dst->width ) + if( offset+(int)src->width < 0 || offset > (int)dst->width ) return; chan_tint[IC_RED] = ARGB32_RED8 (tint)<<1; chan_tint[IC_GREEN] = ARGB32_GREEN8(tint)<<1; @@ -892,24 +893,23 @@ scale_asimage( ASVisual *asv, ASImage *src, int to_width, int to_height, dst = create_destination_image( to_width, to_height, out_format, compression_out, src->back_color ); - if( to_width == src->width ) - h_ratio = 0; - else if( to_width < src->width ) - h_ratio = 1; - else - { - if ( quality == ASIMAGE_QUALITY_POOR ) + if (to_width == (int)src->width) + h_ratio = 0; + else if (to_width < (int)src->width) + h_ratio = 1; + else { + if ( quality == ASIMAGE_QUALITY_POOR ) h_ratio = 1 ; else if( src->width > 1 ) { h_ratio = (to_width/(src->width-1))+1; - if( h_ratio*(src->width-1) < to_width ) - ++h_ratio ; - }else - h_ratio = to_width ; + if (h_ratio * ((int)src->width - 1) < to_width) + ++h_ratio; + } else + h_ratio = to_width ; ++h_ratio ; - } - scales_h = make_scales( src->width, to_width, ( quality == ASIMAGE_QUALITY_POOR )?0:1 ); + } + scales_h = make_scales( src->width, to_width, ( quality == ASIMAGE_QUALITY_POOR )?0:1 ); scales_v = make_scales( src->height, to_height, ( quality == ASIMAGE_QUALITY_POOR || src->height <= 3)?0:1 ); #if defined(LOCAL_DEBUG) && !defined(NO_DEBUG_OUTPUT) { @@ -927,10 +927,10 @@ scale_asimage( ASVisual *asv, ASImage *src, int to_width, int to_height, destroy_asimage( &dst ); }else { - if( to_height <= src->height ) /* scaling down */ - scale_image_down( imdec, imout, h_ratio, scales_h, scales_v ); - else if( quality == ASIMAGE_QUALITY_POOR || src->height <= 3 ) - scale_image_up_dumb( imdec, imout, h_ratio, scales_h, scales_v ); + if (to_height <= (int)src->height) /* scaling down */ + scale_image_down(imdec, imout, h_ratio, scales_h, scales_v); + else if (quality == ASIMAGE_QUALITY_POOR || src->height <= 3) + scale_image_up_dumb( imdec, imout, h_ratio, scales_h, scales_v ); else scale_image_up( imdec, imout, h_ratio, scales_h, scales_v ); stop_image_output( &imout ); @@ -1054,29 +1054,25 @@ LOCAL_DEBUG_CALLER_OUT( "src = %p, offset_x = %d, offset_y = %d, to_width = %d, { int y, max_y = to_height; LOCAL_DEBUG_OUT("tiling actually...%s", ""); - if( to_height > src->height ) - { - imout->tiling_step = src->height ; - max_y = src->height ; - } - if( tint != 0 ) - { - for( y = 0 ; y < max_y ; y++ ) - { - imdec->decode_image_scanline( imdec ); - tint_component_mod( imdec->buffer.red, (CARD16)(ARGB32_RED8(tint)<<1), to_width ); - tint_component_mod( imdec->buffer.green, (CARD16)(ARGB32_GREEN8(tint)<<1), to_width ); - tint_component_mod( imdec->buffer.blue, (CARD16)(ARGB32_BLUE8(tint)<<1), to_width ); - tint_component_mod( imdec->buffer.alpha, (CARD16)(ARGB32_ALPHA8(tint)<<1), to_width ); - imout->output_image_scanline( imout, &(imdec->buffer), 1); - } - }else - for( y = 0 ; y < max_y ; y++ ) - { - imdec->decode_image_scanline( imdec ); - imout->output_image_scanline( imout, &(imdec->buffer), 1); - } - stop_image_output( &imout ); +if (to_height > (int)src->height) { + imout->tiling_step = src->height; + max_y = src->height; +} +if (tint != 0) { + for (y = 0; y < max_y; y++) { + imdec->decode_image_scanline(imdec); + tint_component_mod(imdec->buffer.red, (CARD16)(ARGB32_RED8(tint) << 1), to_width); + tint_component_mod(imdec->buffer.green, (CARD16)(ARGB32_GREEN8(tint) << 1), to_width); + tint_component_mod(imdec->buffer.blue, (CARD16)(ARGB32_BLUE8(tint) << 1), to_width); + tint_component_mod(imdec->buffer.alpha, (CARD16)(ARGB32_ALPHA8(tint) << 1), to_width); + imout->output_image_scanline(imout, &(imdec->buffer), 1); + } +} else + for (y = 0; y < max_y; y++) { + imdec->decode_image_scanline(imdec); + imout->output_image_scanline(imout, &(imdec->buffer), 1); + } + stop_image_output( &imout ); } stop_image_decoding( &imdec ); @@ -1246,10 +1242,11 @@ LOCAL_DEBUG_OUT( "min_y = %d, max_y = %d", min_y, max_y ); static void make_gradient_left2right( ASImageOutput *imout, ASScanline *dither_lines, int dither_lines_num, ASFlagType filter ) { - int line ; + (void)filter; // silence unused variable warning + int line; - imout->tiling_step = dither_lines_num; - for( line = 0 ; line < dither_lines_num ; line++ ) + imout->tiling_step = dither_lines_num; + for( line = 0 ; line < dither_lines_num ; line++ ) imout->output_image_scanline( imout, &(dither_lines[line]), 1); } @@ -1319,9 +1316,10 @@ LOCAL_DEBUG_CALLER_OUT( "width = %d, height = %d, filetr = 0x%lX, dither_count = static void make_gradient_diag_width( ASImageOutput *imout, ASScanline *dither_lines, int dither_lines_num, ASFlagType filter, Bool from_bottom ) { - int line = 0; - /* using bresengham algorithm again to trigger horizontal shift : */ - short smaller = imout->im->height; + (void)filter; // silence unused variable warning + int line = 0; + /* using bresengham algorithm again to trigger horizontal shift : */ + short smaller = imout->im->height; short bigger = imout->im->width; register int i = 0; int eps; @@ -1726,10 +1724,10 @@ LOCAL_DEBUG_CALLER_OUT( "dst_x = %d, dst_y = %d, to_width = %d, to_height = %d", if( src == NULL ) return NULL ; - if( to_width == src->width && to_height == src->height && dst_x == 0 && dst_y == 0 ) - return clone_asimage( src, SCL_DO_ALL ); + if (to_width == (int)src->width && to_height == (int)src->height && dst_x == 0 && dst_y == 0) + return clone_asimage(src, SCL_DO_ALL); - if( asv == NULL ) asv = &__transform_fake_asv ; + if( asv == NULL ) asv = &__transform_fake_asv ; dst = create_destination_image( to_width, to_height, out_format, compression_out, src->back_color); @@ -2281,9 +2279,9 @@ load_gauss_scanline(ASScanline *result, ASImageDecoder *imdec, int horz, GAUSS_C { if( horz == 1 ) { - for( x = 0 ; x < result->width ; ++x ) - res_chan[x] = src_chan[x]<<10 ; - }else + for (x = 0; x < (int)result->width; ++x) + res_chan[x] = src_chan[x] << 10; + }else { #ifdef USE_PARALLEL_OPTIMIZATION todo[todo_count++] = chan; @@ -2296,9 +2294,10 @@ load_gauss_scanline(ASScanline *result, ASImageDecoder *imdec, int horz, GAUSS_C else if( get_flags( filter, 0x01<buffer.back_color)<<10; - for( x = 0 ; x < result->width ; ++x ) res_chan[x] = fill ; - } - } + for (x = 0; x < (int)result->width; ++x) + res_chan[x] = fill; + } + } #ifdef USE_PARALLEL_OPTIMIZATION switch( 4 - todo_count ) @@ -2381,14 +2380,12 @@ ASImage* blur_asimage_gauss(ASVisual* asv, ASImage* src, double dhorz, double dv if( vert == 1 && horz == 1 ) { - for (y = 0 ; y < dst->height ; y++) - { - imdec->decode_image_scanline(imdec); - imout->output_image_scanline(imout, &(imdec->buffer), 1); - } - }else - { - ASScanline result; + for (y = 0; y < (int)dst->height; y++) { + imdec->decode_image_scanline(imdec); + imout->output_image_scanline(imout, &(imdec->buffer), 1); + } + } else { + ASScanline result; GAUSS_COEFF_TYPE *horz_gauss = NULL; GAUSS_COEFF_TYPE *horz_gauss_sums = NULL; @@ -2492,12 +2489,13 @@ ASImage* blur_asimage_gauss(ASVisual* asv, ASImage* src, double dhorz, double dv register ASScanline **ysrc = &lines[y]; /* surprisingly, having x loops inside y loop yields 30% to 80% better performance */ int j = 0; - CARD32 *src_chan1 = ysrc[0]->channels[chan]; - memset( res_chan, 0x00, width*4 ); -/* for( x = 0 ; x < width ; ++x ) - res_chan[x] = src_chan1[x]*vert_gauss[0]; - */ - while( ++j < vert ) + CARD32 *src_chan1; + memset( res_chan, 0x00, width*4 ); + /* src_chan1 = ysrc[0]->channels[chan]; + for( x = 0 ; x < width ; ++x ) + res_chan[x] = src_chan1[x]*vert_gauss[0]; + */ + while( ++j < vert ) { CARD32 *src_chan2 = ysrc[j]->channels[chan]; GAUSS_COEFF_TYPE g = vert_gauss[j]; @@ -2609,7 +2607,7 @@ ASImage* blur_asimage_gauss(ASVisual* asv, ASImage* src, double dhorz, double dv free(horz_gauss_sums); if( horz_gauss ) free(horz_gauss); - } + } PRINT_BACKGROUND_OP_TIME; stop_image_decoding(&imdec); @@ -2838,23 +2836,19 @@ LOCAL_DEBUG_CALLER_OUT( "offset_x = %d, offset_y = %d, to_width = %d, to_height saturation_offset = (saturation_offset<<16) / 100; value_offset = (value_offset<<16)/100 ; LOCAL_DEBUG_OUT("adjusting actually...%s", ""); - if( to_height > src->height ) - { - imout->tiling_step = src->height ; - max_y = src->height ; - } - for( y = 0 ; y < max_y ; y++ ) - { - register int x = imdec->buffer.width; - CARD32 *r = imdec->buffer.red; - CARD32 *g = imdec->buffer.green; - CARD32 *b = imdec->buffer.blue ; - long h, s, v ; - imdec->decode_image_scanline( imdec ); - while( --x >= 0 ) - { - if( (h = rgb2hue( r[x], g[x], b[x] )) != 0 ) - { +if (to_height > (int)src->height) { + imout->tiling_step = src->height; + max_y = src->height; +} +for (y = 0; y < max_y; y++) { + register int x = imdec->buffer.width; + CARD32 *r = imdec->buffer.red; + CARD32 *g = imdec->buffer.green; + CARD32 *b = imdec->buffer.blue; + long h, s, v; + imdec->decode_image_scanline(imdec); + while (--x >= 0) { + if ((h = rgb2hue(r[x], g[x], b[x])) != 0) { #ifdef DEBUG_HSV_ADJUSTMENT fprintf( stderr, "IN %d: rgb = #%4.4lX.%4.4lX.%4.4lX hue = %ld(%d) range is (%ld - %ld, %ld - %ld), dh = %d\n", __LINE__, r[x], g[x], b[x], h, ((h>>8)*360)>>8, from_hue1, to_hue1, from_hue2, to_hue2, hue_offset ); #endif @@ -2893,8 +2887,8 @@ LOCAL_DEBUG_OUT("adjusting actually...%s", ""); } imdec->buffer.flags = 0xFFFFFFFF ; imout->output_image_scanline( imout, &(imdec->buffer), 1); - } - stop_image_output( &imout ); +} + stop_image_output( &imout ); } stop_image_decoding( &imdec ); @@ -2922,9 +2916,9 @@ slice_scanline( ASScanline *dst, ASScanline *src, int start_x, int end_x, ASScan dg[x1] = sg[x1] ; db[x1] = sb[x1] ; } - if( x1 >= dst->width ) - return; - /* middle portion */ + if (x1 >= (int)dst->width) + return; + /* middle portion */ max_x2 = (int) dst->width - tail ; max_x = min(end_x, max_x2); if( middle ) @@ -2947,15 +2941,13 @@ slice_scanline( ASScanline *dst, ASScanline *src, int start_x, int end_x, ASScan { for( ; x1 < max_x ; ++x1 ) { - x2 = x1 ; - for( x2 = x1 ; x2 < max_x2 ; x2 += tiling_step ) - { - da[x2] = sa[x1] ; + for (x2 = x1; x2 < max_x2; x2 += tiling_step) { + da[x2] = sa[x1] ; dr[x2] = sr[x1] ; dg[x2] = sg[x1] ; - db[x2] = sb[x1] ; - } - } + db[x2] = sb[x1] ; + } + } } /* tail portion */ x1 = src->width - tail ; @@ -2998,11 +2990,11 @@ LOCAL_DEBUG_CALLER_OUT( "scale = %d, sx1 = %d, sx2 = %d, sy1 = %d, sy2 = %d, to_ slice_x_end = slice_x_start + 1 ; if( slice_y_end == 0 && slice_y_start > 0 ) slice_y_end = slice_y_start + 1 ; - if( slice_x_end > src->width ) - slice_x_end = src->width ; - if( slice_y_end > src->height ) - slice_y_end = src->height ; - if( slice_x_start > slice_x_end ) + if (slice_x_end > (int)src->width) + slice_x_end = src->width; + if (slice_y_end > (int)src->height) + slice_y_end = src->height; + if( slice_x_start > slice_x_end ) slice_x_start = (slice_x_end > 0 ) ? slice_x_end-1 : 0 ; if( slice_y_start > slice_y_end ) slice_y_start = (slice_y_end > 0 ) ? slice_y_end-1 : 0 ; @@ -3104,9 +3096,9 @@ LOCAL_DEBUG_OUT( "sx1 = %d, sx2 = %d, sy1 = %d, sy2 = %d, to_width = %d, to_heig imout->next_line = y2 ; imdec->next_line = y1 ; max_y = src->height ; - if( y2 + max_y - y1 > dst->height ) - max_y = dst->height + y1 - y2 ; - LOCAL_DEBUG_OUT( "y1 = %d, max_y = %d", y1, max_y ); + if (y2 + max_y - y1 > (int)dst->height) + max_y = dst->height + y1 - y2; + LOCAL_DEBUG_OUT( "y1 = %d, max_y = %d", y1, max_y ); if( x_middle > 0 ) { tmp = scale_asimage2( asv, src, slice_x_start, y1, @@ -3157,9 +3149,9 @@ LOCAL_DEBUG_OUT( "sx1 = %d, sx2 = %d, sy1 = %d, sy2 = %d, to_width = %d, to_heig imout->next_line = y2 = max(max_y2,(int)slice_y_start) ; imdec->next_line = y1 = src->height - tail ; max_y = src->height ; - if( y2 + max_y - y1 > dst->height ) - max_y = dst->height + y1 - y2 ; - LOCAL_DEBUG_OUT( "y1 = %d, max_y = %d", y1, max_y ); + if (y2 + max_y - y1 > (int)dst->height) + max_y = dst->height + y1 - y2; + LOCAL_DEBUG_OUT( "y1 = %d, max_y = %d", y1, max_y ); for( ; y1 < max_y ; ++y1 ) { imdec->decode_image_scanline( imdec ); @@ -3372,10 +3364,9 @@ fprintf (stderr, "color2alpha():%d: color: red = 0x%8.8X green = 0x%8.8X blue = int x ; ASScanline *srcsl = &(imdec->buffer); imdec->decode_image_scanline( imdec ); - for (x = 0; x < imdec->buffer.width; ++x) - { - CARD32 r = srcsl->red[x]; - CARD32 g = srcsl->green[x]; + for (x = 0; x < (int)imdec->buffer.width; ++x) { + CARD32 r = srcsl->red[x]; + CARD32 g = srcsl->green[x]; CARD32 b = srcsl->blue[x]; CARD32 a = srcsl->alpha[x]; /* the following logic is stolen from gimp and altered for our color format and beauty*/ @@ -3421,9 +3412,9 @@ fprintf (stderr, "result: %8.8X %8.8X %8.8X %8.8X.\n", src->alpha[x], src->red[x } /* end of gimp code */ - } - imout->output_image_scanline( imout, srcsl, 1); - } + } + imout->output_image_scanline(imout, srcsl, 1); + } stop_image_output( &imout ); } stop_image_decoding( &imdec ); diff --git a/graf2d/asimage/src/libAfterImage/ungif.c b/graf2d/asimage/src/libAfterImage/ungif.c index 30588d47407d9..7db90a4583377 100644 --- a/graf2d/asimage/src/libAfterImage/ungif.c +++ b/graf2d/asimage/src/libAfterImage/ungif.c @@ -213,7 +213,7 @@ get_gif_saved_images( GifFileType *gif, int subimage, SavedImage **ret, int *ret ExtCode, ExtData[0], &(ExtData[1])); #else temp_save.Function = ExtCode; - status = AddExtensionBlock(&temp_save, ExtData[0], (char*)&(ExtData[1])); + status = AddExtensionBlock(&temp_save, ExtData[0], (unsigned char *)&(ExtData[1])); #endif if (status == GIF_OK) status = DGifGetExtensionNext(gif, &ExtData); diff --git a/graf2d/asimage/src/libAfterImage/xcf.c b/graf2d/asimage/src/libAfterImage/xcf.c index cee13caec0f7b..0526ac8dff617 100644 --- a/graf2d/asimage/src/libAfterImage/xcf.c +++ b/graf2d/asimage/src/libAfterImage/xcf.c @@ -687,7 +687,9 @@ read_xcf_levels( XcfImage *xcf_im, FILE *fp, XcfLevel *head ) static void read_xcf_tiles( XcfImage *xcf_im, FILE *fp, XcfTile *head ) { - while( head ) + (void)xcf_im; + (void)fp; // silence unused variable warning + while( head ) { head->estimated_size = XCF_TILE_WIDTH*XCF_TILE_HEIGHT*4 ; head = head->next ; @@ -698,7 +700,9 @@ read_xcf_tiles( XcfImage *xcf_im, FILE *fp, XcfTile *head ) static void read_xcf_tiles_rle( XcfImage *xcf_im, FILE *fp, XcfTile *head ) { - while( head ) + (void)xcf_im; + (void)fp; // silence unused variable warning + while( head ) { if( head->next ) head->estimated_size = head->next->offset - head->offset ; @@ -735,7 +739,9 @@ void decode_xcf_tile( FILE *fp, XcfTile *tile, int bpp, ASScanline *buf, CARD8* tile_buf, int offset_x, int offset_y, int width, int height) { - int bytes_in, available = width*height ; + (void)tile; + (void)offset_y; // silence unused variable warning + int bytes_in, available = width*height ; int y = 0; int comp = 0 ; @@ -759,8 +765,10 @@ void decode_xcf_tile_rle( FILE *fp, XcfTile *tile, int bpp, ASScanline *buf, CARD8* tile_buf, int offset_x, int offset_y, int width, int height) { - int bytes_in, available = width*height ; - int x = 0, y = 0; + (void)tile; + (void)offset_y; // silence unused variable warning + int bytes_in, available = width * height; + int x = 0, y = 0; CARD8 tmp[XCF_TILE_WIDTH] ; int comp = 0 ; diff --git a/graf2d/asimage/src/libAfterImage/ximage.c b/graf2d/asimage/src/libAfterImage/ximage.c index 118630c4232c4..357a7fca3a93d 100644 --- a/graf2d/asimage/src/libAfterImage/ximage.c +++ b/graf2d/asimage/src/libAfterImage/ximage.c @@ -410,7 +410,14 @@ pixmap2ximage(ASVisual *asv, Pixmap p, int x, int y, unsigned int width, unsigne } return im; #else - return NULL ; + (void)asv; + (void)x; + (void)y; + (void)width; + (void)height; + (void)plane_mask; + (void)compression; // silence unused variable warning + return NULL; #endif } @@ -443,7 +450,17 @@ picture2asimage(ASVisual *asv, Pixmap rgb, Pixmap a , int x, int y, unsigned int } return im; #else - return NULL ; + (void)asv; + (void)rgb; + (void)a; + (void)x; + (void)y; + (void)width; + (void)height; + (void)plane_mask; + (void)keep_cache; + (void)compression; // silence unused variable warning + return NULL; #endif } @@ -467,28 +484,36 @@ put_ximage( ASVisual *asv, XImage *xim, Drawable d, GC gc, src_x = 0; }else if( src_x > xim->width ) return False; - if( xim->width > src_x+width ) - width = xim->width - src_x ; - if( src_y < 0 ) - { - height+= src_y ; - src_y = 0; - }else if( src_y > xim->height ) - return False; - if( xim->height > src_y+height ) - height = xim->height - src_y ; - - if( my_gc == NULL ) - { - XGCValues gcv ; - my_gc = XCreateGC( asv->dpy, d, 0, &gcv ); - } - ASPutXImage( asv, d, my_gc, xim, src_x, src_y, dest_x, dest_y, width, height ); - if( my_gc != gc ) + if (xim->width > src_x + (int)width) + width = xim->width - src_x; + if (src_y < 0) { + height += src_y; + src_y = 0; + } else if (src_y > xim->height) + return False; + if (xim->height > src_y + (int)height) + height = xim->height - src_y; + + if (my_gc == NULL) { + XGCValues gcv; + my_gc = XCreateGC( asv->dpy, d, 0, &gcv ); + } + ASPutXImage(asv, d, my_gc, xim, src_x, src_y, dest_x, dest_y, width, height); + if( my_gc != gc ) XFreeGC( asv->dpy, my_gc ); return True ; #else - return False ; + (void)asv; + (void)xim; + (void)d; + (void)gc; + (void)src_x; + (void)src_y; + (void)dest_x; + (void)dest_y; + (void)width; + (void)height; // silence unused variable warning + return False; #endif } @@ -629,6 +654,16 @@ asimage2drawable_gl( ASVisual *asv, Drawable d, ASImage *im, glXDestroyGLXPixmap( asv->dpy, glxp); glFinish(); return True; +#else + (void)src_x; + (void)src_y; + (void)dest_x; + (void)dest_y; + (void)width; + (void)height; + (void)d_width; + (void)d_height; + (void)force_direct; // silence unused variable warning #endif /* #ifdef HAVE_GLX */ } { @@ -674,6 +709,18 @@ asimage2drawable( ASVisual *asv, Drawable d, ASImage *im, GC gc, } return res; } +#else + (void)asv; + (void)d; + (void)im; + (void)gc; + (void)src_x; + (void)src_y; + (void)dest_x; + (void)dest_y; + (void)width; + (void)height; + (void)use_cached; // silence unused variable warning #endif return False ; } @@ -694,15 +741,14 @@ asimage2alpha_drawable( ASVisual *asv, Drawable d, ASImage *im, GC gc, XGetGeometry( asv->dpy, d, &root, &dumm, &dumm, &udumm, &udumm, &udumm, &alpha_depth ); - if ( !use_cached || im->alt.mask_ximage == NULL || im->alt.mask_ximage->depth != alpha_depth ) - { - if( (xim = asimage2alpha_ximage (asv, im, (alpha_depth == 1) )) == NULL ) + if (!use_cached || im->alt.mask_ximage == NULL || im->alt.mask_ximage->depth != (int)alpha_depth) { + if( (xim = asimage2alpha_ximage (asv, im, (alpha_depth == 1) )) == NULL ) { show_error("cannot export image into alpha XImage."); return None ; } - }else - xim = im->alt.mask_ximage ; + } else + xim = im->alt.mask_ximage ; if (xim != NULL ) { res = put_ximage( asv, xim, d, gc, src_x, src_y, dest_x, dest_y, width, height ); @@ -711,6 +757,18 @@ asimage2alpha_drawable( ASVisual *asv, Drawable d, ASImage *im, GC gc, } return res; } +#else + (void)asv; + (void)d; + (void)im; + (void)gc; + (void)src_x; + (void)src_y; + (void)dest_x; + (void)dest_y; + (void)width; + (void)height; + (void)use_cached; // silence unused variable warning #endif return False ; } @@ -733,6 +791,12 @@ asimage2pixmap(ASVisual *asv, Window root, ASImage *im, GC gc, Bool use_cached) } return p; } +#else + (void)asv; + (void)root; + (void)im; + (void)gc; + (void)use_cached; // silence unused variable warning #endif return None ; } @@ -770,7 +834,13 @@ asimage2alpha(ASVisual *asv, Window root, ASImage *im, GC gc, Bool use_cached, B XDestroyImage (xim); return mask; #else - return None ; + (void)asv; + (void)root; + (void)im; + (void)gc; + (void)use_cached; + (void)bitmap; // silence unused variable warning + return None ; #endif } diff --git a/graf2d/asimage/src/libAfterImage/xpm.c b/graf2d/asimage/src/libAfterImage/xpm.c index d5ee59bf6c1c2..43de59705698d 100644 --- a/graf2d/asimage/src/libAfterImage/xpm.c +++ b/graf2d/asimage/src/libAfterImage/xpm.c @@ -326,29 +326,30 @@ static inline char get_xpm_char( ASXpmFile *xpm_file ) { #ifdef HAVE_LIBXPM - return '\0'; + (void)xpm_file; // silence unused variable warning + return '\0'; #else char c; if( xpm_file->curr_byte >= xpm_file->bytes_in ) { - if( xpm_file->bytes_in > AS_XPM_BUFFER_UNDO ) - { - register char* src = &(xpm_file->buffer[xpm_file->bytes_in-AS_XPM_BUFFER_UNDO]); + if (xpm_file->bytes_in > (size_t)AS_XPM_BUFFER_UNDO) { + register char* src = &(xpm_file->buffer[xpm_file->bytes_in-AS_XPM_BUFFER_UNDO]); register char* dst = &(xpm_file->buffer[0]); register int i; - for( i = 0 ; i < AS_XPM_BUFFER_UNDO ; i++ ) - dst[i] = src[i]; + for (i = 0; i < (int)AS_XPM_BUFFER_UNDO; i++) + dst[i] = src[i]; /* xpm_file->bytes_in = AS_XPM_BUFFER_UNDO+fread( &(xpm_file->buffer[AS_XPM_BUFFER_UNDO]), 1, AS_XPM_BUFFER_SIZE, xpm_file->fp );*/ - xpm_file->bytes_in = xpm_file->data ? AS_XPM_BUFFER_UNDO + strlen(*xpm_file->data) : - AS_XPM_BUFFER_UNDO+read( xpm_file->fd, &(xpm_file->buffer[AS_XPM_BUFFER_UNDO]), AS_XPM_BUFFER_SIZE ); - xpm_file->curr_byte = AS_XPM_BUFFER_UNDO ; - } - if( xpm_file->bytes_in <= AS_XPM_BUFFER_UNDO ) - { - xpm_file->parse_state = XPM_Outside ; + xpm_file->bytes_in = xpm_file->data + ? (size_t)AS_XPM_BUFFER_UNDO + strlen(*xpm_file->data) + : (size_t)AS_XPM_BUFFER_UNDO + + read(xpm_file->fd, &(xpm_file->buffer[AS_XPM_BUFFER_UNDO]), AS_XPM_BUFFER_SIZE); + xpm_file->curr_byte = (size_t)AS_XPM_BUFFER_UNDO; + } + if (xpm_file->bytes_in <= (size_t)AS_XPM_BUFFER_UNDO) { + xpm_file->parse_state = XPM_Outside ; return '\0'; - } - } + } + } c = xpm_file->buffer[xpm_file->curr_byte]; /* fprintf( stderr, "curr byte = %d ( of %d ), char = %c\n", xpm_file->curr_byte, xpm_file->bytes_in, c ); */ @@ -382,10 +383,11 @@ skip_xpm_comments( ASXpmFile *xpm_file ) { c = get_xpm_char(xpm_file); if( c == '*' ) - if( (c=get_xpm_char(xpm_file)) == '/' ) - xpm_file->parse_state--; - } - } + if (get_xpm_char(xpm_file) == '/') { + xpm_file->parse_state--; + } + } + } } static Bool @@ -762,8 +764,9 @@ lookup_xpm_color( char **colornames, ASHashTable *xpm_color_names ) void string_value_destroy (ASHashableValue value, void *data) { - if ((char*)value != NULL) - free ((char*)value); + (void)data; // silence unused variable warning + if ((char *)value != NULL) + free((char *)value); } Bool @@ -876,9 +879,10 @@ convert_xpm_scanline( ASXpmFile *xpm_file, unsigned int line ) #ifdef HAVE_LIBXPM unsigned int *data = xpm_file->xpmImage.data+k*line ; #else - unsigned char *data ; - if( get_xpm_string( xpm_file ) != XPM_Success) - return False ; + (void)line; // silence unused variable warning + unsigned char *data; + if (get_xpm_string(xpm_file) != XPM_Success) + return False ; data = (unsigned char*)xpm_file->str_buf ; #endif if( cmap )