squid-2.5.STABLE10-buildenv.patch

   1 Index: squid/configure.in
   2 diff -c squid/configure.in:1.251.2.92 squid/configure.in:1.251.2.93
   3 *** squid/configure.in:1.251.2.92       Mon May 16 16:38:57 2005
   4 --- squid/configure.in  Sun Jul 10 18:39:22 2005
   5 ***************
   6 *** 786,801 ****
   7                             XBS5_LP64_OFF64        64 bits (legacy)
   8                             XBS5_LPBIG_OFFBIG      large pointers and files (legacy)
   9                             default                The default for your OS],
  10 ! [ case "$enableval" in
  11     yes|no)
  12         echo "--with-build-environment expects a build environment string as used by getconf"
  13         exit 1
  14         ;;
  15 -   _*)
  16 -       buildmodel="$enableval"
  17 -       ;;
  18     *)
  19 !       buildmodel="_$enableval"
  20         ;;
  21     esac
  22   ])
  23 --- 786,798 ----
  24                             XBS5_LP64_OFF64        64 bits (legacy)
  25                             XBS5_LPBIG_OFFBIG      large pointers and files (legacy)
  26                             default                The default for your OS],
  27 ! [ case "$withval" in
  28     yes|no)
  29         echo "--with-build-environment expects a build environment string as used by getconf"
  30         exit 1
  31         ;;
  32     *)
  33 !       buildmodel="$withval"
  34         ;;
  35     esac
  36   ])
  37 ***************
  38 *** 813,820 ****
  39                 CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
  40         fi
  41   fi
  42 ! if test -n "$buildmodel" && test "$buildmodel" != "_default"; then
  43         echo "Using $buildmodel build environment"
  44         CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
  45         LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
  46         LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
  47 --- 810,823 ----
  48                 CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
  49         fi
  50   fi
  51 ! if test -n "$buildmodel" && test "$buildmodel" != "default"; then
  52         echo "Using $buildmodel build environment"
  53 +       if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
  54 +           : # All fine
  55 +       else
  56 +           echo "ERROR: Build environment $buildmodel not known to getconf."
  57 +           exit 1
  58 +       fi
  59         CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
  60         LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
  61         LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
  62 Index: squid/configure
  63 diff -c squid/configure:1.248.2.94 squid/configure:1.248.2.95
  64 *** squid/configure:1.248.2.94  Mon May 16 16:39:29 2005
  65 --- squid/configure     Sun Jul 10 18:40:15 2005
  66 ***************
  67 *** 2637,2652 ****
  68   # Check whether --with-build-environment or --without-build-environment was given.
  69   if test "${with_build_environment+set}" = set; then
  70     withval="$with_build_environment"
  71 !    case "$enableval" in
  72     yes|no)
  73         echo "--with-build-environment expects a build environment string as used by getconf"
  74         exit 1
  75         ;;
  76 -   _*)
  77 -       buildmodel="$enableval"
  78 -       ;;
  79     *)
  80 !       buildmodel="_$enableval"
  81         ;;
  82     esac
  83
  84 --- 2637,2649 ----
  85   # Check whether --with-build-environment or --without-build-environment was given.
  86   if test "${with_build_environment+set}" = set; then
  87     withval="$with_build_environment"
  88 !    case "$withval" in
  89     yes|no)
  90         echo "--with-build-environment expects a build environment string as used by getconf"
  91         exit 1
  92         ;;
  93     *)
  94 !       buildmodel="$withval"
  95         ;;
  96     esac
  97
  98 ***************
  99 *** 2666,2673 ****
 100                 CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 101         fi
 102   fi
 103 ! if test -n "$buildmodel" && test "$buildmodel" != "_default"; then
 104         echo "Using $buildmodel build environment"
 105         CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
 106         LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
 107         LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
 108 --- 2663,2676 ----
 109                 CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 110         fi
 111   fi
 112 ! if test -n "$buildmodel" && test "$buildmodel" != "default"; then
 113         echo "Using $buildmodel build environment"
 114 +       if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 115 +           : # All fine
 116 +       else
 117 +           echo "ERROR: Build environment $buildmodel not known to getconf."
 118 +           exit 1
 119 +       fi
 120         CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
 121         LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
 122         LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"