Merge pull request #66 from TREX-CoE/configure

Automatic maintainer mode

.github/workflows/actions.yml

@@ -23,7 +23,7 @@ jobs:
       - name: configure with autotools
         run: |
           ./autogen.sh
-          TREXIO_DEVEL=1 ./configure --enable-silent-rules
+          ./configure --enable-silent-rules
         
       - name: compile TREXIO
         run: make -j 2
@@ -63,7 +63,7 @@ jobs:
       - name: configure with autotools
         run: |
           ./autogen.sh
-          TREXIO_DEVEL=1 ./configure FC=gfortran-10 --enable-silent-rules
+          ./configure FC=gfortran-10 --enable-silent-rules
         
       - name: compile TREXIO
         run: make -j 2

README.md

@@ -20,7 +20,7 @@ TREX library for efficient I/O.
 1. Download the `trexio-<version>.tar.gz` file
 2. `gzip -cd trexio-<version>.tar.gz | tar xvf -`
 3. `cd trexio-<version>`
-4. `./configure --enable-silent-rules`
+4. `./configure`
 5. `make`
 6. `make check`
 7. `sudo make install`
@@ -40,7 +40,7 @@ TREX library for efficient I/O.
 1. `git clone https://github.com/TREX-CoE/trexio.git`
 2. `cd trexio`
 3. `./autogen.sh`
-4. `TREXIO_DEVEL=1 ./configure --enable-maintainer-mode`
+4. `./configure`
 5. `make`
 6. `make check`
 7. `sudo make install`

configure.ac

@@ -4,6 +4,15 @@
 AC_PREREQ([2.69])
 AC_INIT([trexio], [2.0.0], [https://github.com/TREX-CoE/trexio/issues])
 AM_INIT_AUTOMAKE([subdir-objects color-tests parallel-tests silent-rules 1.11])
+AM_MAINTAINER_MODE()
+
+# Activate developer mode when the source is the git repository.
+# Otherwise, it is the source distribution and the developer mode should not be activated.
+TEST_IFEXISTS=".git"
+AC_CHECK_FILE([$TEST_IFEXISTS],
+        [enable_maintainer_mode="yes"],
+)
+
 AM_MAINTAINER_MODE()
 LT_PREREQ([2.2])
 LT_INIT
@@ -131,11 +140,16 @@ AC_TYPE_UINT64_T
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset mkdir strerror])
 
+if test "x$enable_maintainer_mode" == "xyes"; then
+  TREXIO_DEVEL=" -- Developer mode"
+else
+  TREXIO_DEVEL=""
+fi
+
 AM_CONDITIONAL([TREXIO_DEVEL],[test "x$TREXIO_DEVEL" != x])
 
 if test "x${TREXIO_DEVEL}" != "x"; then
 
-  TREXIO_DEVEL=" -- Developer mode"
   AC_PROG_AWK
   AM_PATH_PYTHON([3.0])
 
@@ -157,23 +171,6 @@ if test "x${TREXIO_DEVEL}" != "x"; then
         HAS_CPPCHECK=1
   fi
 
-else
-
-  # Throw an error message if the user attempts to configure the GitHub repo clone not in the developer mode.
-  # Developer mode is required to generate the TREXIO source files from the org-mode templates.
-  TEST_IFEXISTS=".gitmodules"
-  AC_CHECK_FILE([$TEST_IFEXISTS],
-		[AC_MSG_ERROR([
-		 ----------------------------------------------------------------
-		 Installation with the current configuration is not possible.
-		 Activate developer mode: TREXIO_DEVEL=1 ./configure
-		 	| OR |
-		 Download the tarball with the source code distribution.
-		 ----------------------------------------------------------------
-		 ])],
-		 []
-		) 
-
 fi
 
 ## Libm
@@ -214,7 +211,7 @@ Package features:
 Now type 'make @<:@<target>@:>@'
 where the optional <target> is:
   all           - build C library and Fortran binding
-  check	        - run unit tests
+  check         - run unit tests
   install       - install the library
 --------------------------------------------------"