Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
# lib-prefix.m4 serial 5 (gettext-0.15)
|
|
|
|
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.
|
2007-06-09 09:20:46 -07:00
|
|
|
|
|
|
|
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 he 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])
|
Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
2007-06-09 09:20:46 -07:00
|
|
|
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"
|
Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
additional_libdir="$withval/$acl_libdirstem"
|
2007-06-09 09:20:46 -07:00
|
|
|
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
|
Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
2007-06-09 09:20:46 -07:00
|
|
|
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.
|
Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
|
2007-06-09 09:20:46 -07:00
|
|
|
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
|
Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
|
2007-06-09 09:20:46 -07:00
|
|
|
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"
|
|
|
|
])
|
Port r3878 and r3879 from trunk/
Update gettext.h to 0.17. This changes its license from LGPL2+ to GPL2+ !
Update gettext files to versions found in 0.17
Deleted:
m4/ulonglong.m4 - Superceeded by longlong.m4
m4/signed.m4 - Had no users
m4/isc-posix.m4 - Superceeded by autoconf-2.53
m4/inttypes.m4 - Had no users
m4/longdouble.m4 - Also unneeded
m4/intmax.m4, m4/lib-prefix.m4, m4/lib-link.m4, m4/printf-posix.m4, m4/xsize.m4, m4/lib-ld.m4, m4/lcmessage.m4, m4/wint_t.m4, m4/inttypes-pri.m4, m4/progtest.m4, m4/uintmax_t.m4, m4/stdint_h.m4, m4/intdiv0.m4, m4/iconv.m4, m4/po.m4, m4/longlong.m4, m4/size_max.m4, m4/glibc21.m4, m4/inttypes_h.m4, m4/codeset.m4, m4/wchar_t.m4, m4/nls.m4
change in license from:
This file is free software, distributed under the terms of the GNU
General Public License. As a special exception to the GNU General
Public License, this file may be distributed as part of a program
that contains a configuration script generated by Autoconf, under
the same distribution terms as the rest of that program.
to:
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
This removes any GPL licensed files from m4/
po/Makefile.in.in recieved my MSGMERGE_OPTIONS again after update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3882 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-01 05:04:16 -08:00
|
|
|
|
|
|
|
dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
|
|
|
|
dnl the basename of the libdir, either "lib" or "lib64".
|
|
|
|
AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
|
|
|
|
[
|
|
|
|
dnl There is no formal standard regarding lib and lib64. The current
|
|
|
|
dnl practice is that on a system supporting 32-bit and 64-bit instruction
|
|
|
|
dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
|
|
|
|
dnl libraries go under $prefix/lib. We determine the compiler's default
|
|
|
|
dnl mode by looking at the compiler's library search path. If at least
|
|
|
|
dnl of its elements ends in /lib64 or points to a directory whose absolute
|
|
|
|
dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
|
|
|
|
dnl default, namely "lib".
|
|
|
|
acl_libdirstem=lib
|
|
|
|
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
|
|
|
|
if test -n "$searchpath"; then
|
|
|
|
acl_save_IFS="${IFS= }"; IFS=":"
|
|
|
|
for searchdir in $searchpath; do
|
|
|
|
if test -d "$searchdir"; then
|
|
|
|
case "$searchdir" in
|
|
|
|
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
|
|
|
|
*) searchdir=`cd "$searchdir" && pwd`
|
|
|
|
case "$searchdir" in
|
|
|
|
*/lib64 ) acl_libdirstem=lib64 ;;
|
|
|
|
esac ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
IFS="$acl_save_IFS"
|
|
|
|
fi
|
|
|
|
])
|