@@ -14,10 +14,10 @@ ac_default_prefix=/usr/local
1414ac_default_prefix=/usr/local
1515ac_help=" $ac_help
1616 --with-template=TEMPLATE
17- use operating system template file
18- see template directory"
17+ use operating system template file; see template directory"
1918ac_help=" $ac_help
20- --with-odbcinst=<datadir> change default directory for odbcinst.ini"
19+ --with-odbcinst=<pathname>
20+ change default directory for odbcinst.ini "
2121
2222# Initialize some variables set by options.
2323# The variables have the same names as the options, with
527527
528528
529529
530+ echo " *** configuring psqlodbc ***"
531+
530532if test -d ../../interfaces
531533then
532- TEMPLATEDIR=../../template
533- if test " $prefix " " NONE"
534- then
535- ac_default_prefix=/usr/local/pgsql
536- fi
537- ODBCINSTDIR=
538- else
539- TEMPLATEDIR=./template
540- if test " $prefix " " NONE"
534+ echo " psqlodbc can be configured either standalone or integrated"
535+ echo " into the Postgres main distribution."
536+ echo " It appears that you are running the standalone configure"
537+ echo " from within the main distribution. The recommended (and required)"
538+ echo " procedure is to configure ODBC using the integrated configuration"
539+ echo " procedure using the --with-odbc option."
540+ exit
541+ fi
542+
543+ TEMPLATEDIR=./template
544+ if test " $prefix " " NONE"
545+ then
546+ if test -d " /share"
541547 then
542- ODBCINSTDIR =/share
548+ ODBCINST =/share/odbcinst.ini
543549 else
544- ODBCINSTDIR=
550+ ODBCINST=/etc/odbcinst.ini
545551 fi
552+ else
553+ ODBCINST=$prefix /odbcinst.ini
546554fi
547555
548- echo " *** configuring psqlodbc ***"
549-
550556ac_aux_dir=
551557for ac_dir in $srcdir $srcdir /.. $srcdir /../..; do
552558 if test -f $ac_dir /install-sh; then
@@ -573,7 +579,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
573579fi
574580
575581echo $ac_n " checking host system type" " ... $ac_c " 1>&6
576- echo " configure:577 : checking host system type" >&5
582+ echo " configure:583 : checking host system type" >&5
577583
578584host_alias=$host
579585case " $host_alias " in
637643PORTNAME=${os}
638644
639645
640-
641646echo " checking echo setting..."
642647if echo ' \c' | grep -s c > /dev/null 2>&1
643648then
652657
653658
654659echo $ac_n " checking setting template to" " ... $ac_c " 1>&6
655- echo " configure:656 : checking setting template to" >&5
660+ echo " configure:661 : checking setting template to" >&5
656661# Check whether --with-template or --without-template was given.
657662if test " ${with_template+set} " set ; then
658663 withval=" $with_template "
@@ -692,7 +697,7 @@ distribution's 'interfaces/odbc' directory and try
692697again.
693698
694699If neither of these is the case than please complain
695- kindly to the maintainers, their e-mail addresses can
700+ kindly to the maintainers; their e-mail addresses can
696701be found in the Readme files.
697702*************************************************************
698703EOT
@@ -764,7 +769,7 @@ export LDFLAGS
764769echo " - setting LDFLAGS=$LDFLAGS "
765770
766771echo $ac_n " checking setting ODBCINST" " ... $ac_c " 1>&6
767- echo " configure:768 : checking setting ODBCINST" >&5
772+ echo " configure:773 : checking setting ODBCINST" >&5
768773# Check whether --with-odbcinst or --without-odbcinst was given.
769774if test " ${with_odbcinst+set} " set ; then
770775 withval=" $with_odbcinst "
@@ -774,18 +779,13 @@ EOF
774779 echo " $ac_t " " $with_odbcinst " 1>&6
775780else
776781 cat >> confdefs.h << EOF
777- #define ODBCINST ${ODBCINSTDIR}
782+ #define ODBCINST /etc/odbcinst.ini
778783EOF
779- echo " $ac_t " " ${ODBCINSTDIR } " 1>&6
784+ echo " $ac_t " " ${ODBCINST } " 1>&6
780785
781786fi
782787
783788
784- if test " X$with_odbcinst " ! = " X"
785- then
786- ODBCINSTDIR=$with_odbcinst
787- fi
788-
789789
790790
791791if test " X$with_compiler " ! = " X"
@@ -1755,10 +1755,10 @@ s%@host_alias@%$host_alias%g
17551755s%@host_cpu@%$host_cpu %g
17561756s%@host_vendor@%$host_vendor %g
17571757s%@host_os@%$host_os %g
1758- s%@PORTNAME@%$PORTNAME %g
1759- s%@ODBCINSTDIR@%$ODBCINSTDIR %g
1758+ s%@ODBCINST@%$ODBCINST %g
17601759s%@CC@%$CC %g
17611760s%@CPP@%$CPP %g
1761+ s%@PORTNAME@%$PORTNAME %g
17621762s%@AROPT@%$AROPT %g
17631763s%@SHARED_LIB@%$SHARED_LIB %g
17641764s%@DLSUFFIX@%$DLSUFFIX %g
@@ -1977,6 +1977,51 @@ cat >> $CONFIG_STATUS <<\EOF
19771977 fi
19781978fi; done
19791979
1980+ EOF
1981+
1982+ cat >> $CONFIG_STATUS << EOF
1983+ ac_sources="makefiles/Makefile.${os} "
1984+ ac_dests="Makefile.port"
1985+ EOF
1986+
1987+ cat >> $CONFIG_STATUS << \EOF
1988+ srcdir=$ac_given_srcdir
1989+ while test -n "$ac_sources "; do
1990+ set $ac_dests ; ac_dest=$1 ; shift; ac_dests=$*
1991+ set $ac_sources ; ac_source=$1 ; shift; ac_sources=$*
1992+
1993+ echo "linking $srcdir /$ac_source to $ac_dest "
1994+
1995+ if test ! -r $srcdir /$ac_source ; then
1996+ { echo "configure: error: $srcdir /$ac_source : File not found" 1>&2; exit 1; }
1997+ fi
1998+ rm -f $ac_dest
1999+
2000+ # Make relative symlinks.
2001+ # Remove last slash and all that follows it. Not all systems have dirname.
2002+ ac_dest_dir=` echo $ac_dest | sed ' s%/[^/][^/]*$%%' `
2003+ if test "$ac_dest_dir " != "$ac_dest " && test "$ac_dest_dir " != .; then
2004+ # The dest file is in a subdirectory.
2005+ test ! -d "$ac_dest_dir " && mkdir "$ac_dest_dir "
2006+ ac_dest_dir_suffix="/` echo $ac_dest_dir | sed ' s%^\./%%' `
2007+ # A "../" for each directory in $ac_dest_dir_suffix .
2008+ ac_dots=` echo $ac_dest_dir_suffix | sed ' s%/[^/]*%../%g' `
2009+ else
2010+ ac_dest_dir_suffix= ac_dots=
2011+ fi
2012+
2013+ case "$srcdir " in
2014+ [/$]*) ac_rel_source="$srcdir /$ac_source " ;;
2015+ *) ac_rel_source="$ac_dots$srcdir /$ac_source " ;;
2016+ esac
2017+
2018+ # Make a symlink if possible; otherwise try a hard link.
2019+ if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
2020+ ln $srcdir /$ac_source $ac_dest ; then :
2021+ else
2022+ { echo "configure: error: can not link $ac_dest to $srcdir /$ac_source " 1>&2; exit 1; }
2023+ fi
2024+ done
19802025EOF
19812026cat >> $CONFIG_STATUS << EOF
19822027
0 commit comments