configure.ac (ca1cff08) configure.ac (c25219e0)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 1677 unchanged lines hidden (view full) ---

1686 fi
1687fi
1688
1689dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
1690if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
1691 AC_PROG_CC
1692fi
1693
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 1677 unchanged lines hidden (view full) ---

1686 fi
1687fi
1688
1689dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
1690if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
1691 AC_PROG_CC
1692fi
1693
1694if test "$_os" = "FreeBSD"; then
1695 FBSD_GCC_RPATH=
1696 if $CC --version 2>&1 | grep clang > /dev/null ; then
1697 COM_IS=CLANG
1698 else
1699 COM_IS=GCC
1700 rpath=`$CC --print-file-name libstdc++.so`
1701 rpath=`realpath $rpath`
1702 rpath=`dirname $rpath`
1703 if test "$rpath" != "/usr/lib" ; then
1704 FBSD_GCC_RPATH="-Wl,-rpath=$rpath"
1705 fi
1706 fi
1707 AC_SUBST(COM_IS)
1708 AC_SUBST(FBSD_GCC_RPATH)
1709fi
1710
1694COMPATH=`dirname "$CC"`
1695if test "$COMPATH" = "." ; then
1696 AC_PATH_PROGS(COMPATH, $CC)
1697 dnl double square bracket to get single because of M4 quote...
1698 COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
1699fi
1700CC_PATH="$COMPATH/"
1701COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;

--- 5122 unchanged lines hidden (view full) ---

6824
6825dnl ===================================================================
6826dnl always rely on the system version of gettext
6827dnl ===================================================================
6828
6829SYSTEM_GETTEXT=YES
6830AC_SUBST(SYSTEM_GETTEXT)
6831
1711COMPATH=`dirname "$CC"`
1712if test "$COMPATH" = "." ; then
1713 AC_PATH_PROGS(COMPATH, $CC)
1714 dnl double square bracket to get single because of M4 quote...
1715 COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
1716fi
1717CC_PATH="$COMPATH/"
1718COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;

--- 5122 unchanged lines hidden (view full) ---

6841
6842dnl ===================================================================
6843dnl always rely on the system version of gettext
6844dnl ===================================================================
6845
6846SYSTEM_GETTEXT=YES
6847AC_SUBST(SYSTEM_GETTEXT)
6848
6849if test "$_os" = "FreeBSD"; then
6850 LIBINTL_PREFIX=
6851 for dir in $CPPFLAGS; do
6852 if dir=`expr -- $dir : '-I\(.*\)'`; then
6853 if test -f "$dir/libintl.h" ; then
6854 LIBINTL_PREFIX=`dirname $dir`
6855 fi
6856 fi
6857 done
6858 AC_SUBST(LIBINTL_PREFIX)
6859fi
6860
6832dnl ===================================================================
6833dnl always rely on the system version of pango
6834dnl ===================================================================
6835
6836SYSTEM_PANGO=YES
6837AC_SUBST(SYSTEM_PANGO)
6838
6839dnl ===================================================================

--- 509 unchanged lines hidden --- 		6861dnl ===================================================================
6862dnl always rely on the system version of pango
6863dnl ===================================================================
6864
6865SYSTEM_PANGO=YES
6866AC_SUBST(SYSTEM_PANGO)
6867
6868dnl ===================================================================

--- 509 unchanged lines hidden ---