diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1998-12-03 19:04:49 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1998-12-03 19:04:49 +0000 |
| commit | 3ace2b69f86b34b418f69418b10c3c94a50f8a95 (patch) | |
| tree | b6cf038ca3df8320da331a5bb4a5715e88c541bf | |
| parent | f453cd201acbdadf162aa56e5faf2cd54d639d03 (diff) | |
| download | gnome-common-3ace2b69f86b34b418f69418b10c3c94a50f8a95.tar.gz | |
Update popt, and always use the gnome-libs version instead of any system
Update popt, and always use the gnome-libs version instead of any system
version.
svn path=/trunk/; revision=501
| -rw-r--r-- | support/Makefile.am | 2 | ||||
| -rw-r--r-- | support/popt.c | 2 | ||||
| -rw-r--r-- | support/poptconfig.c | 2 | ||||
| -rw-r--r-- | support/popthelp.c | 2 | ||||
| -rw-r--r-- | support/poptparse.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/support/Makefile.am b/support/Makefile.am index 245b1e7..cb6d8e8 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = argp-fmtstream.h argp-namefrob.h gnomesupport-fake.h \ findme.h poptint.h # Hmm... should we move `error.h' here. -include_HEADERS = popt.h +include_HEADERS = popt-gnome.h popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c other_sources = long-options.c gnome-argp.c diff --git a/support/popt.c b/support/popt.c index 7dd453d..f146924 100644 --- a/support/popt.c +++ b/support/popt.c @@ -20,7 +20,7 @@ #endif #include "findme.h" -#include "popt.h" +#include "popt-gnome.h" #include "poptint.h" #ifndef HAVE_STRERROR diff --git a/support/poptconfig.c b/support/poptconfig.c index 8f2656d..dabf6f5 100644 --- a/support/poptconfig.c +++ b/support/poptconfig.c @@ -17,7 +17,7 @@ # include <alloca.h> #endif -#include "popt.h" +#include "popt-gnome.h" #include "poptint.h" static void configLine(poptContext con, char * line) { diff --git a/support/popthelp.c b/support/popthelp.c index c454640..0e2f43a 100644 --- a/support/popthelp.c +++ b/support/popthelp.c @@ -13,7 +13,7 @@ #include <stdlib.h> #include <string.h> -#include "popt.h" +#include "popt-gnome.h" #include "poptint.h" static void displayArgs(poptContext con, enum poptCallbackReason foo, diff --git a/support/poptparse.c b/support/poptparse.c index cd97ec6..d083824 100644 --- a/support/poptparse.c +++ b/support/poptparse.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <string.h> -#include "popt.h" +#include "popt-gnome.h" int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) { char * buf = strcpy(alloca(strlen(s) + 1), s); |