Fix configure scripts

- whitespace in (pg_config) path issues - version check didn't fail for pg_config either
haskellari · Aug 24, 2024 · 54659c2 · 54659c2
1 parent fee482e
commit 54659c2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/postgresql-libpq-configure/configure b/postgresql-libpq-configure/configure
@@ -3850,8 +3850,8 @@ do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_PG_CONFIG="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_PG_CONFIG" || continue
-ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
-		&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:
+ac_cv_path_PG_CONFIG="";"$ac_path_PG_CONFIG" --includedir > /dev/null \
+		&& ac_cv_path_PG_CONFIG="$ac_path_PG_CONFIG" ac_path_PG_CONFIG_found=:
       $ac_path_PG_CONFIG_found && break 3
     done
   done
@@ -3867,7 +3867,7 @@ fi
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_PG_CONFIG" >&5
 printf "%s\n" "$ac_cv_path_PG_CONFIG" >&6; }
-	  PG_CONFIG=$ac_cv_path_PG_CONFIG
+	  PG_CONFIG="$ac_cv_path_PG_CONFIG"
 	  if test "X$PG_CONFIG" = "X"
 then :
   break
@@ -3879,7 +3879,7 @@ if test ${ac_cv_POSTGRESQL_CPPFLAGS+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
+  ac_cv_POSTGRESQL_CPPFLAGS="-I`"$PG_CONFIG" --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_POSTGRESQL_CPPFLAGS" >&5
 printf "%s\n" "$ac_cv_POSTGRESQL_CPPFLAGS" >&6; }
@@ -3895,7 +3895,7 @@ if test ${ac_cv_POSTGRESQL_LDFLAGS+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
+  ac_cv_POSTGRESQL_LDFLAGS="-L`"$PG_CONFIG" --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_POSTGRESQL_LDFLAGS" >&5
 printf "%s\n" "$ac_cv_POSTGRESQL_LDFLAGS" >&6; }
@@ -3924,7 +3924,7 @@ then :
   printf %s "(cached) " >&6
 else $as_nop
 
-			ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[:space:]][[:space:]]*\([0-9.][0-9.]*\).*/\1/"` \
+			ac_cv_POSTGRESQL_VERSION=`"$PG_CONFIG" --version | sed "s/^PostgreSQL[[:space:]][[:space:]]*\([0-9.][0-9.]*\).*/\1/"` \
 			      || _AX_LIB_POSTGRESQL_OLD_fail=yes
 
 fi
@@ -3982,7 +3982,7 @@ x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version
 printf "%s\n" "$found_postgresql_req_version" >&6; }
 
 fi
-	  if test "Xfound_postgresql_req_version" = "Xno"
+	  if test "X$found_postgresql_req_version" = "Xno"
 then :
   break
 fi

diff --git a/postgresql-libpq-configure/m4/ax_lib_postgresql.m4 b/postgresql-libpq-configure/m4/ax_lib_postgresql.m4
@@ -58,19 +58,19 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
 	while true; do
 	  AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
 	    [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
-	      [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
-		&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
+	      [[ac_cv_path_PG_CONFIG="";"$ac_path_PG_CONFIG" --includedir > /dev/null \
+		&& ac_cv_path_PG_CONFIG="$ac_path_PG_CONFIG" ac_path_PG_CONFIG_found=:]],
 	      [ac_cv_path_PG_CONFIG=""])])
-	  PG_CONFIG=$ac_cv_path_PG_CONFIG
+	  PG_CONFIG="$ac_cv_path_PG_CONFIG"
 	  AS_IF([test "X$PG_CONFIG" = "X"],[break])
 
 	  AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
-		       [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
+		       [ac_cv_POSTGRESQL_CPPFLAGS="-I`"$PG_CONFIG" --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
 	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
 	  POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
 
 	  AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
-		       [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
+		       [ac_cv_POSTGRESQL_LDFLAGS="-L`"$PG_CONFIG" --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
 	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
 	  POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
 
@@ -80,7 +80,7 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
 
 	  AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
 		       [
-			ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
+			ac_cv_POSTGRESQL_VERSION=`"$PG_CONFIG" --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
 			      || _AX_LIB_POSTGRESQL_OLD_fail=yes
 		       ])
 	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
@@ -96,7 +96,7 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
 				[found_postgresql_req_version=yes],[found_postgresql_req_version=no])
 	     AC_MSG_RESULT([$found_postgresql_req_version])
 	  ])
-	  AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
+	  AS_IF([test "X$found_postgresql_req_version" = "Xno"],[break])
 
 	  found_postgresql="yes"
 	  break

diff --git a/postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal b/postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               postgresql-libpq-pkgconfig
-version:            0.10
+version:            0.10.0.1
 synopsis:           low-level binding to libpq: pkg-config based provider
 description:
   This is a binding to libpq: the C application