Various improvements to reduce questions :)

Remove USE_LOCALE from Makefile.global.in
Add USE_LOCALE to build/configure/config.h

Add check for BUILDRUN in configure to make sure that build is run before
configure

src/Makefile.global.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.15 1997/04/02 18:10:32 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.16 1997/04/03 21:25:59 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -146,11 +146,6 @@ ENFORCE_ALIGNMENT= true
 # Comment out PROFILE to generate a profile version of the binaries
 #PROFILE= -p -non_shared
 
-# Define USE_LOCALE to get Postgres work (sort, search)
-# with national alphabet. Remember to define environment variables
-# $LC_COLLATE and $LC_CTYPE before starting postmaster !
-USE_LOCALE = 1
-
 # If you plan to use Kerberos for authentication...
 #
 # Comment out KRBVERS if you do not use Kerberos.
@@ -721,11 +716,6 @@ ifndef CASSERT
    CFLAGS+= -DNO_ASSERT_CHECKING
 endif
 
-ifdef USE_LOCALE
- CFLAGS+= -DUSE_LOCALE
-endif
-
-
 ifdef PROFILE
    CFLAGS+= $(PROFILE)
    LDFLAGS+= $(PROFILE)

src/build

@@ -2,6 +2,8 @@
 #
 # PostgreSQL Build Script
 #
+BUILDRUN=true
+
 if echo '\c' | grep -s c >/dev/null 2>&1
 then
         ECHO_N="echo -n"
@@ -30,14 +32,24 @@ then
         LDFLAGS="$ADD_LIB_DIRS" ; export LDFLAGS
 fi
 
+IDIR=/usr/local/pgsql
 $ECHO_N "Installation directory [/usr/local/pgsql]: $ECHO_C"
 read a
 if [ "$a." != "." ]
 then
         IDIR=${a}
-else
-	IDIR=/usr/local/pgsql
 fi
 
+USE_LOCALE=no
+echo "Define USE_LOCALE to get Postgres work (sort, search)"
+$ECHO_N "with national alphabet. [no]: $ECHO_C"
+read a
+if [ "$a." != "." ]
+then
+	USE_LOCALE=${a}
+fi
+
+export BUILDRUN USE_LOCALE
+
 ./configure --prefix=${IDIR}
 

src/configure.in

@@ -1,7 +1,14 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(backend/access/common/heaptuple.c)
-AC_CANONICAL_HOST
+
+if test "$BUILDRUN" != "true"
+then
+  echo "You must run the build script, which will auto-run configure"
+  exit
+fi
 TR="tr"
+
+AC_CANONICAL_HOST
 case "$host_os" in
  solaris*)
         case "$host_cpu" in
@@ -42,6 +49,7 @@ AC_SUBST(TR)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)
 
+
 AC_CONFIG_HEADER(include/config.h)
 
 dnl Checks for programs.
@@ -83,6 +91,12 @@ AC_SUBST(INSTLOPTS)
 AC_SUBST(INSTL_LIB_OPTS)
 AC_SUBST(INSTL_EXE_OPTS)
 
+if test "$USE_LOCALE" = "yes"
+then
+	AC_MSG_RESULT(setting USE_LOCALE)
+	AC_DEFINE(USE_LOCALE)
+fi
+
 dnl Check the option to echo to inhibit newlines.
 ECHO_N_OUT=`echo -n "" | wc -c`
 ECHO_C_OUT=`echo "\c" | wc -c`

src/include/config.h.in

@@ -104,6 +104,9 @@
 /* Set to 1 if you have union semun */
 #undef HAVE_UNION_SEMUN
 
+/* Set to 1 if you want to USE_LOCALE */
+#undef USE_LOCALE
+
 /*
  * Code below this point should not require changes
  */