Skip to content

Commit 54659c2

Browse files
phadejphadej
committed
Fix configure scripts
- whitespace in (pg_config) path issues - version check didn't fail for pg_config either
1 parent fee482e commit 54659c2

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎postgresql-libpq-configure/configure

+7-7
Original file line numberDiff line numberDiff line change
@@ -3850,8 +3850,8 @@ do
38503850
for ac_exec_ext in '' $ac_executable_extensions; do
38513851
ac_path_PG_CONFIG="$as_dir$ac_prog$ac_exec_ext"
38523852
as_fn_executable_p "$ac_path_PG_CONFIG" || continue
3853-
ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
3854-
&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:
3853+
ac_cv_path_PG_CONFIG="";"$ac_path_PG_CONFIG" --includedir > /dev/null \
3854+
&& ac_cv_path_PG_CONFIG="$ac_path_PG_CONFIG" ac_path_PG_CONFIG_found=:
38553855
$ac_path_PG_CONFIG_found && break 3
38563856
done
38573857
done
@@ -3867,7 +3867,7 @@ fi
38673867
fi
38683868
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_PG_CONFIG" >&5
38693869
printf "%s\n" "$ac_cv_path_PG_CONFIG" >&6; }
3870-
PG_CONFIG=$ac_cv_path_PG_CONFIG
3870+
PG_CONFIG="$ac_cv_path_PG_CONFIG"
38713871
if test "X$PG_CONFIG" = "X"
38723872
then :
38733873
break
@@ -3879,7 +3879,7 @@ if test ${ac_cv_POSTGRESQL_CPPFLAGS+y}
38793879
then :
38803880
printf %s "(cached) " >&6
38813881
else $as_nop
3882-
ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
3882+
ac_cv_POSTGRESQL_CPPFLAGS="-I`"$PG_CONFIG" --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
38833883
fi
38843884
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_POSTGRESQL_CPPFLAGS" >&5
38853885
printf "%s\n" "$ac_cv_POSTGRESQL_CPPFLAGS" >&6; }
@@ -3895,7 +3895,7 @@ if test ${ac_cv_POSTGRESQL_LDFLAGS+y}
38953895
then :
38963896
printf %s "(cached) " >&6
38973897
else $as_nop
3898-
ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
3898+
ac_cv_POSTGRESQL_LDFLAGS="-L`"$PG_CONFIG" --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
38993899
fi
39003900
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_POSTGRESQL_LDFLAGS" >&5
39013901
printf "%s\n" "$ac_cv_POSTGRESQL_LDFLAGS" >&6; }
@@ -3924,7 +3924,7 @@ then :
39243924
printf %s "(cached) " >&6
39253925
else $as_nop
39263926
3927-
ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[:space:]][[:space:]]*\([0-9.][0-9.]*\).*/\1/"` \
3927+
ac_cv_POSTGRESQL_VERSION=`"$PG_CONFIG" --version | sed "s/^PostgreSQL[[:space:]][[:space:]]*\([0-9.][0-9.]*\).*/\1/"` \
39283928
|| _AX_LIB_POSTGRESQL_OLD_fail=yes
39293929
39303930
fi
@@ -3982,7 +3982,7 @@ x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version
39823982
printf "%s\n" "$found_postgresql_req_version" >&6; }
39833983
39843984
fi
3985-
if test "Xfound_postgresql_req_version" = "Xno"
3985+
if test "X$found_postgresql_req_version" = "Xno"
39863986
then :
39873987
break
39883988
fi

‎postgresql-libpq-configure/m4/ax_lib_postgresql.m4

+7-7
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
5858
while true; do
5959
AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
6060
[AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
61-
[[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
62-
&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
61+
[[ac_cv_path_PG_CONFIG="";"$ac_path_PG_CONFIG" --includedir > /dev/null \
62+
&& ac_cv_path_PG_CONFIG="$ac_path_PG_CONFIG" ac_path_PG_CONFIG_found=:]],
6363
[ac_cv_path_PG_CONFIG=""])])
64-
PG_CONFIG=$ac_cv_path_PG_CONFIG
64+
PG_CONFIG="$ac_cv_path_PG_CONFIG"
6565
AS_IF([test "X$PG_CONFIG" = "X"],[break])
6666
6767
AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
68-
[ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
68+
[ac_cv_POSTGRESQL_CPPFLAGS="-I`"$PG_CONFIG" --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
6969
AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
7070
POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
7171
7272
AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
73-
[ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
73+
[ac_cv_POSTGRESQL_LDFLAGS="-L`"$PG_CONFIG" --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
7474
AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
7575
POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
7676
@@ -80,7 +80,7 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
8080
8181
AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
8282
[
83-
ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
83+
ac_cv_POSTGRESQL_VERSION=`"$PG_CONFIG" --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
8484
|| _AX_LIB_POSTGRESQL_OLD_fail=yes
8585
])
8686
AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
@@ -96,7 +96,7 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
9696
[found_postgresql_req_version=yes],[found_postgresql_req_version=no])
9797
AC_MSG_RESULT([$found_postgresql_req_version])
9898
])
99-
AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
99+
AS_IF([test "X$found_postgresql_req_version" = "Xno"],[break])
100100
101101
found_postgresql="yes"
102102
break

‎postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: postgresql-libpq-pkgconfig
3-
version: 0.10
3+
version: 0.10.0.1
44
synopsis: low-level binding to libpq: pkg-config based provider
55
description:
66
This is a binding to libpq: the C application

0 commit comments

Comments
 (0)