[EGIT] [legacy-imlib2] 01/03: modules: Drop some disabled code

[Enlightenment Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository legacy-imlib2.

View the commit online.

commit 6a1bcc2ab756cbc94d4fba89325fc71e469b41c7
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Wed Mar 22 17:43:04 2023 +0100

    modules: Drop some disabled code
---
 src/lib/Makefile.am |  2 +-
 src/lib/modules.c   | 22 ++--------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 16a2448..fbb224f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 AM_CFLAGS            = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
-AM_CPPFLAGS          = -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+AM_CPPFLAGS          = -D PACKAGE_LIB_DIR=\"$(pkglibdir)\" \
                        -I$(top_builddir) \
                        $(X_CFLAGS) \
                        $(FREETYPE_CFLAGS)
diff --git a/src/lib/modules.c b/src/lib/modules.c
index 94b57d1..1b342a3 100644
--- a/src/lib/modules.c
+++ b/src/lib/modules.c
@@ -7,23 +7,6 @@
 #include "file.h"
 #include "strutils.h"
 
-static const char  *
-__imlib_PathToModules(void)
-{
-#if 0
-   static const char  *path = NULL;
-
-   if (path)
-      return path;
-
-   path = getenv("IMLIB2_MODULE_PATH");
-   if (path && __imlib_FileIsDir(path))
-      return path;
-#endif
-
-   return PACKAGE_LIB_DIR "/imlib2";
-}
-
 static char       **
 _module_paths(const char *env, const char *mdir)
 {
@@ -43,8 +26,7 @@ _module_paths(const char *env, const char *mdir)
                {
                   /* Substitute default path */
                   free(*pp);
-                  snprintf(buf, sizeof(buf), "%s/%s",
-                           __imlib_PathToModules(), mdir);
+                  snprintf(buf, sizeof(buf), "%s/%s", PACKAGE_LIB_DIR, mdir);
                   *pp = strdup(buf);
                }
           }
@@ -55,7 +37,7 @@ _module_paths(const char *env, const char *mdir)
         ppaths = malloc(2 * sizeof(char *));
         if (!ppaths)
            goto done;
-        snprintf(buf, sizeof(buf), "%s/%s", __imlib_PathToModules(), mdir);
+        snprintf(buf, sizeof(buf), "%s/%s", PACKAGE_LIB_DIR, mdir);
         ppaths[0] = strdup(buf);
         ppaths[1] = NULL;
      }


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.