simplify configure file

Author: pachadotdev

CRAN-SUBMISSION

@@ -1,3 +1,3 @@
 Version: 5.3.5
-Date: 2024-12-22 00:00:54 UTC
-SHA: 6a4cc5becd878d0c7ce7b7731e69ca869d4a7d8c
+Date: 2024-12-22 00:34:56 UTC
+SHA: 7bcea9c168d5d2203096bacb7d1a6b3364d5a934

configure

@@ -7,34 +7,29 @@
 # R CMD INSTALL --configure-vars='INCLUDE_DIR=/.../include LIB_DIR=/.../lib'
 
 # Library settings
-PKG_CONFIG_NAME_TESSERACT="tesseract"
+PKG_CONFIG_NAME="tesseract"
 PKG_DEB_NAME="tesseract-ocr libtesseract-dev libleptonica-dev"
 PKG_RPM_NAME="tesseract-devel leptonica-devel"
 PKG_BREW_NAME="tesseract"
-PKG_TEST_HEADER_TESSERACT="<tesseract/baseapi.h>"
+PKG_CFLAGS="-I/usr/include/leptonica"
+PKG_LIBS="-ltesseract"
 
 # Use pkg-config if available
 pkg-config --version >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-  PKGCONFIG_CFLAGS_TESSERACT=`pkg-config --cflags ${PKG_CONFIG_NAME_TESSERACT}`
-  PKGCONFIG_LIBS_TESSERACT=`pkg-config --libs ${PKG_CONFIG_NAME_TESSERACT}`
+  PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors ${PKG_CONFIG_NAME}`
+  PKGCONFIG_LIBS=`pkg-config --libs ${PKG_CONFIG_NAME}`
 fi
 
-# Debugging information
-echo "CC: $CC"
-echo "CXX: $CXX"
-echo "PKGCONFIG_CFLAGS_TESSERACT: $PKGCONFIG_CFLAGS_TESSERACT"
-echo "PKGCONFIG_LIBS_TESSERACT: $PKGCONFIG_LIBS_TESSERACT"
-
 # Note that cflags may be empty in case of success
 if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
   echo "Found INCLUDE_DIR and/or LIB_DIR!"
   PKG_CFLAGS="-I$INCLUDE_DIR $PKG_CFLAGS"
   PKG_LIBS="-L$LIB_DIR $PKG_LIBS"
-elif [ "$PKGCONFIG_CFLAGS_TESSERACT" ] || [ "$PKGCONFIG_LIBS_TESSERACT" ]; then
+elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
   echo "Found pkg-config cflags and libs!"
-  PKG_CFLAGS="${PKGCONFIG_CFLAGS_TESSERACT}"
-  PKG_LIBS="${PKGCONFIG_LIBS_TESSERACT}"
+  PKG_CFLAGS="${PKGCONFIG_CFLAGS}"
+  PKG_LIBS="${PKGCONFIG_LIBS}"
 else
   echo "--------------------------- [ANTICONF] --------------------------------"
   echo "Configuration failed to find system libraries. Try installing:"
@@ -54,10 +49,6 @@ if [ "$CC" = "clang" ] || [ "$CXX" = "clang++" ]; then
   PKG_LIBS="$PKG_LIBS -stdlib=libc++"
 fi
 
-# For debugging
-echo "Using PKG_CFLAGS=$PKG_CFLAGS"
-echo "Using PKG_LIBS=$PKG_LIBS"
-
 # Tesseract 4 enforces C++11 in the headers but R does not have CXX11CPP
 CPPFLAGS=`${R_HOME}/bin/R CMD config CPPFLAGS`
 CXX11STD=`${R_HOME}/bin/R CMD config CXX11STD`
@@ -71,6 +62,7 @@ fi
 # Create a temporary C++ file to test the compatibility with Tesseract
 cat <<EOF > conftest.cpp
 #include <tesseract/baseapi.h>
+#include <leptonica/allheaders.h>
 int main() {
     tesseract::TessBaseAPI api;
     return 0;
@@ -81,18 +73,7 @@ EOF
 # Tesseract enforces C++11
 if ! ${CXX11} -std=gnu++11 -c conftest.cpp -o conftest.o ${PKG_CFLAGS}
 then
-    echo "--------------------------- [ANTICONF] --------------------------------"
-    echo "Configuration failed to find system libraries. Try installing:"
-    echo " * deb: $PKG_DEB_NAME (Debian, Ubuntu, etc)"
-    echo " * rpm: $PKG_RPM_NAME (Fedora, CentOS, RHEL)"
-    echo " * brew: $PKG_BREW_NAME (Mac OSX)"
-    echo "If the libraries are already installed, check that 'pkg-config' is in your"
-    echo "PATH and PKG_CONFIG_PATH contains the necessary .pc files. If pkg-config"
-    echo "is unavailable you can set INCLUDE_DIR and LIB_DIR manually via:"
-    echo "R CMD INSTALL --configure-vars='INCLUDE_DIR=... LIB_DIR=...'"
-    echo "-------------------------- [ERROR MESSAGE] ---------------------------"
-    cat configure.log
-    echo "--------------------------------------------------------------------"
+    echo "Tesseract requires C++11 support"
     rm -rf conftest.cpp conftest.o
     exit 1
 else

src/cpp11tesseract_types.h

@@ -1,5 +1,5 @@
 #include <tesseract/baseapi.h> // tesseract
-#include <allheaders.h> // leptonica
+#include <leptonica/allheaders.h> // leptonica
 
 #include <cpp11.hpp>