Standardize configure options to --with-X[=DIR]

Author: ppomes

.github/workflows/makefile.yml

@@ -21,7 +21,7 @@ jobs:
       run: ./autogen.sh
 
     - name: configure
-      run: ./configure --enable-python
+      run: ./configure --with-python
 
     - name: build
       run: make

Dockerfile

@@ -10,7 +10,7 @@ RUN apk update && apk add --no-cache \
 WORKDIR /app
 COPY . .
 RUN ./autogen.sh && \
-    ./configure --enable-python && \
+    ./configure --with-python && \
     make
 
 FROM alpine:latest

README.md

@@ -82,7 +82,7 @@ Requirements: autoconf, automake, make, a C compiler (gcc or clang), flex, bison
 ```
 ./autogen.sh
 ./configure                     # Minimal build (includes JSON support)
-./configure --enable-python     # With optional Python support
+./configure --with-python       # With optional Python support
 ./configure --with-openssl      # Use OpenSSL for hardware-accelerated HMAC-SHA256
 make
 make install
@@ -111,7 +111,7 @@ mysqldump mydb | tee >(myanon -f myanon.cfg | gzip > mydb_anon.sql.gz) | gpg -e
 
 ## Python support
 
-When Python support is enabled (`--enable-python`), custom anonymization functions can be defined in Python scripts. These scripts have access to a `myanon_utils` module that provides utility functions:
+When Python support is enabled (`--with-python`), custom anonymization functions can be defined in Python scripts. These scripts have access to a `myanon_utils` module that provides utility functions:
 
 - `get_secret()`: Returns the HMAC secret defined in the configuration file
 - `escape_sql_string(str)`: Escapes a string for safe SQL insertion
@@ -237,7 +237,7 @@ export LDFLAGS=-L/opt/homebrew/lib
 ```
 ./autogen.sh
 ./configure                             # Minimal build (includes JSON support)
-./configure --enable-python             # With optional python support
+./configure --with-python               # With optional python support
 ./configure --with-openssl              # Use OpenSSL for hardware-accelerated HMAC-SHA256
 make
 make install

configure.ac

@@ -13,11 +13,11 @@ AM_PROG_AR
 AC_PROG_RANLIB
 
 # Arguments
-AC_ARG_ENABLE([python],
-              [AS_HELP_STRING([--enable-python],
-                              [enable @<:@default=no@:>@ Python support @<:@default=no@:>@])],
-              [enable_python=$enableval],
-              [enable_python="no"])
+AC_ARG_WITH([python],
+            [AS_HELP_STRING([--with-python@<:@=DIR@:>@],
+                            [enable Python support @<:@default=no@:>@, optionally specify python install prefix])],
+            [with_python=$withval],
+            [with_python="no"])
 
 # Legacy jq option (deprecated)
 AC_ARG_ENABLE([jq],
@@ -26,17 +26,20 @@ AC_ARG_ENABLE([jq],
               [AC_MSG_WARN([--enable-jq is deprecated and has no effect. JSON support is now built-in without external dependencies.])])
 
 AC_ARG_WITH([openssl],
-            [AS_HELP_STRING([--with-openssl],
-                            [use OpenSSL for HMAC-SHA256 instead of bundled implementation])],
+            [AS_HELP_STRING([--with-openssl@<:@=DIR@:>@],
+                            [use OpenSSL for HMAC-SHA256 instead of bundled implementation, optionally specify install prefix])],
             [with_openssl=$withval],
             [with_openssl="no"])
 
-if test "$with_openssl" = "yes"; then
+if test "$with_openssl" != "no"; then
+    if test "$with_openssl" != "yes"; then
+        export PKG_CONFIG_PATH="$with_openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+    fi
     PKG_CHECK_MODULES([OPENSSL], [libcrypto], [],
                       [AC_MSG_ERROR([OpenSSL libcrypto not found])])
     AC_DEFINE([HAVE_OPENSSL], [1], [Define to 1 if using OpenSSL for HMAC.])
 fi
-AM_CONDITIONAL([USE_OPENSSL], [test "$with_openssl" = "yes"])
+AM_CONDITIONAL([USE_OPENSSL], [test "$with_openssl" != "no"])
 
 # Checks flex/bison version
 AC_PATH_PROG([FLEX],[flex])
@@ -57,7 +60,10 @@ AC_CHECK_HEADERS(getopt.h, ,[AC_MSG_ERROR([Cannot find getopt.h header])])
 AC_CHECK_HEADERS(sys/time.h, ,[AC_MSG_ERROR([Cannot find sys/time.h header])])
 
 # Check python dependencies
-if test "$enable_python" = "yes"; then
+if test "$with_python" != "no"; then
+    if test "$with_python" != "yes"; then
+        export PATH="$with_python/bin:$PATH"
+    fi
     AM_PATH_PYTHON([3])
     AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
     AC_ARG_VAR([PYTHON_LIBS], [ldflags flags for python, bypassing python-config])
@@ -79,7 +85,7 @@ if test "$enable_python" = "yes"; then
     LDFLAGS="$LDFLAGS $PYTHON_LIBS"
 
     AC_DEFINE([HAVE_PYTHON], ["yes"], [Define to "yes" if Python support is enabled.])
-    AC_SUBST([PYTHON_SUPPORT], [$enable_python])
+    AC_SUBST([PYTHON_SUPPORT], [yes])
 fi
 
 

debian/rules

@@ -4,7 +4,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-python
+		--with-python
 
 override_dh_installexamples:
 	dh_installexamples main/myanon-sample.conf