Changeset 4681Tweet

Timestamp:

Oct 7, 2010, 11:38:43 PM (11 years ago)

Author:

Sam Hocevar

Message:

Remove the build dependency on the getopt implementation and use libcaca
instead.

Location:

toilet/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/main.c (modified) (9 diffs)
• src/mygetopt.c (deleted)
• src/mygetopt.h (deleted)

toilet/trunk/configure.ac

@@ -25 +25 @@
 fi
 
-AC_CHECK_HEADERS(getopt.h sys/ioctl.h)
-
-ac_cv_have_getopt_long="no"
-AC_CHECK_FUNCS(getopt_long,
- [ac_cv_have_getopt_long="yes"],
- [AC_CHECK_LIB(gnugetopt, getopt_long,
-   [ac_cv_have_getopt_long="yes"
-    GETOPT_LIBS="${GETOPT_LIBS} -lgnugetopt"])])
-if test "$ac_cv_have_getopt_long" != "no"; then
-  AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the ‘getopt_long’ function.)
-fi
-AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no")
-AC_SUBST(GETOPT_LIBS)
+AC_CHECK_HEADERS(sys/ioctl.h)
 
 AC_CACHE_CHECK([for TIOCGWINSZ],
@@ -52 +40 @@
 
 CUCUL="no"
-PKG_CHECK_MODULES(CACA, caca >= 0.99.beta17,
+PKG_CHECK_MODULES(CACA, caca >= 0.99.beta18,
  [CUCUL="yes"],
  [AC_MSG_RESULT(no)
-  AC_MSG_ERROR([you need libcaca version 0.99.beta17 or later])])
+  AC_MSG_ERROR([you need libcaca version 0.99.beta18 or later])])
 
 AC_MSG_CHECKING([for release date])

toilet/trunk/src/Makefile.am

@@ -6 +6 @@
                  filter.c filter.h \
                  export.c export.h \
-                 term.c figlet.c \
-                 $(GETOPT)
+                 term.c figlet.c
 
 toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\"
 toilet_CFLAGS = @CACA_CFLAGS@
-toilet_LDADD = @CACA_LIBS@ @GETOPT_LIBS@
-
-if NEED_GETOPT_LONG
-GETOPT = mygetopt.c mygetopt.h
-endif
+toilet_LDADD = @CACA_LIBS@
 
 echo-sources: ; echo $(SOURCES)

toilet/trunk/src/main.c

@@ -20 +20 @@
 #   include <inttypes.h>
 #endif
-#if !defined HAVE_GETOPT_LONG
-#   include "mygetopt.h"
-#elif defined HAVE_GETOPT_H
-#   include <getopt.h>
-#endif
 #if defined HAVE_SYS_IOCTL_H && defined HAVE_TIOCGWINSZ
 #   include <sys/ioctl.h>
@@ -38 +33 @@
 #include "export.h"
 
-#if defined HAVE_GETOPT_LONG
-#   define mygetopt getopt_long
-#   define myoptind optind
-#   define myoptarg optarg
-#   define myoption option
-#endif
-
 static void version(void);
 static void usage(void);
@@ -70 +58 @@
 #define MOREINFO "Try `%s --help' for more information.\n"
         int option_index = 0;
-        static struct myoption long_options[] =
+        static struct caca_option long_options[] =
         {
             /* Long option, needs arg, flag, short option */
@@ -89 +77 @@
         };
 
-        int c = mygetopt(argc, argv, "f:d:w:tsSkWoF:E:hI:v",
-                         long_options, &option_index);
+        int c = caca_getopt(argc, argv, "f:d:w:tsSkWoF:E:hI:v",
+                            long_options, &option_index);
         if(c == -1)
             break;
@@ -100 +88 @@
             return 0;
         case 'I': /* --infocode */
-            infocode = atoi(myoptarg);
+            infocode = atoi(caca_optarg);
             break;
         case 'v': /* --version */
@@ -106 +94 @@
             return 0;
         case 'f': /* --font */
-            cx->font = myoptarg;
+            cx->font = caca_optarg;
             break;
         case 'd': /* --directory */
-            cx->dir = myoptarg;
+            cx->dir = caca_optarg;
             break;
         case 'F': /* --filter */
-            if(!strcmp(myoptarg, "list"))
+            if(!strcmp(caca_optarg, "list"))
                 return filter_list();
-            if(filter_add(cx, myoptarg) < 0)
+            if(filter_add(cx, caca_optarg) < 0)
                 return -1;
             break;
@@ -124 +112 @@
             break;
         case 'w': /* --width */
-            cx->term_width = atoi(myoptarg);
+            cx->term_width = atoi(caca_optarg);
             break;
         case 't': /* --termwidth */
@@ -154 +142 @@
             break;
         case 'E': /* --export */
-            if(!strcmp(myoptarg, "list"))
+            if(!strcmp(caca_optarg, "list"))
                 return export_list();
-            if(export_set(cx, myoptarg) < 0)
+            if(export_set(cx, caca_optarg) < 0)
                 return -1;
             break;
@@ -201 +189 @@
         return -1;
 
-    if(myoptind >= argc)
+    if(caca_optind >= argc)
         render_stdin(cx);
     else
-        render_list(cx, argc - myoptind, argv + myoptind);
+        render_list(cx, argc - caca_optind, argv + caca_optind);
 
     render_end(cx);