diff options
Diffstat (limited to 'src/3rdparty/libmng')
| -rw-r--r-- | src/3rdparty/libmng/acinclude.m4 | 4 | ||||
| -rw-r--r-- | src/3rdparty/libmng/aclocal.m4 | 93 | ||||
| -rwxr-xr-x | src/3rdparty/libmng/config.guess | 9 | ||||
| -rwxr-xr-x | src/3rdparty/libmng/config.sub | 23 | ||||
| -rwxr-xr-x | src/3rdparty/libmng/configure | 95 | ||||
| -rw-r--r-- | src/3rdparty/libmng/ltmain.sh | 25 | ||||
| -rwxr-xr-x | src/3rdparty/libmng/missing | 2 |
7 files changed, 12 insertions, 239 deletions
diff --git a/src/3rdparty/libmng/acinclude.m4 b/src/3rdparty/libmng/acinclude.m4 index f3cb3c95c..c2baeb453 100644 --- a/src/3rdparty/libmng/acinclude.m4 +++ b/src/3rdparty/libmng/acinclude.m4 @@ -43,8 +43,8 @@ AC_DEFUN(AC_SYS_LARGEFILE, ac_cv_sys_largefile_CC, [ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. + # If the OS does not support large files by default, + # use the C compiler's -n32 option if that helps. AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , [ac_save_CC="$CC" CC="$CC -n32" diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index a0f9e41af..552f9a883 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -55,8 +55,8 @@ AC_DEFUN(AC_SYS_LARGEFILE, ac_cv_sys_largefile_CC, [ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. + # If the OS does not support large files by default, + # use the C compiler's -n32 option if that helps. AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , [ac_save_CC="$CC" CC="$CC -n32" @@ -369,25 +369,6 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -487,9 +468,6 @@ aix*) cygwin* | mingw* | pw32*) symcode='[[ABCDGISTW]]' ;; -irix*) - symcode='[[BCDEGRST]]' - ;; solaris* | sysv5*) symcode='[[BDT]]' ;; @@ -1126,8 +1104,8 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6*) - # PIC is the default for these OSes. + beos*) + # PIC is the default for this OS ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -1162,12 +1140,6 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, fi ;; - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - cygwin* | mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). @@ -1831,17 +1803,6 @@ else hardcode_shlibpath_var=no ;; - irix5* | irix6*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -2244,31 +2205,6 @@ gnu*) hardcode_into_libs=yes ;; -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' - case $host_os in - irix5*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - ;; - # No shared lib support for Linux oldld, aout, or coff. linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) dynamic_linker=no @@ -3419,27 +3355,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - # This must be Linux ELF. linux-gnu*) case $host_cpu in diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess index 1c66e983f..d23eba0a7 100755 --- a/src/3rdparty/libmng/config.guess +++ b/src/3rdparty/libmng/config.guess @@ -196,9 +196,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -380,9 +377,6 @@ EOF Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' @@ -877,9 +871,6 @@ EOF NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv exit 0 ;; diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub index c23cdec33..fb9dfc911 100755 --- a/src/3rdparty/libmng/config.sub +++ b/src/3rdparty/libmng/config.sub @@ -137,7 +137,7 @@ case $os in -sun*os*) # Prevent following clause from handling this invalid input. ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sony* | \ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ @@ -534,16 +534,6 @@ case $basic_machine in 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 @@ -657,10 +647,6 @@ case $basic_machine in basic_machine=i960-intel os=-mon960 ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) basic_machine=np1-gould ;; @@ -1019,7 +1005,7 @@ case $os in # 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* \ + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* \ | -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -unos* | -luna* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1034,7 +1020,7 @@ case $os in | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -openstep* | -oskit* | -conix* | -pw32* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. @@ -1251,9 +1237,6 @@ case $basic_machine in *-encore) os=-bsd ;; - *-sgi) - os=-irix - ;; *-siemens) os=-sysv4 ;; diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index 8cc3b336b..7b1fe034d 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -733,7 +733,6 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # incompatible versions: # SysV /etc/install, /usr/sbin/install # SunOS /usr/etc/install -# IRIX /sbin/install # AIX /bin/install # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args @@ -1976,27 +1975,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - # This must be Linux ELF. linux-gnu*) case $host_cpu in @@ -2169,9 +2147,6 @@ aix*) cygwin* | mingw* | pw32*) symcode='[ABCDGISTW]' ;; -irix*) - symcode='[BCDEGRST]' - ;; solaris* | sysv5*) symcode='[BDT]' ;; @@ -2638,29 +2613,6 @@ fi test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 2676 "configure"' > conftest.$ac_ext - if { (eval echo configure:2677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; -esac - # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' @@ -2810,8 +2762,8 @@ else # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6*) - # PIC is the default for these OSes. + beos*) + # PIC is the default for this OS ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -2846,12 +2798,6 @@ else fi ;; - irix5* | irix6*) - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - # PIC (with -KPIC) is the default. - ;; - cygwin* | mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). @@ -3600,17 +3546,6 @@ else hardcode_shlibpath_var=no ;; - irix5* | irix6*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -4016,31 +3951,6 @@ gnu*) hardcode_into_libs=yes ;; -irix5* | irix6*) - version_type=irix - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' - case $host_os in - irix5*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - ;; - # No shared lib support for Linux oldld, aout, or coff. linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) dynamic_linker=no @@ -5357,7 +5267,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # incompatible versions: # SysV /etc/install, /usr/sbin/install # SunOS /usr/etc/install -# IRIX /sbin/install # AIX /bin/install # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 244554861..45e445b74 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -988,15 +988,7 @@ compiler." continue ;; - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac continue ;; @@ -2273,23 +2265,6 @@ compiler." versuffix=".$current"; ;; - irix) - major=`expr $current - $age + 1` - verstring="sgi$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="sgi$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - linux) major=.`expr $current - $age` versuffix="$major.$age.$revision" diff --git a/src/3rdparty/libmng/missing b/src/3rdparty/libmng/missing index d46f79f64..0b54a0e07 100755 --- a/src/3rdparty/libmng/missing +++ b/src/3rdparty/libmng/missing @@ -173,7 +173,7 @@ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or + DU). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then |