shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Making path of $INSTALL always absolute.

git/fs: mount .git/fs: mount/attach disallowed

--- a/builds/unix/configure

+++ b/builds/unix/configure

@@ -1025,6 +1025,7 @@

   echo "$ac_t""no" 1>&6

 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:

@@ -1037,7 +1038,7 @@

 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

 # ./install, which can be erroneously created by make from ./install.sh.

 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6

-echo "configure:1041: checking for a BSD compatible install" >&5

+echo "configure:1042: checking for a BSD compatible install" >&5

 if test -z "$INSTALL"; then

 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1089,14 +1090,20 @@

 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

+case "$INSTALL" in

+  /*)

+    ;;

+  */*)

+    INSTALL="`pwd`/$INSTALL" ;;

+esac

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

-echo "configure:1095: checking for ANSI C header files" >&5

+echo "configure:1102: checking for ANSI C header files" >&5

 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 1100 "configure"

+#line 1107 "configure"

 #include "confdefs.h"

 #include <stdlib.h>

 #include <stdarg.h>

@@ -1104,7 +1111,7 @@

 #include <float.h>

 EOF

 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

+{ (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then

   rm -rf conftest*

@@ -1121,7 +1128,7 @@

 if test $ac_cv_header_stdc = yes; then

   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.

 cat > conftest.$ac_ext <<EOF

-#line 1125 "configure"

+#line 1132 "configure"

 #include "confdefs.h"

 #include <string.h>

 EOF

@@ -1139,7 +1146,7 @@

 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 <<EOF

-#line 1143 "configure"

+#line 1150 "configure"

 #include "confdefs.h"

 #include <stdlib.h>

 EOF

@@ -1160,7 +1167,7 @@

   :

 else

   cat > conftest.$ac_ext <<EOF

-#line 1164 "configure"

+#line 1171 "configure"

 #include "confdefs.h"

 #include <ctype.h>

 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

@@ -1171,7 +1178,7 @@

 exit (0); }

 EOF

-if { (eval echo configure:1175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

+if { (eval echo configure:1182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then

   :

 else

@@ -1198,17 +1205,17 @@

 do

 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:1202: checking for $ac_hdr" >&5

+echo "configure:1209: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 1207 "configure"

+#line 1214 "configure"

 #include "confdefs.h"

 #include <$ac_hdr>

 EOF

 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

+{ (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then

   rm -rf conftest*

@@ -1236,12 +1243,12 @@

 echo $ac_n "checking for working const""... $ac_c" 1>&6

-echo "configure:1240: checking for working const" >&5

+echo "configure:1247: checking for working const" >&5

 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 1245 "configure"

+#line 1252 "configure"

 #include "confdefs.h"

 int main() {

@@ -1290,7 +1297,7 @@

 ; return 0; }

 EOF

-if { (eval echo configure:1294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

+if { (eval echo configure:1301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*

   ac_cv_c_const=yes

 else

@@ -1311,7 +1318,7 @@

 fi

 echo $ac_n "checking size of int""... $ac_c" 1>&6

-echo "configure:1315: checking size of int" >&5

+echo "configure:1322: checking size of int" >&5

 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1319,7 +1326,7 @@

     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }

 else

   cat > conftest.$ac_ext <<EOF

-#line 1323 "configure"

+#line 1330 "configure"

 #include "confdefs.h"

 #include <stdio.h>

 main()

@@ -1330,7 +1337,7 @@

   exit(0);

 }

 EOF

-if { (eval echo configure:1334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

+if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then

   ac_cv_sizeof_int=`cat conftestval`

 else

@@ -1350,7 +1357,7 @@

 echo $ac_n "checking size of long""... $ac_c" 1>&6

-echo "configure:1354: checking size of long" >&5

+echo "configure:1361: checking size of long" >&5

 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1358,7 +1365,7 @@

     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }

 else

   cat > conftest.$ac_ext <<EOF

-#line 1362 "configure"

+#line 1369 "configure"

 #include "confdefs.h"

 #include <stdio.h>

 main()

@@ -1369,7 +1376,7 @@

   exit(0);

 }

 EOF

-if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

+if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then

   ac_cv_sizeof_long=`cat conftestval`

 else

@@ -1394,17 +1401,17 @@

 do

 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:1398: checking for $ac_hdr" >&5

+echo "configure:1405: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 1403 "configure"

+#line 1410 "configure"

 #include "confdefs.h"

 #include <$ac_hdr>

 EOF

 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

+{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then

   rm -rf conftest*

@@ -1433,12 +1440,12 @@

 for ac_func in getpagesize

 do

 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:1437: checking for $ac_func" >&5

+echo "configure:1444: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 1442 "configure"

+#line 1449 "configure"

 #include "confdefs.h"

 /* System header to define __stub macros and hopefully few prototypes,

     which can conflict with char $ac_func(); below.  */

@@ -1461,7 +1468,7 @@

 ; return 0; }

 EOF

-if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

+if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*

   eval "ac_cv_func_$ac_func=yes"

 else

@@ -1486,7 +1493,7 @@

 done

 echo $ac_n "checking for working mmap""... $ac_c" 1>&6

-echo "configure:1490: checking for working mmap" >&5

+echo "configure:1497: checking for working mmap" >&5

 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1494,7 +1501,7 @@

   ac_cv_func_mmap_fixed_mapped=no

 else

   cat > conftest.$ac_ext <<EOF

-#line 1498 "configure"

+#line 1505 "configure"

 #include "confdefs.h"

 /* Thanks to Mike Haertel and Jim Avera for this test.

@@ -1634,7 +1641,7 @@

 }

 EOF

-if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

+if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then

   ac_cv_func_mmap_fixed_mapped=yes

 else

@@ -1666,12 +1673,12 @@

 for ac_func in memcpy memmove

 do

 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:1670: checking for $ac_func" >&5

+echo "configure:1677: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 1675 "configure"

+#line 1682 "configure"

 #include "confdefs.h"

 /* System header to define __stub macros and hopefully few prototypes,

     which can conflict with char $ac_func(); below.  */

@@ -1694,7 +1701,7 @@

 ; return 0; }

 EOF

-if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

+if { (eval echo configure:1705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*

   eval "ac_cv_func_$ac_func=yes"

 else

@@ -1791,7 +1798,7 @@

 # Extract the first word of "ranlib", so it can be a program name with args.

 set dummy ranlib; ac_word=$2

 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:1795: checking for $ac_word" >&5

+echo "configure:1802: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1830,7 +1837,7 @@

 if test "$ac_cv_prog_gcc" = yes; then

   # Check if gcc -print-prog-name=ld gives a path.

   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6

-echo "configure:1834: checking for ld used by GCC" >&5

+echo "configure:1841: checking for ld used by GCC" >&5

   ac_prog=`($CC -print-prog-name=ld) 2>&5`

   case "$ac_prog" in

     # Accept absolute paths.

@@ -1854,10 +1861,10 @@

   esac

 elif test "$with_gnu_ld" = yes; then

   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6

-echo "configure:1858: checking for GNU ld" >&5

+echo "configure:1865: checking for GNU ld" >&5

 else

   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6

-echo "configure:1861: checking for non-GNU ld" >&5

+echo "configure:1868: checking for non-GNU ld" >&5

 fi

 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1892,7 +1899,7 @@

 fi

 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }

 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6

-echo "configure:1896: checking if the linker ($LD) is GNU ld" >&5

+echo "configure:1903: checking if the linker ($LD) is GNU ld" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1908,7 +1915,7 @@

 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6

-echo "configure:1912: checking for BSD-compatible nm" >&5

+echo "configure:1919: checking for BSD-compatible nm" >&5

 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1944,7 +1951,7 @@

 echo "$ac_t""$NM" 1>&6

 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6

-echo "configure:1948: checking whether ln -s works" >&5

+echo "configure:1955: checking whether ln -s works" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -1993,8 +2000,8 @@

 case "$lt_target" in

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 1997 "configure"' > conftest.$ac_ext

-  if { (eval echo configure:1998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

+  echo '#line 2004 "configure"' > conftest.$ac_ext

+  if { (eval echo configure:2005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

     case "`/usr/bin/file conftest.o`" in

     *32-bit*)

       LD="${LD-ld} -32"

@@ -2015,12 +2022,12 @@

   SAVE_CFLAGS="$CFLAGS"

   CFLAGS="$CFLAGS -belf"

   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6

-echo "configure:2019: checking whether the C compiler needs -belf" >&5

+echo "configure:2026: checking whether the C compiler needs -belf" >&5

 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

   cat > conftest.$ac_ext <<EOF

-#line 2024 "configure"

+#line 2031 "configure"

 #include "confdefs.h"

 int main() {

@@ -2027,7 +2034,7 @@

 ; return 0; }

 EOF

-if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

+if { (eval echo configure:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*

   lt_cv_cc_needs_belf=yes

 else

--- a/builds/unix/configure.in

+++ b/builds/unix/configure.in

@@ -5,7 +5,7 @@

 AC_INIT(ftconfig.in)

-dnl Configuration file -- stay in 8.3 limit

+dnl configuration file -- stay in 8.3 limit

 AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)

 version_info='6:0:0'

@@ -39,7 +39,17 @@

 AC_CHECK_PROG(RMF, rm, rm -f)

 AC_CHECK_PROG(RMDIR, rmdir, rmdir)

+

+dnl Since this file will be finally moved to another directory we make

+dnl the path of the install script absolute.  This small code snippet has

+dnl been taken from automake's `ylwrap' script.

 AC_PROG_INSTALL

+case "$INSTALL" in

+  /*)

+    ;;

+  */*)

+    INSTALL="`pwd`/$INSTALL" ;;

+esac

 dnl checks for header files

 AC_HEADER_STDC

@@ -50,7 +60,7 @@

 AC_CHECK_SIZEOF(int)

 AC_CHECK_SIZEOF(long)

-dnl Checks for library functions.

+dnl checks for library functions

 dnl Here we check whether we can use our mmap file component.

 AC_FUNC_MMAP