Add %%license and %%doc Add BR: GraphicsMagick-c++-devel exiv2-devel libuuid-devel Adapt spec to recent guidelines
1249 lines
39 KiB
Diff
1249 lines
39 KiB
Diff
commit 7d37a9ec6c7a7e7ca582d4ec4c0ae668037ebfff
|
|
Author: Björn Esser <besser82@fedoraproject.org>
|
|
Date: Sat Aug 5 17:39:11 2017 +0200
|
|
|
|
Remove -std=gnu++98
|
|
|
|
diff --git a/configure b/configure
|
|
index f382d30..0cee244 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -669,7 +669,6 @@ infodir
|
|
docdir
|
|
oldincludedir
|
|
includedir
|
|
-runstatedir
|
|
localstatedir
|
|
sharedstatedir
|
|
sysconfdir
|
|
@@ -765,7 +764,6 @@ datadir='${datarootdir}'
|
|
sysconfdir='${prefix}/etc'
|
|
sharedstatedir='${prefix}/com'
|
|
localstatedir='${prefix}/var'
|
|
-runstatedir='${localstatedir}/run'
|
|
includedir='${prefix}/include'
|
|
oldincludedir='/usr/include'
|
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
|
@@ -1018,15 +1016,6 @@ do
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
silent=yes ;;
|
|
|
|
- -runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
- | --runstate | --runstat | --runsta | --runst | --runs \
|
|
- | --run | --ru | --r)
|
|
- ac_prev=runstatedir ;;
|
|
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
- | --run=* | --ru=* | --r=*)
|
|
- runstatedir=$ac_optarg ;;
|
|
-
|
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
|
ac_prev=sbindir ;;
|
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
|
@@ -1164,7 +1153,7 @@ fi
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
- libdir localedir mandir runstatedir
|
|
+ libdir localedir mandir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
# Remove trailing slashes.
|
|
@@ -1317,7 +1306,6 @@ Fine tuning of the installation directories:
|
|
--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]
|
|
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
--includedir=DIR C header files [PREFIX/include]
|
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
@@ -3328,7 +3316,7 @@ else
|
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
since some C++ compilers masquerading as C compilers
|
|
incorrectly reject 9223372036854775807. */
|
|
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
&& LARGE_OFF_T % 2147483647 == 1)
|
|
? 1 : -1];
|
|
@@ -3374,7 +3362,7 @@ else
|
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
since some C++ compilers masquerading as C compilers
|
|
incorrectly reject 9223372036854775807. */
|
|
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
&& LARGE_OFF_T % 2147483647 == 1)
|
|
? 1 : -1];
|
|
@@ -3398,7 +3386,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
since some C++ compilers masquerading as C compilers
|
|
incorrectly reject 9223372036854775807. */
|
|
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
&& LARGE_OFF_T % 2147483647 == 1)
|
|
? 1 : -1];
|
|
@@ -3443,7 +3431,7 @@ else
|
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
since some C++ compilers masquerading as C compilers
|
|
incorrectly reject 9223372036854775807. */
|
|
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
&& LARGE_OFF_T % 2147483647 == 1)
|
|
? 1 : -1];
|
|
@@ -3467,7 +3455,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
|
since some C++ compilers masquerading as C compilers
|
|
incorrectly reject 9223372036854775807. */
|
|
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
|
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
&& LARGE_OFF_T % 2147483647 == 1)
|
|
? 1 : -1];
|
|
@@ -6267,16 +6255,14 @@ else
|
|
am_cv_lib_iconv=no
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
-
|
|
int
|
|
main ()
|
|
{
|
|
iconv_t cd = iconv_open("","");
|
|
- iconv(cd,NULL,NULL,NULL,NULL);
|
|
- iconv_close(cd);
|
|
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
+ iconv_close(cd);
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -6291,16 +6277,14 @@ rm -f core conftest.err conftest.$ac_objext \
|
|
LIBS="$LIBS $LIBICONV"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
-
|
|
int
|
|
main ()
|
|
{
|
|
iconv_t cd = iconv_open("","");
|
|
- iconv(cd,NULL,NULL,NULL,NULL);
|
|
- iconv_close(cd);
|
|
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
+ iconv_close(cd);
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -6324,89 +6308,40 @@ if ${am_cv_func_iconv_works+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
|
|
- am_save_LIBS="$LIBS"
|
|
+ am_save_LIBS="$LIBS"
|
|
if test $am_cv_lib_iconv = yes; then
|
|
LIBS="$LIBS $LIBICONV"
|
|
fi
|
|
- am_cv_func_iconv_works=no
|
|
- for ac_iconv_const in '' 'const'; do
|
|
- if test "$cross_compiling" = yes; then :
|
|
+ if test "$cross_compiling" = yes; then :
|
|
case "$host_os" in
|
|
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
- *) am_cv_func_iconv_works="guessing yes" ;;
|
|
- esac
|
|
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
+ *) am_cv_func_iconv_works="guessing yes" ;;
|
|
+ esac
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <iconv.h>
|
|
#include <string.h>
|
|
-
|
|
-#ifndef ICONV_CONST
|
|
-# define ICONV_CONST $ac_iconv_const
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
+int main ()
|
|
{
|
|
-int result = 0;
|
|
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
|
returns. */
|
|
{
|
|
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
|
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
|
{
|
|
- static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
|
|
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
|
|
char buf[10];
|
|
- ICONV_CONST char *inptr = input;
|
|
+ const char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_utf8_to_88591,
|
|
- &inptr, &inbytesleft,
|
|
+ (char **) &inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if (res == 0)
|
|
- result |= 1;
|
|
- iconv_close (cd_utf8_to_88591);
|
|
- }
|
|
- }
|
|
- /* Test against Solaris 10 bug: Failures are not distinguishable from
|
|
- successful returns. */
|
|
- {
|
|
- iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
|
- if (cd_ascii_to_88591 != (iconv_t)(-1))
|
|
- {
|
|
- static ICONV_CONST char input[] = "\263";
|
|
- char buf[10];
|
|
- ICONV_CONST char *inptr = input;
|
|
- size_t inbytesleft = strlen (input);
|
|
- char *outptr = buf;
|
|
- size_t outbytesleft = sizeof (buf);
|
|
- size_t res = iconv (cd_ascii_to_88591,
|
|
- &inptr, &inbytesleft,
|
|
- &outptr, &outbytesleft);
|
|
- if (res == 0)
|
|
- result |= 2;
|
|
- iconv_close (cd_ascii_to_88591);
|
|
- }
|
|
- }
|
|
- /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
|
|
- {
|
|
- iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
|
|
- if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
- {
|
|
- static ICONV_CONST char input[] = "\304";
|
|
- static char buf[2] = { (char)0xDE, (char)0xAD };
|
|
- ICONV_CONST char *inptr = input;
|
|
- size_t inbytesleft = 1;
|
|
- char *outptr = buf;
|
|
- size_t outbytesleft = 1;
|
|
- size_t res = iconv (cd_88591_to_utf8,
|
|
- &inptr, &inbytesleft,
|
|
- &outptr, &outbytesleft);
|
|
- if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
|
|
- result |= 4;
|
|
- iconv_close (cd_88591_to_utf8);
|
|
+ return 1;
|
|
}
|
|
}
|
|
#if 0 /* This bug could be worked around by the caller. */
|
|
@@ -6415,18 +6350,17 @@ int result = 0;
|
|
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
|
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
{
|
|
- static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
char buf[50];
|
|
- ICONV_CONST char *inptr = input;
|
|
+ const char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_88591_to_utf8,
|
|
- &inptr, &inbytesleft,
|
|
+ (char **) &inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if ((int)res > 0)
|
|
- result |= 8;
|
|
- iconv_close (cd_88591_to_utf8);
|
|
+ return 1;
|
|
}
|
|
}
|
|
#endif
|
|
@@ -6440,22 +6374,19 @@ int result = 0;
|
|
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
|
/* Try HP-UX names. */
|
|
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
|
- result |= 16;
|
|
- return result;
|
|
-
|
|
- ;
|
|
+ return 1;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
if ac_fn_cxx_try_run "$LINENO"; then :
|
|
am_cv_func_iconv_works=yes
|
|
+else
|
|
+ am_cv_func_iconv_works=no
|
|
fi
|
|
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
- test "$am_cv_func_iconv_works" = no || break
|
|
- done
|
|
LIBS="$am_save_LIBS"
|
|
|
|
fi
|
|
@@ -7184,16 +7115,14 @@ else
|
|
am_cv_lib_iconv=no
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
-
|
|
int
|
|
main ()
|
|
{
|
|
iconv_t cd = iconv_open("","");
|
|
- iconv(cd,NULL,NULL,NULL,NULL);
|
|
- iconv_close(cd);
|
|
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
+ iconv_close(cd);
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -7208,16 +7137,14 @@ rm -f core conftest.err conftest.$ac_objext \
|
|
LIBS="$LIBS $LIBICONV"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
-
|
|
int
|
|
main ()
|
|
{
|
|
iconv_t cd = iconv_open("","");
|
|
- iconv(cd,NULL,NULL,NULL,NULL);
|
|
- iconv_close(cd);
|
|
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
+ iconv_close(cd);
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -7241,89 +7168,40 @@ if ${am_cv_func_iconv_works+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
|
|
- am_save_LIBS="$LIBS"
|
|
+ am_save_LIBS="$LIBS"
|
|
if test $am_cv_lib_iconv = yes; then
|
|
LIBS="$LIBS $LIBICONV"
|
|
fi
|
|
- am_cv_func_iconv_works=no
|
|
- for ac_iconv_const in '' 'const'; do
|
|
- if test "$cross_compiling" = yes; then :
|
|
+ if test "$cross_compiling" = yes; then :
|
|
case "$host_os" in
|
|
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
- *) am_cv_func_iconv_works="guessing yes" ;;
|
|
- esac
|
|
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
+ *) am_cv_func_iconv_works="guessing yes" ;;
|
|
+ esac
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <iconv.h>
|
|
#include <string.h>
|
|
-
|
|
-#ifndef ICONV_CONST
|
|
-# define ICONV_CONST $ac_iconv_const
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
+int main ()
|
|
{
|
|
-int result = 0;
|
|
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
|
returns. */
|
|
{
|
|
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
|
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
|
{
|
|
- static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
|
|
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
|
|
char buf[10];
|
|
- ICONV_CONST char *inptr = input;
|
|
+ const char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_utf8_to_88591,
|
|
- &inptr, &inbytesleft,
|
|
- &outptr, &outbytesleft);
|
|
- if (res == 0)
|
|
- result |= 1;
|
|
- iconv_close (cd_utf8_to_88591);
|
|
- }
|
|
- }
|
|
- /* Test against Solaris 10 bug: Failures are not distinguishable from
|
|
- successful returns. */
|
|
- {
|
|
- iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
|
- if (cd_ascii_to_88591 != (iconv_t)(-1))
|
|
- {
|
|
- static ICONV_CONST char input[] = "\263";
|
|
- char buf[10];
|
|
- ICONV_CONST char *inptr = input;
|
|
- size_t inbytesleft = strlen (input);
|
|
- char *outptr = buf;
|
|
- size_t outbytesleft = sizeof (buf);
|
|
- size_t res = iconv (cd_ascii_to_88591,
|
|
- &inptr, &inbytesleft,
|
|
+ (char **) &inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if (res == 0)
|
|
- result |= 2;
|
|
- iconv_close (cd_ascii_to_88591);
|
|
- }
|
|
- }
|
|
- /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
|
|
- {
|
|
- iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
|
|
- if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
- {
|
|
- static ICONV_CONST char input[] = "\304";
|
|
- static char buf[2] = { (char)0xDE, (char)0xAD };
|
|
- ICONV_CONST char *inptr = input;
|
|
- size_t inbytesleft = 1;
|
|
- char *outptr = buf;
|
|
- size_t outbytesleft = 1;
|
|
- size_t res = iconv (cd_88591_to_utf8,
|
|
- &inptr, &inbytesleft,
|
|
- &outptr, &outbytesleft);
|
|
- if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
|
|
- result |= 4;
|
|
- iconv_close (cd_88591_to_utf8);
|
|
+ return 1;
|
|
}
|
|
}
|
|
#if 0 /* This bug could be worked around by the caller. */
|
|
@@ -7332,18 +7210,17 @@ int result = 0;
|
|
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
|
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
{
|
|
- static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
char buf[50];
|
|
- ICONV_CONST char *inptr = input;
|
|
+ const char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_88591_to_utf8,
|
|
- &inptr, &inbytesleft,
|
|
+ (char **) &inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if ((int)res > 0)
|
|
- result |= 8;
|
|
- iconv_close (cd_88591_to_utf8);
|
|
+ return 1;
|
|
}
|
|
}
|
|
#endif
|
|
@@ -7357,22 +7234,19 @@ int result = 0;
|
|
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
|
/* Try HP-UX names. */
|
|
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
|
- result |= 16;
|
|
- return result;
|
|
-
|
|
- ;
|
|
+ return 1;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
if ac_fn_cxx_try_run "$LINENO"; then :
|
|
am_cv_func_iconv_works=yes
|
|
+else
|
|
+ am_cv_func_iconv_works=no
|
|
fi
|
|
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
fi
|
|
|
|
- test "$am_cv_func_iconv_works" = no || break
|
|
- done
|
|
LIBS="$am_save_LIBS"
|
|
|
|
fi
|
|
@@ -7419,7 +7293,7 @@ extern
|
|
#ifdef __cplusplus
|
|
"C"
|
|
#endif
|
|
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
|
|
+#if defined(__STDC__) || defined(__cplusplus)
|
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
#else
|
|
size_t iconv();
|
|
@@ -7443,16 +7317,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
|
|
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
|
|
- $am_cv_proto_iconv" >&5
|
|
-$as_echo "
|
|
- $am_cv_proto_iconv" >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
|
|
+ }$am_cv_proto_iconv" >&5
|
|
+$as_echo "${ac_t:-
|
|
+ }$am_cv_proto_iconv" >&6; }
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define ICONV_CONST $am_cv_proto_iconv_arg1
|
|
_ACEOF
|
|
|
|
-
|
|
fi
|
|
|
|
|
|
@@ -7541,76 +7414,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
then
|
|
CXXFLAGS="$CXXFLAGS -Werror=unknown-warning-option"
|
|
fi
|
|
- CXXFLAGS="$CXXFLAGS -std=gnu++98"
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -std=gnu++98" >&5
|
|
-$as_echo_n "checking whether $CXX accepts -std=gnu++98... " >&6; }
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
|
-
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
- CXXFLAGS="$p_CXXFLAGS -std=gnu++98"
|
|
-
|
|
-else
|
|
-
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- CXXFLAGS="$p_CXXFLAGS"
|
|
-
|
|
-
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-
|
|
-
|
|
-
|
|
- p_CXXFLAGS="$CXXFLAGS"
|
|
- if test -z "$p_werror_unknown_warning_option"
|
|
- then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -Werror=unknown-warning-option" >&5
|
|
-$as_echo_n "checking whether $CXX accepts -Werror=unknown-warning-option... " >&6; }
|
|
- CXXFLAGS="$p_CXXFLAGS -Werror=unknown-warning-option"
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_cxx_try_compile "$LINENO"; then :
|
|
-
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
- p_werror_unknown_warning_option=yes
|
|
-
|
|
-else
|
|
-
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- p_werror_unknown_warning_option=no
|
|
-
|
|
-
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
- fi
|
|
- CXXFLAGS="$p_CXXFLAGS"
|
|
- if test "$p_werror_unknown_warning_option" = yes
|
|
- then
|
|
- CXXFLAGS="$CXXFLAGS -Werror=unknown-warning-option"
|
|
- fi
|
|
CXXFLAGS="$CXXFLAGS -Wall"
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -Wall" >&5
|
|
$as_echo_n "checking whether $CXX accepts -Wall... " >&6; }
|
|
diff --git a/configure.ac b/configure.ac
|
|
index df0ee8d..bcde687 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -165,7 +165,6 @@ P_CHECK_FUNC(
|
|
# Turn on compile warnings:
|
|
|
|
P_MAYBE_ADD_CXXFLAGS(
|
|
- [-std=gnu++98],
|
|
[-Wall],
|
|
[-Wempty-body],
|
|
[-Werror=overloaded-virtual],
|
|
diff --git a/m4/iconv.m4 b/m4/iconv.m4
|
|
index aa159c5..66bc76f 100644
|
|
--- a/m4/iconv.m4
|
|
+++ b/m4/iconv.m4
|
|
@@ -1,5 +1,5 @@
|
|
-# iconv.m4 serial 19 (gettext-0.18.2)
|
|
-dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
|
|
+# iconv.m4 serial AM6 (gettext-0.17)
|
|
+dnl Copyright (C) 2000-2002, 2007 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.
|
|
@@ -30,118 +30,61 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
|
dnl because if the user has installed libiconv and not disabled its use
|
|
dnl via --without-libiconv-prefix, he wants to use it. The first
|
|
- dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
|
|
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
|
|
am_save_CPPFLAGS="$CPPFLAGS"
|
|
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
|
|
|
- AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
|
|
+ AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
|
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
am_cv_lib_iconv=no
|
|
- AC_LINK_IFELSE(
|
|
- [AC_LANG_PROGRAM(
|
|
- [[
|
|
-#include <stdlib.h>
|
|
-#include <iconv.h>
|
|
- ]],
|
|
- [[iconv_t cd = iconv_open("","");
|
|
- iconv(cd,NULL,NULL,NULL,NULL);
|
|
- iconv_close(cd);]])],
|
|
- [am_cv_func_iconv=yes])
|
|
+ AC_TRY_LINK([#include <stdlib.h>
|
|
+#include <iconv.h>],
|
|
+ [iconv_t cd = iconv_open("","");
|
|
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
+ iconv_close(cd);],
|
|
+ am_cv_func_iconv=yes)
|
|
if test "$am_cv_func_iconv" != yes; then
|
|
am_save_LIBS="$LIBS"
|
|
LIBS="$LIBS $LIBICONV"
|
|
- AC_LINK_IFELSE(
|
|
- [AC_LANG_PROGRAM(
|
|
- [[
|
|
-#include <stdlib.h>
|
|
-#include <iconv.h>
|
|
- ]],
|
|
- [[iconv_t cd = iconv_open("","");
|
|
- iconv(cd,NULL,NULL,NULL,NULL);
|
|
- iconv_close(cd);]])],
|
|
- [am_cv_lib_iconv=yes]
|
|
- [am_cv_func_iconv=yes])
|
|
+ AC_TRY_LINK([#include <stdlib.h>
|
|
+#include <iconv.h>],
|
|
+ [iconv_t cd = iconv_open("","");
|
|
+ iconv(cd,NULL,NULL,NULL,NULL);
|
|
+ iconv_close(cd);],
|
|
+ am_cv_lib_iconv=yes
|
|
+ am_cv_func_iconv=yes)
|
|
LIBS="$am_save_LIBS"
|
|
fi
|
|
])
|
|
if test "$am_cv_func_iconv" = yes; then
|
|
- AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
|
|
- dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
|
|
- dnl Solaris 10.
|
|
+ AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
|
|
+ dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
|
|
am_save_LIBS="$LIBS"
|
|
if test $am_cv_lib_iconv = yes; then
|
|
LIBS="$LIBS $LIBICONV"
|
|
fi
|
|
- am_cv_func_iconv_works=no
|
|
- for ac_iconv_const in '' 'const'; do
|
|
- AC_RUN_IFELSE(
|
|
- [AC_LANG_PROGRAM(
|
|
- [[
|
|
+ AC_TRY_RUN([
|
|
#include <iconv.h>
|
|
#include <string.h>
|
|
-
|
|
-#ifndef ICONV_CONST
|
|
-# define ICONV_CONST $ac_iconv_const
|
|
-#endif
|
|
- ]],
|
|
- [[int result = 0;
|
|
+int main ()
|
|
+{
|
|
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
|
returns. */
|
|
{
|
|
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
|
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
|
{
|
|
- static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
|
|
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
|
|
char buf[10];
|
|
- ICONV_CONST char *inptr = input;
|
|
+ const char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_utf8_to_88591,
|
|
- &inptr, &inbytesleft,
|
|
- &outptr, &outbytesleft);
|
|
- if (res == 0)
|
|
- result |= 1;
|
|
- iconv_close (cd_utf8_to_88591);
|
|
- }
|
|
- }
|
|
- /* Test against Solaris 10 bug: Failures are not distinguishable from
|
|
- successful returns. */
|
|
- {
|
|
- iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
|
- if (cd_ascii_to_88591 != (iconv_t)(-1))
|
|
- {
|
|
- static ICONV_CONST char input[] = "\263";
|
|
- char buf[10];
|
|
- ICONV_CONST char *inptr = input;
|
|
- size_t inbytesleft = strlen (input);
|
|
- char *outptr = buf;
|
|
- size_t outbytesleft = sizeof (buf);
|
|
- size_t res = iconv (cd_ascii_to_88591,
|
|
- &inptr, &inbytesleft,
|
|
+ (char **) &inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if (res == 0)
|
|
- result |= 2;
|
|
- iconv_close (cd_ascii_to_88591);
|
|
- }
|
|
- }
|
|
- /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
|
|
- {
|
|
- iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
|
|
- if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
- {
|
|
- static ICONV_CONST char input[] = "\304";
|
|
- static char buf[2] = { (char)0xDE, (char)0xAD };
|
|
- ICONV_CONST char *inptr = input;
|
|
- size_t inbytesleft = 1;
|
|
- char *outptr = buf;
|
|
- size_t outbytesleft = 1;
|
|
- size_t res = iconv (cd_88591_to_utf8,
|
|
- &inptr, &inbytesleft,
|
|
- &outptr, &outbytesleft);
|
|
- if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
|
|
- result |= 4;
|
|
- iconv_close (cd_88591_to_utf8);
|
|
+ return 1;
|
|
}
|
|
}
|
|
#if 0 /* This bug could be worked around by the caller. */
|
|
@@ -150,18 +93,17 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
|
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
{
|
|
- static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
char buf[50];
|
|
- ICONV_CONST char *inptr = input;
|
|
+ const char *inptr = input;
|
|
size_t inbytesleft = strlen (input);
|
|
char *outptr = buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t res = iconv (cd_88591_to_utf8,
|
|
- &inptr, &inbytesleft,
|
|
+ (char **) &inptr, &inbytesleft,
|
|
&outptr, &outbytesleft);
|
|
if ((int)res > 0)
|
|
- result |= 8;
|
|
- iconv_close (cd_88591_to_utf8);
|
|
+ return 1;
|
|
}
|
|
}
|
|
#endif
|
|
@@ -175,16 +117,13 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
|
/* Try HP-UX names. */
|
|
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
|
- result |= 16;
|
|
- return result;
|
|
-]])],
|
|
- [am_cv_func_iconv_works=yes], ,
|
|
- [case "$host_os" in
|
|
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
- *) am_cv_func_iconv_works="guessing yes" ;;
|
|
- esac])
|
|
- test "$am_cv_func_iconv_works" = no || break
|
|
- done
|
|
+ return 1;
|
|
+ return 0;
|
|
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
|
|
+ [case "$host_os" in
|
|
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
+ *) am_cv_func_iconv_works="guessing yes" ;;
|
|
+ esac])
|
|
LIBS="$am_save_LIBS"
|
|
])
|
|
case "$am_cv_func_iconv_works" in
|
|
@@ -195,7 +134,7 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
am_func_iconv=no am_cv_lib_iconv=no
|
|
fi
|
|
if test "$am_func_iconv" = yes; then
|
|
- AC_DEFINE([HAVE_ICONV], [1],
|
|
+ AC_DEFINE(HAVE_ICONV, 1,
|
|
[Define if you have the iconv() function and it works.])
|
|
fi
|
|
if test "$am_cv_lib_iconv" = yes; then
|
|
@@ -208,64 +147,34 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
LIBICONV=
|
|
LTLIBICONV=
|
|
fi
|
|
- AC_SUBST([LIBICONV])
|
|
- AC_SUBST([LTLIBICONV])
|
|
+ AC_SUBST(LIBICONV)
|
|
+ AC_SUBST(LTLIBICONV)
|
|
])
|
|
|
|
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
|
|
-dnl avoid warnings like
|
|
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
|
|
-dnl This is tricky because of the way 'aclocal' is implemented:
|
|
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
|
-dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
|
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
|
-dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
|
-dnl warnings.
|
|
-m4_define([gl_iconv_AC_DEFUN],
|
|
- m4_version_prereq([2.64],
|
|
- [[AC_DEFUN_ONCE(
|
|
- [$1], [$2])]],
|
|
- [m4_ifdef([gl_00GNULIB],
|
|
- [[AC_DEFUN_ONCE(
|
|
- [$1], [$2])]],
|
|
- [[AC_DEFUN(
|
|
- [$1], [$2])]])]))
|
|
-gl_iconv_AC_DEFUN([AM_ICONV],
|
|
+AC_DEFUN([AM_ICONV],
|
|
[
|
|
AM_ICONV_LINK
|
|
if test "$am_cv_func_iconv" = yes; then
|
|
AC_MSG_CHECKING([for iconv declaration])
|
|
- AC_CACHE_VAL([am_cv_proto_iconv], [
|
|
- AC_COMPILE_IFELSE(
|
|
- [AC_LANG_PROGRAM(
|
|
- [[
|
|
+ AC_CACHE_VAL(am_cv_proto_iconv, [
|
|
+ AC_TRY_COMPILE([
|
|
#include <stdlib.h>
|
|
#include <iconv.h>
|
|
extern
|
|
#ifdef __cplusplus
|
|
"C"
|
|
#endif
|
|
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
|
|
+#if defined(__STDC__) || defined(__cplusplus)
|
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
#else
|
|
size_t iconv();
|
|
#endif
|
|
- ]],
|
|
- [[]])],
|
|
- [am_cv_proto_iconv_arg1=""],
|
|
- [am_cv_proto_iconv_arg1="const"])
|
|
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
|
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
- AC_MSG_RESULT([
|
|
- $am_cv_proto_iconv])
|
|
- AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
|
|
+ AC_MSG_RESULT([$]{ac_t:-
|
|
+ }[$]am_cv_proto_iconv)
|
|
+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
|
[Define as const if the declaration of iconv() needs const.])
|
|
- dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
|
|
- m4_ifdef([gl_ICONV_H_DEFAULTS],
|
|
- [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
|
|
- if test -n "$am_cv_proto_iconv_arg1"; then
|
|
- ICONV_CONST="const"
|
|
- fi
|
|
- ])
|
|
fi
|
|
])
|
|
diff --git a/tools/config.rpath b/tools/config.rpath
|
|
index 98183ff..c547c68 100755
|
|
--- a/tools/config.rpath
|
|
+++ b/tools/config.rpath
|
|
@@ -2,7 +2,7 @@
|
|
# Output a system dependent set of variables, describing how to set the
|
|
# run time search path of shared libraries in an executable.
|
|
#
|
|
-# Copyright 1996-2016 Free Software Foundation, Inc.
|
|
+# Copyright 1996-2007 Free Software Foundation, Inc.
|
|
# Taken from GNU libtool, 2001
|
|
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
|
#
|
|
@@ -25,7 +25,7 @@
|
|
# known workaround is to choose shorter directory names for the build
|
|
# directory and/or the installation directory.
|
|
|
|
-# All known linkers require a '.a' archive for static linking (except MSVC,
|
|
+# All known linkers require a `.a' archive for static linking (except MSVC,
|
|
# which needs '.lib').
|
|
libext=a
|
|
shrext=.so
|
|
@@ -47,7 +47,7 @@ for cc_temp in $CC""; do
|
|
done
|
|
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
|
|
|
|
-# Code taken from libtool.m4's _LT_COMPILER_PIC.
|
|
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
|
|
|
|
wl=
|
|
if test "$GCC" = yes; then
|
|
@@ -57,7 +57,14 @@ else
|
|
aix*)
|
|
wl='-Wl,'
|
|
;;
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ darwin*)
|
|
+ case $cc_basename in
|
|
+ xlc*)
|
|
+ wl='-Wl,'
|
|
+ ;;
|
|
+ esac
|
|
+ ;;
|
|
+ mingw* | cygwin* | pw32* | os2*)
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
wl='-Wl,'
|
|
@@ -65,37 +72,24 @@ else
|
|
irix5* | irix6* | nonstopux*)
|
|
wl='-Wl,'
|
|
;;
|
|
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
+ newsos6)
|
|
+ ;;
|
|
+ linux* | k*bsd*-gnu)
|
|
case $cc_basename in
|
|
- ecc*)
|
|
- wl='-Wl,'
|
|
- ;;
|
|
- icc* | ifort*)
|
|
- wl='-Wl,'
|
|
- ;;
|
|
- lf95*)
|
|
+ icc* | ecc*)
|
|
wl='-Wl,'
|
|
;;
|
|
- nagfor*)
|
|
- wl='-Wl,-Wl,,'
|
|
- ;;
|
|
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
|
|
+ pgcc | pgf77 | pgf90)
|
|
wl='-Wl,'
|
|
;;
|
|
ccc*)
|
|
wl='-Wl,'
|
|
;;
|
|
- xl* | bgxl* | bgf* | mpixl*)
|
|
- wl='-Wl,'
|
|
- ;;
|
|
como)
|
|
wl='-lopt='
|
|
;;
|
|
*)
|
|
case `$CC -V 2>&1 | sed 5q` in
|
|
- *Sun\ F* | *Sun*Fortran*)
|
|
- wl=
|
|
- ;;
|
|
*Sun\ C*)
|
|
wl='-Wl,'
|
|
;;
|
|
@@ -103,24 +97,13 @@ else
|
|
;;
|
|
esac
|
|
;;
|
|
- newsos6)
|
|
- ;;
|
|
- *nto* | *qnx*)
|
|
- ;;
|
|
osf3* | osf4* | osf5*)
|
|
wl='-Wl,'
|
|
;;
|
|
rdos*)
|
|
;;
|
|
solaris*)
|
|
- case $cc_basename in
|
|
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
|
|
- wl='-Qoption ld '
|
|
- ;;
|
|
- *)
|
|
- wl='-Wl,'
|
|
- ;;
|
|
- esac
|
|
+ wl='-Wl,'
|
|
;;
|
|
sunos4*)
|
|
wl='-Qoption ld '
|
|
@@ -141,7 +124,7 @@ else
|
|
esac
|
|
fi
|
|
|
|
-# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
|
|
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
|
|
|
|
hardcode_libdir_flag_spec=
|
|
hardcode_libdir_separator=
|
|
@@ -149,7 +132,7 @@ hardcode_direct=no
|
|
hardcode_minus_L=no
|
|
|
|
case "$host_os" in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | mingw* | pw32*)
|
|
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
@@ -175,21 +158,22 @@ if test "$with_gnu_ld" = yes; then
|
|
# option of GNU ld is called -rpath, not --rpath.
|
|
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
case "$host_os" in
|
|
- aix[3-9]*)
|
|
+ aix3* | aix4* | aix5*)
|
|
# On AIX/PPC, the GNU linker is very broken
|
|
if test "$host_cpu" != ia64; then
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
amigaos*)
|
|
- case "$host_cpu" in
|
|
- powerpc)
|
|
- ;;
|
|
- m68k)
|
|
- hardcode_libdir_flag_spec='-L$libdir'
|
|
- hardcode_minus_L=yes
|
|
- ;;
|
|
- esac
|
|
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
+ hardcode_minus_L=yes
|
|
+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
|
|
+ # that the semantics of dynamic libraries on AmigaOS, at least up
|
|
+ # to version 4, is to share data among multiple programs linked
|
|
+ # with the same dynamic library. Since this doesn't match the
|
|
+ # behavior of shared libraries on other platforms, we cannot use
|
|
+ # them.
|
|
+ ld_shlibs=no
|
|
;;
|
|
beos*)
|
|
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
@@ -198,7 +182,7 @@ if test "$with_gnu_ld" = yes; then
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | mingw* | pw32*)
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
# no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -208,13 +192,11 @@ if test "$with_gnu_ld" = yes; then
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- haiku*)
|
|
- ;;
|
|
interix[3-9]*)
|
|
hardcode_direct=no
|
|
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
;;
|
|
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
+ gnu* | linux* | k*bsd*-gnu)
|
|
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
:
|
|
else
|
|
@@ -272,7 +254,7 @@ else
|
|
hardcode_direct=unsupported
|
|
fi
|
|
;;
|
|
- aix[4-9]*)
|
|
+ aix4* | aix5*)
|
|
if test "$host_cpu" = ia64; then
|
|
# On IA64, the linker does run time linking by default, so we don't
|
|
# have to do anything special.
|
|
@@ -282,7 +264,7 @@ else
|
|
# Test if we are trying to use run time linking or normal
|
|
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
|
# need to do runtime linking.
|
|
- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
|
|
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
|
|
for ld_flag in $LDFLAGS; do
|
|
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
|
aix_use_runtimelinking=yes
|
|
@@ -337,18 +319,14 @@ else
|
|
fi
|
|
;;
|
|
amigaos*)
|
|
- case "$host_cpu" in
|
|
- powerpc)
|
|
- ;;
|
|
- m68k)
|
|
- hardcode_libdir_flag_spec='-L$libdir'
|
|
- hardcode_minus_L=yes
|
|
- ;;
|
|
- esac
|
|
+ hardcode_libdir_flag_spec='-L$libdir'
|
|
+ hardcode_minus_L=yes
|
|
+ # see comment about different semantics on the GNU ld section
|
|
+ ld_shlibs=no
|
|
;;
|
|
bsdi[45]*)
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | mingw* | pw32*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -358,16 +336,29 @@ else
|
|
;;
|
|
darwin* | rhapsody*)
|
|
hardcode_direct=no
|
|
- if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
|
|
+ if test "$GCC" = yes ; then
|
|
:
|
|
else
|
|
- ld_shlibs=no
|
|
+ case $cc_basename in
|
|
+ xlc*)
|
|
+ ;;
|
|
+ *)
|
|
+ ld_shlibs=no
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
;;
|
|
dgux*)
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
;;
|
|
- freebsd2.[01]*)
|
|
+ freebsd1*)
|
|
+ ld_shlibs=no
|
|
+ ;;
|
|
+ freebsd2.2*)
|
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
+ hardcode_direct=yes
|
|
+ ;;
|
|
+ freebsd2*)
|
|
hardcode_direct=yes
|
|
hardcode_minus_L=yes
|
|
;;
|
|
@@ -423,8 +414,6 @@ else
|
|
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
hardcode_libdir_separator=:
|
|
;;
|
|
- *nto* | *qnx*)
|
|
- ;;
|
|
openbsd*)
|
|
if test -f /usr/libexec/ld.so; then
|
|
hardcode_direct=yes
|
|
@@ -505,7 +494,7 @@ else
|
|
fi
|
|
|
|
# Check dynamic linker characteristics
|
|
-# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
|
|
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
|
|
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
|
|
# only about the one the linker finds when passed -lNAME. This is the last
|
|
# element of library_names_spec in libtool.m4, or possibly two of them if the
|
|
@@ -516,16 +505,11 @@ case "$host_os" in
|
|
aix3*)
|
|
library_names_spec='$libname.a'
|
|
;;
|
|
- aix[4-9]*)
|
|
+ aix4* | aix5*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
amigaos*)
|
|
- case "$host_cpu" in
|
|
- powerpc*)
|
|
- library_names_spec='$libname$shrext' ;;
|
|
- m68k)
|
|
- library_names_spec='$libname.a' ;;
|
|
- esac
|
|
+ library_names_spec='$libname.a'
|
|
;;
|
|
beos*)
|
|
library_names_spec='$libname$shrext'
|
|
@@ -533,7 +517,7 @@ case "$host_os" in
|
|
bsdi[45]*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | mingw* | pw32*)
|
|
shrext=.dll
|
|
library_names_spec='$libname.dll.a $libname.lib'
|
|
;;
|
|
@@ -544,18 +528,19 @@ case "$host_os" in
|
|
dgux*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- freebsd[23].*)
|
|
- library_names_spec='$libname$shrext$versuffix'
|
|
+ freebsd1*)
|
|
;;
|
|
freebsd* | dragonfly*)
|
|
- library_names_spec='$libname$shrext'
|
|
+ case "$host_os" in
|
|
+ freebsd[123]*)
|
|
+ library_names_spec='$libname$shrext$versuffix' ;;
|
|
+ *)
|
|
+ library_names_spec='$libname$shrext' ;;
|
|
+ esac
|
|
;;
|
|
gnu*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- haiku*)
|
|
- library_names_spec='$libname$shrext'
|
|
- ;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
case $host_cpu in
|
|
ia64*)
|
|
@@ -591,7 +576,7 @@ case "$host_os" in
|
|
;;
|
|
linux*oldld* | linux*aout* | linux*coff*)
|
|
;;
|
|
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
+ linux* | k*bsd*-gnu)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
knetbsd*-gnu)
|
|
@@ -603,7 +588,7 @@ case "$host_os" in
|
|
newsos6)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- *nto* | *qnx*)
|
|
+ nto-qnx*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
openbsd*)
|
|
@@ -634,9 +619,6 @@ case "$host_os" in
|
|
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- tpf*)
|
|
- library_names_spec='$libname$shrext'
|
|
- ;;
|
|
uts4*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|