mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

107 lines
3.4 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/attr/autoconf.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./configure.in.orig 2003-04-07 12:54:29.000000000 -0600
  20. +++ ./configure.in 2003-04-07 12:56:50.000000000 -0600
  21. @@ -58,37 +58,37 @@
  22. AC_SUBST(pkg_group)
  23. dnl check if user wants their own C compiler
  24. -test -z "$CC" && AC_PROG_CC
  25. +AC_PROG_CC
  26. cc=$CC
  27. AC_SUBST(cc)
  28. dnl check if users wants their own make
  29. -test -z "$MAKE" && AC_PATH_PROG(MAKE, make, /usr/bin/make)
  30. +AC_PATH_PROG(MAKE, make, /usr/bin/make)
  31. make=$MAKE
  32. AC_SUBST(make)
  33. dnl check if users wants their own linker
  34. -test -z "$LD" && AC_PATH_PROG(LD, ld, /usr/bin/ld)
  35. +AC_PATH_PROG(LD, ld, /usr/bin/ld)
  36. ld=$LD
  37. AC_SUBST(ld)
  38. dnl check if the tar program is available
  39. -test -z "$TAR" && AC_PATH_PROG(TAR, tar)
  40. +AC_PATH_PROG(TAR, tar)
  41. tar=$TAR
  42. AC_SUBST(tar)
  43. dnl check if the gzip program is available
  44. -test -z "$ZIP" && AC_PATH_PROG(ZIP, gzip, /bin/gzip)
  45. +AC_PATH_PROG(ZIP, gzip, /bin/gzip)
  46. zip=$ZIP
  47. AC_SUBST(zip)
  48. dnl check if the makedepend program is available
  49. -test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
  50. +AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
  51. makedepend=$MAKEDEPEND
  52. AC_SUBST(makedepend)
  53. dnl check if the rpm program is available
  54. -test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm)
  55. +AC_PATH_PROG(RPM, rpm, /bin/rpm)
  56. rpm=$RPM
  57. AC_SUBST(rpm)
  58. @@ -114,18 +114,18 @@
  59. AC_PROG_LN_S
  60. dnl check if user wants their own awk, sed and echo
  61. -test -z "$AWK" && AC_PATH_PROG(AWK, awk, /bin/awk)
  62. +AC_PATH_PROG(AWK, awk, /bin/awk)
  63. awk=$AWK
  64. AC_SUBST(awk)
  65. -test -z "$SED" && AC_PATH_PROG(SED, sed, /bin/sed)
  66. +AC_PATH_PROG(SED, sed, /bin/sed)
  67. sed=$SED
  68. AC_SUBST(sed)
  69. -test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo)
  70. +AC_PATH_PROG(ECHO, echo, /bin/echo)
  71. echo=$ECHO
  72. AC_SUBST(echo)
  73. dnl ensure libtool is installed
  74. -test -z "$LIBTOOL" && AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
  75. +AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
  76. if test "$LIBTOOL" = ""; then
  77. echo
  78. echo 'FATAL ERROR: libtool does not seem to be installed.'
  79. @@ -150,14 +150,14 @@
  80. dnl check if the msgfmt, msgmerge, xgettext programs are available
  81. if test "$enable_gettext" = yes; then
  82. - test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
  83. + AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
  84. msgfmt=$MSGFMT
  85. AC_SUBST(msgfmt)
  86. - test -z "$MSGMERGE" && AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
  87. + AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
  88. msgmerge=$MSGMERGE
  89. AC_SUBST(msgmerge)
  90. - test -z "$XGETTEXT" && AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext)
  91. + AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext)
  92. xgettext=$XGETTEXT
  93. AC_SUBST(xgettext)